diff --git a/.chloggen/ddog-data-race.yaml b/.chloggen/ddog-data-race.yaml new file mode 100644 index 000000000000..ac2ee331a729 --- /dev/null +++ b/.chloggen/ddog-data-race.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: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix data race in metrics exporter shutdown + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31663] + +# (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: + +# 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: [] diff --git a/.chloggen/dinesh.gurumurthy_add-container-stats.yaml b/.chloggen/dinesh.gurumurthy_add-container-stats.yaml new file mode 100644 index 000000000000..109e511fda46 --- /dev/null +++ b/.chloggen/dinesh.gurumurthy_add-container-stats.yaml @@ -0,0 +1,23 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: datadogconnector +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add a new option to the Datadog connector to enable container tags on stats Payloads. +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31642] +# (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: | + This change adds a new option to the Datadog connector to enable container tags on stats Payloads. This is useful for users who want to use container tags as second primary tag for Datadog APM. +# 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: [] diff --git a/.chloggen/drosiek-add-sumologicextension.yaml b/.chloggen/drosiek-add-sumologicextension.yaml new file mode 100755 index 000000000000..e10597eb4c82 --- /dev/null +++ b/.chloggen/drosiek-add-sumologicextension.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: new_component + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: sumologicextension + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "promote to `alpha` stability" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [29601] + +# (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: + +# 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: [user] diff --git a/.chloggen/encoding_fileexporter.yaml b/.chloggen/encoding_fileexporter.yaml new file mode 100644 index 000000000000..53229897abcf --- /dev/null +++ b/.chloggen/encoding_fileexporter.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: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: fileexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Adopt the encoding extension with the file exporter. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31774] + +# (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: + +# 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: [] diff --git a/.chloggen/mx-psi_enable-internal-metric.yaml b/.chloggen/mx-psi_enable-internal-metric.yaml new file mode 100644 index 000000000000..f1875440d10f --- /dev/null +++ b/.chloggen/mx-psi_enable-internal-metric.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add new telemetry metric, `otelcol_datadog_otlp_translator_resources_missing_source` that counts OTLP resources missing a hostname-identifying attribute. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31805] + +# (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: | + - Enable Collector metrics https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/troubleshooting.md#metrics to check for this metric. + +# 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: [] diff --git a/.chloggen/opencensusreceiver_lifecycle.yaml b/.chloggen/opencensusreceiver_lifecycle.yaml new file mode 100644 index 000000000000..b102d94efe66 --- /dev/null +++ b/.chloggen/opencensusreceiver_lifecycle.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: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: opencensusreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Refactor the opencensusreceiver to pass lifecycle tests and avoid leaking gRPC connections. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31643] + +# (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: + +# 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: [] diff --git a/.chloggen/remove-deprecated-ScraperControllerSettings.yaml b/.chloggen/remove-deprecated-ScraperControllerSettings.yaml new file mode 100644 index 000000000000..07ffa6140f92 --- /dev/null +++ b/.chloggen/remove-deprecated-ScraperControllerSettings.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: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: general + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Update any component using `scraperhelper.ScraperControllerSettings` to use `scraperhelper.ControllerConfig` + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31816] + +# (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: This changes the config field name from `ScraperControllerSettings` to `ControllerConfig` + +# 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/.chloggen/remove_ErrNilNextConsumer_impl.yaml b/.chloggen/remove_ErrNilNextConsumer_impl.yaml new file mode 100644 index 000000000000..2dd87dfff4bc --- /dev/null +++ b/.chloggen/remove_ErrNilNextConsumer_impl.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: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: all + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove explicit checks in all receivers to check if the next consumer is nil + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31793] + +# (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: The nil check is now done by the pipeline builder. + +# 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/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 78f48b450ecc..bcd2654a1477 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -318,7 +318,7 @@ jobs: merge-multiple: true pattern: coverage-artifacts-* - name: Upload coverage report - uses: Wandalen/wretry.action@v1.4.9 + uses: Wandalen/wretry.action@v1.4.10 with: action: codecov/codecov-action@v3 with: | diff --git a/cmd/configschema/comments_test.go b/cmd/configschema/comments_test.go index 06880828840e..2d906a3d3968 100644 --- a/cmd/configschema/comments_test.go +++ b/cmd/configschema/comments_test.go @@ -35,7 +35,7 @@ func TestExternalType(t *testing.T) { } func TestSubPackage(t *testing.T) { - s := configtls.TLSClientSetting{} + s := configtls.ClientConfig{} v := reflect.ValueOf(s) _, err := commentsForStruct(v, testDR()) require.NoError(t, err) diff --git a/cmd/configschema/common_test.go b/cmd/configschema/common_test.go index e55401bfd71b..3287e534ea3c 100644 --- a/cmd/configschema/common_test.go +++ b/cmd/configschema/common_test.go @@ -22,13 +22,13 @@ type testStruct struct { Four bool `mapstructure:"four"` // embedded, package qualified comment time.Duration `mapstructure:"duration"` - Squashed testPerson `mapstructure:",squash"` - PersonPtr *testPerson `mapstructure:"person_ptr"` - PersonStruct testPerson `mapstructure:"person_struct"` - Persons []testPerson `mapstructure:"persons"` - PersonPtrs []*testPerson `mapstructure:"person_ptrs"` - Ignored string `mapstructure:"-"` - TLS configtls.TLSClientSetting `mapstructure:"tls"` + Squashed testPerson `mapstructure:",squash"` + PersonPtr *testPerson `mapstructure:"person_ptr"` + PersonStruct testPerson `mapstructure:"person_struct"` + Persons []testPerson `mapstructure:"persons"` + PersonPtrs []*testPerson `mapstructure:"person_ptrs"` + Ignored string `mapstructure:"-"` + TLS configtls.ClientConfig `mapstructure:"tls"` } func testDR() DirResolver { diff --git a/cmd/configschema/docsgen/docsgen/template.go b/cmd/configschema/docsgen/docsgen/template.go index 1c5d7a2a6359..4475c859161b 100644 --- a/cmd/configschema/docsgen/docsgen/template.go +++ b/cmd/configschema/docsgen/docsgen/template.go @@ -28,14 +28,14 @@ func join(s string) string { return strings.ReplaceAll(s, "\n", " ") } -// mkAnchor takes a name and a type (e.g. "configtls.TLSClientSetting") and +// mkAnchor takes a name and a type (e.g. "configtls.ClientConfig") and // returns a string suitable for use as a markdown anchor. func mkAnchor(name, typ string) string { if isDuration(typ) { return "time-Duration" } idx := strings.IndexRune(typ, '.') - // strip "configtls." from e.g. "configtls.TLSClientSetting" + // strip "configtls." from e.g. "configtls.ClientConfig" typeStripped := typ[idx+1:] concat := fmt.Sprintf("%s-%s", name, typeStripped) asterisksRemoved := strings.ReplaceAll(concat, "*", "") diff --git a/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json b/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json index c1a1f0a71b07..b7d9f54fe147 100644 --- a/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json +++ b/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json @@ -37,7 +37,7 @@ }, { "Name": "tls_settings", - "Type": "*configtls.TLSServerSetting", + "Type": "*configtls.ServerConfig", "Kind": "ptr", "Default": null, "Doc": "Configures the protocol to use TLS.\nThe default value is nil, which will cause the protocol to not use TLS.\n", @@ -276,7 +276,7 @@ }, { "Name": "tls_settings", - "Type": "*configtls.TLSServerSetting", + "Type": "*configtls.ServerConfig", "Kind": "ptr", "Default": null, "Doc": "TLSSetting struct exposes TLS client configuration.\n", diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index b1fd0fe08952..f44c51737963 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -10,10 +10,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 golang.org/x/mod v0.16.0 golang.org/x/text v0.14.0 @@ -170,8 +170,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.96.0 // indirect github.com/samber/lo v1.38.1 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect ) require ( @@ -184,7 +184,7 @@ require ( cloud.google.com/go/longrunning v0.5.5 // indirect cloud.google.com/go/monitoring v1.18.0 // indirect cloud.google.com/go/pubsub v1.36.2 // indirect - cloud.google.com/go/spanner v1.58.0 // indirect + cloud.google.com/go/spanner v1.60.0 // indirect cloud.google.com/go/trace v1.10.5 // indirect code.cloudfoundry.org/clock v1.0.0 // indirect code.cloudfoundry.org/go-diodes v0.0.0-20211115184647-b584dd5df32c // indirect @@ -215,7 +215,7 @@ require ( github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/ClickHouse/ch-go v0.61.5 // indirect - github.com/ClickHouse/clickhouse-go/v2 v2.21.1 // indirect + github.com/ClickHouse/clickhouse-go/v2 v2.22.2 // indirect github.com/DataDog/agent-payload/v5 v5.0.104 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.51.1-0.20240301173728-334e775e420a // indirect github.com/DataDog/datadog-agent/pkg/proto v0.52.0-devel // indirect @@ -298,7 +298,7 @@ require ( github.com/containerd/cgroups/v3 v3.0.2 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/ttrpc v1.2.2 // indirect - github.com/coreos/go-oidc/v3 v3.9.0 // indirect + github.com/coreos/go-oidc/v3 v3.10.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cskr/pubsub v1.0.2 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect @@ -334,7 +334,7 @@ require ( github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-faster/city v1.0.1 // indirect github.com/go-faster/errors v0.7.1 // indirect - github.com/go-jose/go-jose/v3 v3.0.3 // indirect + github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-kit/kit v0.13.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -579,7 +579,7 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect github.com/signalfx/sapm-proto v0.14.0 // indirect - github.com/sijms/go-ora/v2 v2.8.9 // indirect + github.com/sijms/go-ora/v2 v2.8.10 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/snowflakedb/gosnowflake v1.8.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -622,41 +622,41 @@ require ( go.mongodb.org/atlas v0.36.0 // indirect go.mongodb.org/mongo-driver v1.14.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect @@ -690,12 +690,12 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/api v0.167.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect + google.golang.org/api v0.170.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect @@ -703,12 +703,12 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect - k8s.io/client-go v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect + k8s.io/client-go v0.29.3 // indirect k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/kubelet v0.29.2 // indirect + k8s.io/kubelet v0.29.3 // indirect k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect sigs.k8s.io/controller-runtime v0.17.2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect @@ -1151,3 +1151,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/stor replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage => ../../extension/storage/dbstorage replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../extension/storage + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension => ../../extension/encoding/otlpencodingextension + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding => ../../extension/encoding diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 1e184ee56e50..33cd5ab93dce 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -49,8 +49,8 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/pubsub v1.36.2 h1:nAUD4aiWHZFYyINhRag1qOnHUk0/7QiWEa04XWnqACA= cloud.google.com/go/pubsub v1.36.2/go.mod h1:mHCFLNG8abCrPzhuOnpBcr9DUy+l3/LWWn0qoJdbh1w= -cloud.google.com/go/spanner v1.58.0 h1:W0SAtTz50XIZlTCJtHJ7x4Yxux6ZsorBBxjdXfjZ7UQ= -cloud.google.com/go/spanner v1.58.0/go.mod h1:eSpP+aaT38sdwFs0ovo7Z1VsG9RyM9n7EHpM5DhDEsE= +cloud.google.com/go/spanner v1.60.0 h1:O9kf49dfaDRzPpKJNChHUJ+Bao02WPedZb8ZPyi02lI= +cloud.google.com/go/spanner v1.60.0/go.mod h1:D2bOAeT/dC6zsZhXRIxbdYa5nQEYU3wYM/1KN3eg7Fs= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -159,8 +159,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeEI4= github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= -github.com/ClickHouse/clickhouse-go/v2 v2.21.1 h1:x8wZEMOHDh4K8kLQBtGMeIIguejiaj8/bUiF2VzG6n4= -github.com/ClickHouse/clickhouse-go/v2 v2.21.1/go.mod h1:hTWNkV9mkQwiQ/df0rbN17VXF05UTResY4krnjbzVZA= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2 h1:T1BljsIjj+3aQog80jKMTeF4EqAUG4P6TVcCvmakYAc= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2/go.mod h1:tBhdF3f3RdP7sS59+oBAtTyhWpy0024ZxDMhgxra0QE= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/DataDog/agent-payload/v5 v5.0.104 h1:uxTIaLthyKB4CxBKe+2FeMgL6ca3KVxpeYxlJGNcoJg= @@ -487,8 +487,8 @@ github.com/containerd/ttrpc v1.2.2 h1:9vqZr0pxwOF5koz6N0N3kJ0zDHokrcPxIR/ZR2YFtO github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak= github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/coreos/go-oidc/v3 v3.9.0 h1:0J/ogVOd4y8P0f0xUh8l9t07xRP/d8tccvjHl2dcsSo= -github.com/coreos/go-oidc/v3 v3.9.0/go.mod h1:rTKz2PYwftcrtoCzV5g5kvfJoWcm0Mk8AF8y1iAQro4= +github.com/coreos/go-oidc/v3 v3.10.0 h1:tDnXHnLyiTVyT/2zLDGj09pFPkhND8Gl8lnTRhoEaJU= +github.com/coreos/go-oidc/v3 v3.10.0/go.mod h1:5j11xcw0D3+SGxn6Z/WFADsgcWVMyNAlSQupk0KK3ac= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -634,8 +634,8 @@ github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7F github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= -github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= +github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U= +github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -1470,8 +1470,8 @@ github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 h1:32k2QLgsKhcEs55q4REP github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3/go.mod h1:gJrXWi7wSGXfiC7+VheQaz+ypdCt5SmZNL+BRxUe7y4= github.com/signalfx/sapm-proto v0.14.0 h1:KWh3I5E4EkelB19aP1/54Ik8khSioC/RVRW/riOfRGg= github.com/signalfx/sapm-proto v0.14.0/go.mod h1:Km6PskZh966cqNoUn3AmRyGRix5VfwnxVBvn2vjRC9U= -github.com/sijms/go-ora/v2 v2.8.9 h1:XIghcG8hjtYu+G9H235VEe5JXPLJtdzzj7pQm7JucVo= -github.com/sijms/go-ora/v2 v2.8.9/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.10 h1:Ekhx0I+A9qVBy1eOLa2eIhHWWYwVTa0MM78KS6h+5fg= +github.com/sijms/go-ora/v2 v2.8.10/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -1653,88 +1653,88 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240306115632-b2693620eff6 h1:owXKTclbDojb3bKuwvyheSl92ygNVF+aaS9UnIEErmk= -go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:XcDNDNqNBP0G6eQVU7E78tw5HHTzkejZkcjweYbr6cM= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 h1:xUKjw/BUUY+MMo2FR5ibKGq2uAZS72qgOotaj9WdpRA= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TjMxdMv90TzH6HjMJUg/uF2G+jrUOG1rkLZZqpiA3P0= -go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240306115632-b2693620eff6 h1:neBTpGYVF+UwceAaFGY0nrRW8mWwmy0lf1KQI1KNUEE= -go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oTNCYkDmZZu9M0keq6PkdIQDWQn6f7QKwUZqUnAIW5w= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 h1:wF6wlGx+CXujq8Lvtnbd03uHO5e3QT2RzownXPTnnnI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:swQIq8hlnQYRr7tiEc4z72PE573mnkiEFGMCdlK+Z2A= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6 h1:IlmU3X0cpnzc0DASb+rwRt5/FS94ZsRCVPsoUd2+zJQ= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:mMwdzs/CaxJJCYn3rqSZw4/Ckqh9tNfyIAW96TN3emo= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6 h1:1KKcYDYgf6xncUtccbEkCGSHjWLRkllB+N6hwZmpW7Q= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:g1X2187dRPxXcYsQYe6N7SYlxXSljGPjG8r8o5y3wmo= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6 h1:EdtaFPWHl7JD/KCJ/aNmWgc2pNC1zHDtjs4Fnas+cUk= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pQrKR/Aq1TNqNJOlVsGqIsqr7tNOsJl/VLnqnN+D8Z4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:kl4/vAgdVOycOCF1jDPbUXdZ8EkIDEgmFU2/Akgg39I= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TM0iDw+TINYMLYclaoAgtGKudMoun0zirQili7KZass= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:xBJ42Nn4e6QuaflVWgLINTESCRRZnOfX0taiuoDsgjw= +go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vDiwu5V3Gsqp19NtWfixZyXnT/V++Nko/xQmJz8mvJc= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:GgPvWGYWmY4+LPKRxz6q7UPRbcRscQQNXJZQ8GryY6s= +go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PHw6sVRsSCdGBRs032Mf8PxNqZgNJ0fVBBLtpWCdx0A= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:lFag1QoqEANT3KhVfKaT3J2RFFHwH6urC+ED7uI7vmE= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vltQMVWBhsB+5oChLlE77BqlHs54RS7oq4va4Gw8vzM= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:doCbNTc6uGPoH1azKROqg21Pq71IcJM1KvvVTPfM0uE= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/GGESGmyy/r2zTB2ogFuxwPGNRJjbiuPY6J02QiXf2Q= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ar/lke632VUrLX6/t9mjKE6QLnt4glhCKCkQvzN5SwY= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:mz2NEu4Dba2/t6MTPOjOOTgFXrmiqPQeShmQmwxrm30= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= @@ -1826,7 +1826,6 @@ golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2069,7 +2068,6 @@ golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2174,8 +2172,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -2199,8 +2197,8 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.167.0 h1:CKHrQD1BLRii6xdkatBDXyKzM0mkawt2QP+H3LtPmSE= -google.golang.org/api v0.167.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= +google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2256,10 +2254,10 @@ google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxH google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= -google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78 h1:SzXBGiWM1LNVYLCRP3e0/Gsze804l4jGoJ5lYysEO5I= -google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 h1:Xs9lu+tLXxLIfuci70nG4cpwaRC+mRQPUL7LoIeDJC4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -2361,14 +2359,14 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -2380,8 +2378,8 @@ k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubelet v0.29.2 h1:bQ2StqkUqPCFNLtGLsb3v3O2LKQHXNMju537zOGboRg= -k8s.io/kubelet v0.29.2/go.mod h1:i5orNPqW/fAMrqptbCXFW/vLBBP12TZZc41IrrvF7SY= +k8s.io/kubelet v0.29.3 h1:X9h0ZHzc+eUeNTaksbN0ItHyvGhQ7Z0HPjnQD2oHdwU= +k8s.io/kubelet v0.29.3/go.mod h1:jDiGuTkFOUynyBKzOoC1xRSWlgAZ9UPcTYeFyjr6vas= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= diff --git a/cmd/githubgen/go.mod b/cmd/githubgen/go.mod index 470fe287ed9c..da119aadc655 100644 --- a/cmd/githubgen/go.mod +++ b/cmd/githubgen/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/google/go-github/v59 v59.0.0 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/cmd/githubgen/go.sum b/cmd/githubgen/go.sum index 5188e77fe681..5851412d5595 100644 --- a/cmd/githubgen/go.sum +++ b/cmd/githubgen/go.sum @@ -23,10 +23,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= 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= diff --git a/cmd/opampsupervisor/examples/supervisor_darwin.yaml b/cmd/opampsupervisor/examples/supervisor_darwin.yaml index 379792377882..80d5b8bb5755 100644 --- a/cmd/opampsupervisor/examples/supervisor_darwin.yaml +++ b/cmd/opampsupervisor/examples/supervisor_darwin.yaml @@ -4,7 +4,7 @@ server: # Disable verification to test locally. # Don't do this in production. insecure_skip_verify: true - # For more TLS settings see config/configtls.TLSClientSetting + # For more TLS settings see config/configtls.ClientConfig capabilities: reports_effective_config: true diff --git a/cmd/opampsupervisor/examples/supervisor_linux.yaml b/cmd/opampsupervisor/examples/supervisor_linux.yaml index 0c2cf5ce8430..00021ece6b40 100644 --- a/cmd/opampsupervisor/examples/supervisor_linux.yaml +++ b/cmd/opampsupervisor/examples/supervisor_linux.yaml @@ -4,7 +4,7 @@ server: # Disable verification to test locally. # Don't do this in production. insecure_skip_verify: true - # For more TLS settings see config/configtls.TLSClientSetting + # For more TLS settings see config/configtls.ClientConfig capabilities: reports_effective_config: true diff --git a/cmd/opampsupervisor/examples/supervisor_windows.yaml b/cmd/opampsupervisor/examples/supervisor_windows.yaml index 35c20b62ca21..13d0a911d78d 100644 --- a/cmd/opampsupervisor/examples/supervisor_windows.yaml +++ b/cmd/opampsupervisor/examples/supervisor_windows.yaml @@ -4,7 +4,7 @@ server: # Disable verification to test locally. # Don't do this in production. insecure_skip_verify: true - # For more TLS settings see config/configtls.TLSClientSetting + # For more TLS settings see config/configtls.ClientConfig capabilities: reports_effective_config: true diff --git a/cmd/opampsupervisor/go.mod b/cmd/opampsupervisor/go.mod index 3ae6b866f562..a7c285e661e1 100644 --- a/cmd/opampsupervisor/go.mod +++ b/cmd/opampsupervisor/go.mod @@ -11,8 +11,8 @@ require ( github.com/oklog/ulid/v2 v2.1.0 github.com/open-telemetry/opamp-go v0.12.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -27,7 +27,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.17.0 // indirect golang.org/x/sys v0.16.0 // indirect diff --git a/cmd/opampsupervisor/go.sum b/cmd/opampsupervisor/go.sum index 0010d5c82364..e06b5c928a24 100644 --- a/cmd/opampsupervisor/go.sum +++ b/cmd/opampsupervisor/go.sum @@ -41,14 +41,14 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= go.opentelemetry.io/collector/confmap v0.96.0 h1:415ELCfC8S3xjiNFLneDWJi6h7j7SUw8A8pZtINEQdI= go.opentelemetry.io/collector/confmap v0.96.0/go.mod h1:q/dWHLvkk1vgvAF0l5dbgQSiPOmGwpv0FwcNaGpqsfM= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= 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= diff --git a/cmd/opampsupervisor/supervisor/config/config.go b/cmd/opampsupervisor/supervisor/config/config.go index ccbd523d4e6f..7d5000574231 100644 --- a/cmd/opampsupervisor/supervisor/config/config.go +++ b/cmd/opampsupervisor/supervisor/config/config.go @@ -25,7 +25,7 @@ type Capabilities struct { type OpAMPServer struct { Endpoint string - TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + TLSSetting configtls.ClientConfig `mapstructure:"tls,omitempty"` } type Agent struct { diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index 655110cc78ac..c24d6009fad4 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -6,8 +6,8 @@ dist: otelcol_version: 0.96.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6 - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.96.0 @@ -30,6 +30,7 @@ extensions: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.96.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.96.0 import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jaegerencodingextension v0.96.0 @@ -42,9 +43,9 @@ extensions: import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.96.0 @@ -91,8 +92,8 @@ exporters: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.96.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.96.0 @@ -115,7 +116,7 @@ processors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.96.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachedruidreceiver v0.96.0 @@ -205,7 +206,7 @@ receivers: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.96.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240306115632-b2693620eff6 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.96.0 @@ -444,5 +445,6 @@ 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/extension/sumologicextension => ../../extension/sumologicextension - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/namedpipereceiver => ../../receiver/namedpipereceiver - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ../../internal/sqlquery diff --git a/cmd/otelcontribcol/components.go b/cmd/otelcontribcol/components.go index 11571803e249..f9f223145320 100644 --- a/cmd/otelcontribcol/components.go +++ b/cmd/otelcontribcol/components.go @@ -96,6 +96,7 @@ import ( solarwindsapmsettingsextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension" dbstorage "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage" filestorage "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage" + sumologicextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension" attributesprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor" cumulativetodeltaprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor" deltatorateprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor" @@ -234,6 +235,7 @@ func components() (otelcol.Factories, error) { solarwindsapmsettingsextension.NewFactory(), dbstorage.NewFactory(), filestorage.NewFactory(), + sumologicextension.NewFactory(), otlpencodingextension.NewFactory(), jaegerencodingextension.NewFactory(), jsonlogencodingextension.NewFactory(), diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 29e0de3d73da..b08497d3d3e5 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -82,6 +82,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.96.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.96.0 @@ -193,29 +194,29 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.96.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 golang.org/x/sys v0.18.0 ) @@ -229,7 +230,7 @@ require ( cloud.google.com/go/longrunning v0.5.5 // indirect cloud.google.com/go/monitoring v1.18.0 // indirect cloud.google.com/go/pubsub v1.36.2 // indirect - cloud.google.com/go/spanner v1.58.0 // indirect + cloud.google.com/go/spanner v1.60.0 // indirect cloud.google.com/go/trace v1.10.5 // indirect code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c // indirect code.cloudfoundry.org/go-diodes v0.0.0-20211115184647-b584dd5df32c // indirect @@ -264,7 +265,7 @@ require ( github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect github.com/ClickHouse/ch-go v0.61.5 // indirect - github.com/ClickHouse/clickhouse-go/v2 v2.21.1 // indirect + github.com/ClickHouse/clickhouse-go/v2 v2.22.2 // indirect github.com/DataDog/agent-payload/v5 v5.0.104 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.51.1-0.20240301173728-334e775e420a // indirect github.com/DataDog/datadog-agent/pkg/proto v0.52.0-devel // indirect @@ -349,7 +350,7 @@ require ( github.com/containerd/cgroups/v3 v3.0.2 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/ttrpc v1.2.2 // indirect - github.com/coreos/go-oidc/v3 v3.9.0 // indirect + github.com/coreos/go-oidc/v3 v3.10.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cskr/pubsub v1.0.2 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect @@ -385,7 +386,7 @@ require ( github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-faster/city v1.0.1 // indirect github.com/go-faster/errors v0.7.1 // indirect - github.com/go-jose/go-jose/v3 v3.0.3 // indirect + github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-kit/kit v0.13.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -512,6 +513,7 @@ require ( github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-ps v1.0.0 // indirect github.com/mitchellh/hashstructure v1.1.0 // indirect github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect @@ -612,7 +614,7 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect github.com/signalfx/sapm-proto v0.14.0 // indirect - github.com/sijms/go-ora/v2 v2.8.9 // indirect + github.com/sijms/go-ora/v2 v2.8.10 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/snowflakedb/gosnowflake v1.8.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -655,23 +657,23 @@ require ( go.mongodb.org/atlas v0.36.0 // indirect go.mongodb.org/mongo-driver v1.14.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect @@ -706,12 +708,12 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/api v0.167.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect + google.golang.org/api v0.170.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect @@ -720,12 +722,12 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect - k8s.io/client-go v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect + k8s.io/client-go v0.29.3 // indirect k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/kubelet v0.29.2 // indirect + k8s.io/kubelet v0.29.3 // indirect k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect sigs.k8s.io/controller-runtime v0.17.2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect @@ -1192,6 +1194,8 @@ 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/extension/sumologicextension => ../../extension/sumologicextension + replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/namedpipereceiver => ../../receiver/namedpipereceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ../../internal/sqlquery diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index e8cf17034e19..a08fb70f65e3 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -49,8 +49,8 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/pubsub v1.36.2 h1:nAUD4aiWHZFYyINhRag1qOnHUk0/7QiWEa04XWnqACA= cloud.google.com/go/pubsub v1.36.2/go.mod h1:mHCFLNG8abCrPzhuOnpBcr9DUy+l3/LWWn0qoJdbh1w= -cloud.google.com/go/spanner v1.58.0 h1:W0SAtTz50XIZlTCJtHJ7x4Yxux6ZsorBBxjdXfjZ7UQ= -cloud.google.com/go/spanner v1.58.0/go.mod h1:eSpP+aaT38sdwFs0ovo7Z1VsG9RyM9n7EHpM5DhDEsE= +cloud.google.com/go/spanner v1.60.0 h1:O9kf49dfaDRzPpKJNChHUJ+Bao02WPedZb8ZPyi02lI= +cloud.google.com/go/spanner v1.60.0/go.mod h1:D2bOAeT/dC6zsZhXRIxbdYa5nQEYU3wYM/1KN3eg7Fs= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -158,8 +158,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeEI4= github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= -github.com/ClickHouse/clickhouse-go/v2 v2.21.1 h1:x8wZEMOHDh4K8kLQBtGMeIIguejiaj8/bUiF2VzG6n4= -github.com/ClickHouse/clickhouse-go/v2 v2.21.1/go.mod h1:hTWNkV9mkQwiQ/df0rbN17VXF05UTResY4krnjbzVZA= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2 h1:T1BljsIjj+3aQog80jKMTeF4EqAUG4P6TVcCvmakYAc= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2/go.mod h1:tBhdF3f3RdP7sS59+oBAtTyhWpy0024ZxDMhgxra0QE= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/DataDog/agent-payload/v5 v5.0.104 h1:uxTIaLthyKB4CxBKe+2FeMgL6ca3KVxpeYxlJGNcoJg= @@ -485,8 +485,8 @@ github.com/containerd/ttrpc v1.2.2 h1:9vqZr0pxwOF5koz6N0N3kJ0zDHokrcPxIR/ZR2YFtO github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak= github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/coreos/go-oidc/v3 v3.9.0 h1:0J/ogVOd4y8P0f0xUh8l9t07xRP/d8tccvjHl2dcsSo= -github.com/coreos/go-oidc/v3 v3.9.0/go.mod h1:rTKz2PYwftcrtoCzV5g5kvfJoWcm0Mk8AF8y1iAQro4= +github.com/coreos/go-oidc/v3 v3.10.0 h1:tDnXHnLyiTVyT/2zLDGj09pFPkhND8Gl8lnTRhoEaJU= +github.com/coreos/go-oidc/v3 v3.10.0/go.mod h1:5j11xcw0D3+SGxn6Z/WFADsgcWVMyNAlSQupk0KK3ac= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -630,8 +630,8 @@ github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7F github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= -github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= +github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U= +github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -1192,6 +1192,8 @@ github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HK github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= +github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= @@ -1470,8 +1472,8 @@ github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 h1:32k2QLgsKhcEs55q4REP github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3/go.mod h1:gJrXWi7wSGXfiC7+VheQaz+ypdCt5SmZNL+BRxUe7y4= github.com/signalfx/sapm-proto v0.14.0 h1:KWh3I5E4EkelB19aP1/54Ik8khSioC/RVRW/riOfRGg= github.com/signalfx/sapm-proto v0.14.0/go.mod h1:Km6PskZh966cqNoUn3AmRyGRix5VfwnxVBvn2vjRC9U= -github.com/sijms/go-ora/v2 v2.8.9 h1:XIghcG8hjtYu+G9H235VEe5JXPLJtdzzj7pQm7JucVo= -github.com/sijms/go-ora/v2 v2.8.9/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.10 h1:Ekhx0I+A9qVBy1eOLa2eIhHWWYwVTa0MM78KS6h+5fg= +github.com/sijms/go-ora/v2 v2.8.10/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -1651,86 +1653,86 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240306115632-b2693620eff6 h1:owXKTclbDojb3bKuwvyheSl92ygNVF+aaS9UnIEErmk= -go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:XcDNDNqNBP0G6eQVU7E78tw5HHTzkejZkcjweYbr6cM= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 h1:xUKjw/BUUY+MMo2FR5ibKGq2uAZS72qgOotaj9WdpRA= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TjMxdMv90TzH6HjMJUg/uF2G+jrUOG1rkLZZqpiA3P0= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 h1:wF6wlGx+CXujq8Lvtnbd03uHO5e3QT2RzownXPTnnnI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:swQIq8hlnQYRr7tiEc4z72PE573mnkiEFGMCdlK+Z2A= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6 h1:IlmU3X0cpnzc0DASb+rwRt5/FS94ZsRCVPsoUd2+zJQ= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:mMwdzs/CaxJJCYn3rqSZw4/Ckqh9tNfyIAW96TN3emo= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6 h1:1KKcYDYgf6xncUtccbEkCGSHjWLRkllB+N6hwZmpW7Q= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:g1X2187dRPxXcYsQYe6N7SYlxXSljGPjG8r8o5y3wmo= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6 h1:EdtaFPWHl7JD/KCJ/aNmWgc2pNC1zHDtjs4Fnas+cUk= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pQrKR/Aq1TNqNJOlVsGqIsqr7tNOsJl/VLnqnN+D8Z4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:kl4/vAgdVOycOCF1jDPbUXdZ8EkIDEgmFU2/Akgg39I= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TM0iDw+TINYMLYclaoAgtGKudMoun0zirQili7KZass= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:xBJ42Nn4e6QuaflVWgLINTESCRRZnOfX0taiuoDsgjw= +go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vDiwu5V3Gsqp19NtWfixZyXnT/V++Nko/xQmJz8mvJc= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:lFag1QoqEANT3KhVfKaT3J2RFFHwH6urC+ED7uI7vmE= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vltQMVWBhsB+5oChLlE77BqlHs54RS7oq4va4Gw8vzM= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:doCbNTc6uGPoH1azKROqg21Pq71IcJM1KvvVTPfM0uE= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/GGESGmyy/r2zTB2ogFuxwPGNRJjbiuPY6J02QiXf2Q= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ar/lke632VUrLX6/t9mjKE6QLnt4glhCKCkQvzN5SwY= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:mz2NEu4Dba2/t6MTPOjOOTgFXrmiqPQeShmQmwxrm30= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= @@ -1822,7 +1824,6 @@ golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2066,7 +2067,6 @@ golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2171,8 +2171,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -2196,8 +2196,8 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.167.0 h1:CKHrQD1BLRii6xdkatBDXyKzM0mkawt2QP+H3LtPmSE= -google.golang.org/api v0.167.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= +google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2253,10 +2253,10 @@ google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxH google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= -google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78 h1:SzXBGiWM1LNVYLCRP3e0/Gsze804l4jGoJ5lYysEO5I= -google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 h1:Xs9lu+tLXxLIfuci70nG4cpwaRC+mRQPUL7LoIeDJC4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -2358,14 +2358,14 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -2377,8 +2377,8 @@ k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubelet v0.29.2 h1:bQ2StqkUqPCFNLtGLsb3v3O2LKQHXNMju537zOGboRg= -k8s.io/kubelet v0.29.2/go.mod h1:i5orNPqW/fAMrqptbCXFW/vLBBP12TZZc41IrrvF7SY= +k8s.io/kubelet v0.29.3 h1:X9h0ZHzc+eUeNTaksbN0ItHyvGhQ7Z0HPjnQD2oHdwU= +k8s.io/kubelet v0.29.3/go.mod h1:jDiGuTkFOUynyBKzOoC1xRSWlgAZ9UPcTYeFyjr6vas= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= diff --git a/cmd/oteltestbedcol/builder-config.yaml b/cmd/oteltestbedcol/builder-config.yaml index 37995c1f549d..ab10cc95e47e 100644 --- a/cmd/oteltestbedcol/builder-config.yaml +++ b/cmd/oteltestbedcol/builder-config.yaml @@ -6,15 +6,15 @@ dist: otelcol_version: 0.96.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.96.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.96.0 @@ -26,13 +26,13 @@ exporters: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.96.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.96.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.96.0 diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index 32a4d2dea76a..ce77b2765d29 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -32,28 +32,28 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 golang.org/x/sys v0.18.0 ) require ( cloud.google.com/go/compute v1.24.0 // indirect - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect @@ -215,30 +215,30 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.etcd.io/bbolt v1.3.9 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect @@ -271,7 +271,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.16.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/api v0.166.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect diff --git a/cmd/oteltestbedcol/go.sum b/cmd/oteltestbedcol/go.sum index c1486b572702..6fb4026997af 100644 --- a/cmd/oteltestbedcol/go.sum +++ b/cmd/oteltestbedcol/go.sum @@ -21,8 +21,8 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= -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= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -686,84 +686,84 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 h1:xUKjw/BUUY+MMo2FR5ibKGq2uAZS72qgOotaj9WdpRA= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TjMxdMv90TzH6HjMJUg/uF2G+jrUOG1rkLZZqpiA3P0= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 h1:wF6wlGx+CXujq8Lvtnbd03uHO5e3QT2RzownXPTnnnI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:swQIq8hlnQYRr7tiEc4z72PE573mnkiEFGMCdlK+Z2A= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6 h1:IlmU3X0cpnzc0DASb+rwRt5/FS94ZsRCVPsoUd2+zJQ= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:mMwdzs/CaxJJCYn3rqSZw4/Ckqh9tNfyIAW96TN3emo= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6 h1:1KKcYDYgf6xncUtccbEkCGSHjWLRkllB+N6hwZmpW7Q= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:g1X2187dRPxXcYsQYe6N7SYlxXSljGPjG8r8o5y3wmo= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6 h1:EdtaFPWHl7JD/KCJ/aNmWgc2pNC1zHDtjs4Fnas+cUk= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pQrKR/Aq1TNqNJOlVsGqIsqr7tNOsJl/VLnqnN+D8Z4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:kl4/vAgdVOycOCF1jDPbUXdZ8EkIDEgmFU2/Akgg39I= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TM0iDw+TINYMLYclaoAgtGKudMoun0zirQili7KZass= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:lFag1QoqEANT3KhVfKaT3J2RFFHwH6urC+ED7uI7vmE= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vltQMVWBhsB+5oChLlE77BqlHs54RS7oq4va4Gw8vzM= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:doCbNTc6uGPoH1azKROqg21Pq71IcJM1KvvVTPfM0uE= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/GGESGmyy/r2zTB2ogFuxwPGNRJjbiuPY6J02QiXf2Q= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ar/lke632VUrLX6/t9mjKE6QLnt4glhCKCkQvzN5SwY= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:mz2NEu4Dba2/t6MTPOjOOTgFXrmiqPQeShmQmwxrm30= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= @@ -1058,8 +1058,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= diff --git a/cmd/telemetrygen/go.mod b/cmd/telemetrygen/go.mod index 26b679aad1d7..e53b934816bb 100644 --- a/cmd/telemetrygen/go.mod +++ b/cmd/telemetrygen/go.mod @@ -7,9 +7,9 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.24.0 @@ -44,8 +44,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/proto/otlp v1.1.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/cmd/telemetrygen/go.sum b/cmd/telemetrygen/go.sum index 410414e3769e..624aa950275d 100644 --- a/cmd/telemetrygen/go.sum +++ b/cmd/telemetrygen/go.sum @@ -95,16 +95,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 h1:f2jriWfOdldanBwS9jNBdeOKAQN7b4ugAMaNu1/1k9g= diff --git a/cmd/telemetrygen/internal/e2etest/go.mod b/cmd/telemetrygen/internal/e2etest/go.mod index 464346441dc8..5c575dbc958e 100644 --- a/cmd/telemetrygen/internal/e2etest/go.mod +++ b/cmd/telemetrygen/internal/e2etest/go.mod @@ -6,14 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect @@ -26,6 +25,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect @@ -46,22 +46,22 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect diff --git a/cmd/telemetrygen/internal/e2etest/go.sum b/cmd/telemetrygen/internal/e2etest/go.sum index 64cf5e5767d9..86d02406a369 100644 --- a/cmd/telemetrygen/internal/e2etest/go.sum +++ b/cmd/telemetrygen/internal/e2etest/go.sum @@ -1,9 +1,4 @@ -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 v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -15,8 +10,6 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj 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-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -24,8 +17,6 @@ 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.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= 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= @@ -57,6 +48,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No= @@ -124,48 +117,48 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -221,8 +214,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -257,8 +248,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= 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-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod index e316e25ac271..59e3f5e3a1e3 100644 --- a/confmap/provider/s3provider/go.mod +++ b/confmap/provider/s3provider/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.27.4 github.com/aws/aws-sdk-go-v2/service/s3 v1.51.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum index 3c3bbcdd8fbe..952c87b8dd5f 100644 --- a/confmap/provider/s3provider/go.sum +++ b/confmap/provider/s3provider/go.sum @@ -58,8 +58,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= 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= diff --git a/confmap/provider/secretsmanagerprovider/go.mod b/confmap/provider/secretsmanagerprovider/go.mod index 6623eaf30292..14f9899e6646 100644 --- a/confmap/provider/secretsmanagerprovider/go.mod +++ b/confmap/provider/secretsmanagerprovider/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.1 github.com/aws/smithy-go v1.20.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 ) require ( diff --git a/confmap/provider/secretsmanagerprovider/go.sum b/confmap/provider/secretsmanagerprovider/go.sum index 23da535ea18e..9596dedf82ba 100644 --- a/confmap/provider/secretsmanagerprovider/go.sum +++ b/confmap/provider/secretsmanagerprovider/go.sum @@ -256,8 +256,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= diff --git a/connector/countconnector/go.mod b/connector/countconnector/go.mod index e210b4469bb2..67f39db944ea 100644 --- a/connector/countconnector/go.mod +++ b/connector/countconnector/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -48,8 +48,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/connector/countconnector/go.sum b/connector/countconnector/go.sum index fe58371c1b17..ef8b5ed42c35 100644 --- a/connector/countconnector/go.sum +++ b/connector/countconnector/go.sum @@ -78,20 +78,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/connector/datadogconnector/README.md b/connector/datadogconnector/README.md index 58fdc97d1c69..25df928f1e4f 100644 --- a/connector/datadogconnector/README.md +++ b/connector/datadogconnector/README.md @@ -168,6 +168,11 @@ connectors: ## https://github.com/DataDog/datadog-agent/blob/505170c4ac8c3cbff1a61cf5f84b28d835c91058/pkg/trace/stats/concentrator.go#L55. # # peer_tags: ["tag"] + + ## @param resource_attributes_as_container_tags - enables the use of resource attributes as container tags - Optional + ## A list of resource attributes that should be used as container tags. + # + # resource_attributes_as_container_tags: ["could.availability_zone", "could.region"] ``` **NOTE**: `compute_stats_by_span_kind` and `peer_tags_aggregation` only work when the feature gate `connector.datadogconnector.performance` is enabled. See below for details on this feature gate. diff --git a/connector/datadogconnector/config.go b/connector/datadogconnector/config.go index f60c2222b384..1382f09c5740 100644 --- a/connector/datadogconnector/config.go +++ b/connector/datadogconnector/config.go @@ -63,6 +63,9 @@ type TracesConfig struct { // TraceBuffer specifies the number of Datadog Agent TracerPayloads to buffer before dropping. // The default value is 1000. TraceBuffer int `mapstructure:"trace_buffer"` + + // ResourceAttributesAsContainerTags specifies the list of resource attributes to be used as container tags. + ResourceAttributesAsContainerTags []string `mapstructure:"resource_attributes_as_container_tags"` } // Validate the configuration for errors. This is required by component.Config. diff --git a/connector/datadogconnector/connector.go b/connector/datadogconnector/connector.go index 27b26f46405a..703d55eef9ae 100644 --- a/connector/datadogconnector/connector.go +++ b/connector/datadogconnector/connector.go @@ -6,6 +6,7 @@ package datadogconnector // import "github.com/open-telemetry/opentelemetry-coll import ( "context" "fmt" + "time" pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" traceconfig "github.com/DataDog/datadog-agent/pkg/trace/config" @@ -13,10 +14,12 @@ import ( "github.com/DataDog/datadog-go/v5/statsd" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" + "github.com/patrickmn/go-cache" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" + semconv "go.opentelemetry.io/collector/semconv/v1.17.0" "go.opentelemetry.io/otel/metric/noop" "go.uber.org/zap" @@ -36,16 +39,29 @@ type traceToMetricConnector struct { // from the agent to OTLP Metrics. translator *metrics.Translator + resourceAttrs map[string]string + containerTagCache *cache.Cache + // in specifies the channel through which the agent will output Stats Payloads // resulting from ingested traces. in chan *pb.StatsPayload // exit specifies the exit channel, which will be closed upon shutdown. exit chan struct{} + + // isStarted tracks whether Start() has been called. + isStarted bool } var _ component.Component = (*traceToMetricConnector)(nil) // testing that the connectorImp properly implements the type Component interface +// cacheExpiration is the time after which a container tag cache entry will expire +// and be removed from the cache. +var cacheExpiration = time.Minute * 5 + +// cacheCleanupInterval is the time after which the cache will be cleaned up. +var cacheCleanupInterval = time.Minute + // function to create a new connector func newTraceToMetricConnector(set component.TelemetrySettings, cfg component.Config, metricsConsumer consumer.Metrics, metricsClient statsd.ClientInterface, timingReporter timing.Reporter) (*traceToMetricConnector, error) { set.Logger.Info("Building datadog connector for traces to metrics") @@ -60,14 +76,22 @@ func newTraceToMetricConnector(set component.TelemetrySettings, cfg component.Co return nil, fmt.Errorf("failed to create metrics translator: %w", err) } + ctags := make(map[string]string, len(cfg.(*Config).Traces.ResourceAttributesAsContainerTags)) + for _, val := range cfg.(*Config).Traces.ResourceAttributesAsContainerTags { + ctags[val] = "" + } + ddtags := attributes.ContainerTagFromAttributes(ctags) + ctx := context.Background() return &traceToMetricConnector{ - logger: set.Logger, - agent: datadog.NewAgentWithConfig(ctx, getTraceAgentCfg(cfg.(*Config).Traces, attributesTranslator), in, metricsClient, timingReporter), - translator: trans, - in: in, - metricsConsumer: metricsConsumer, - exit: make(chan struct{}), + logger: set.Logger, + agent: datadog.NewAgentWithConfig(ctx, getTraceAgentCfg(cfg.(*Config).Traces, attributesTranslator), in, metricsClient, timingReporter), + translator: trans, + in: in, + metricsConsumer: metricsConsumer, + resourceAttrs: ddtags, + containerTagCache: cache.New(cacheExpiration, cacheCleanupInterval), + exit: make(chan struct{}), }, nil } @@ -80,6 +104,10 @@ func getTraceAgentCfg(cfg TracesConfig, attributesTranslator *attributes.Transla acfg.ComputeStatsBySpanKind = cfg.ComputeStatsBySpanKind acfg.PeerTagsAggregation = cfg.PeerTagsAggregation acfg.PeerTags = cfg.PeerTags + if len(cfg.ResourceAttributesAsContainerTags) > 0 { + acfg.Features["enable_cid_stats"] = struct{}{} + delete(acfg.Features, "disable_cid_stats") + } if v := cfg.TraceBuffer; v > 0 { acfg.TraceBuffer = v } @@ -91,11 +119,17 @@ func (c *traceToMetricConnector) Start(_ context.Context, _ component.Host) erro c.logger.Info("Starting datadogconnector") c.agent.Start() go c.run() + c.isStarted = true return nil } // Shutdown implements the component.Component interface. func (c *traceToMetricConnector) Shutdown(context.Context) error { + if !c.isStarted { + // Note: it is not necessary to manually close c.exit, c.in and c.agent.(*datadog.TraceAgent).exit channels as these are unused. + c.logger.Info("Requested shutdown, but not started, ignoring.") + return nil + } c.logger.Info("Shutting down datadog connector") c.logger.Info("Stopping datadog agent") // stop the agent and wait for the run loop to exit @@ -111,11 +145,55 @@ func (c *traceToMetricConnector) Capabilities() consumer.Capabilities { return consumer.Capabilities{MutatesData: false} } +func (c *traceToMetricConnector) populateContainerTagsCache(traces ptrace.Traces) { + for i := 0; i < traces.ResourceSpans().Len(); i++ { + rs := traces.ResourceSpans().At(i) + attrs := rs.Resource().Attributes() + containerID, ok := attrs.Get(semconv.AttributeContainerID) + if !ok { + continue + } + ddContainerTags := attributes.ContainerTagsFromResourceAttributes(attrs) + for attr := range c.resourceAttrs { + if val, ok := ddContainerTags[attr]; ok { + var cacheVal map[string]struct{} + if v, ok := c.containerTagCache.Get(containerID.AsString()); ok { + cacheVal = v.(map[string]struct{}) + cacheVal[fmt.Sprintf("%s:%s", attr, val)] = struct{}{} + } else { + cacheVal = make(map[string]struct{}) + cacheVal[fmt.Sprintf("%s:%s", attr, val)] = struct{}{} + c.containerTagCache.Set(containerID.AsString(), cacheVal, cache.DefaultExpiration) + } + + } + } + } +} + func (c *traceToMetricConnector) ConsumeTraces(ctx context.Context, traces ptrace.Traces) error { + c.populateContainerTagsCache(traces) c.agent.Ingest(ctx, traces) return nil } +func (c *traceToMetricConnector) enrichStatsPayload(stats *pb.StatsPayload) { + for _, stat := range stats.Stats { + if stat.ContainerID != "" { + if tags, ok := c.containerTagCache.Get(stat.ContainerID); ok { + tagList := tags.(map[string]struct{}) + for _, tag := range stat.Tags { + tagList[tag] = struct{}{} + } + stat.Tags = make([]string, 0, len(tagList)) + for tag := range tagList { + stat.Tags = append(stat.Tags, tag) + } + } + } + } +} + // run awaits incoming stats resulting from the agent's ingestion, converts them // to metrics and flushes them using the configured metrics exporter. func (c *traceToMetricConnector) run() { @@ -128,7 +206,13 @@ func (c *traceToMetricConnector) run() { } var mx pmetric.Metrics var err error + // Enrich the stats with container tags + if len(c.resourceAttrs) > 0 { + c.enrichStatsPayload(stats) + } + c.logger.Debug("Received stats payload", zap.Any("stats", stats)) + mx, err = c.translator.StatsToMetrics(stats) if err != nil { c.logger.Error("Failed to convert stats to metrics", zap.Error(err)) diff --git a/connector/datadogconnector/connector_test.go b/connector/datadogconnector/connector_test.go index ad3655c56a40..dfac3f7f4ad7 100644 --- a/connector/datadogconnector/connector_test.go +++ b/connector/datadogconnector/connector_test.go @@ -6,11 +6,22 @@ package datadogconnector import ( "context" "testing" + "time" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" + "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes" + otlpmetrics "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/connector/connectortest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/ptrace" + semconv "go.opentelemetry.io/collector/semconv/v1.17.0" + "go.uber.org/zap" + "google.golang.org/protobuf/proto" ) var _ component.Component = (*traceToMetricConnector)(nil) // testing that the connectorImp properly implements the type Component interface @@ -41,3 +52,132 @@ func TestTraceToTraceConnector(t *testing.T) { _, ok := traceToTracesConnector.(*traceToTraceConnector) assert.True(t, ok) // checks if the created connector implements the connectorImp struct } + +var ( + spanStartTimestamp = pcommon.NewTimestampFromTime(time.Date(2020, 2, 11, 20, 26, 12, 321, time.UTC)) + spanEventTimestamp = pcommon.NewTimestampFromTime(time.Date(2020, 2, 11, 20, 26, 13, 123, time.UTC)) + spanEndTimestamp = pcommon.NewTimestampFromTime(time.Date(2020, 2, 11, 20, 26, 13, 789, time.UTC)) +) + +func generateTrace() ptrace.Traces { + td := ptrace.NewTraces() + res := td.ResourceSpans().AppendEmpty().Resource() + res.Attributes().EnsureCapacity(3) + res.Attributes().PutStr("resource-attr1", "resource-attr-val1") + res.Attributes().PutStr("container.id", "my-container-id") + res.Attributes().PutStr("cloud.availability_zone", "my-zone") + res.Attributes().PutStr("cloud.region", "my-region") + + ss := td.ResourceSpans().At(0).ScopeSpans().AppendEmpty().Spans() + ss.EnsureCapacity(1) + fillSpanOne(ss.AppendEmpty()) + return td +} + +func fillSpanOne(span ptrace.Span) { + span.SetName("operationA") + span.SetStartTimestamp(spanStartTimestamp) + span.SetEndTimestamp(spanEndTimestamp) + span.SetDroppedAttributesCount(1) + span.SetTraceID([16]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10}) + span.SetSpanID([8]byte{0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}) + evs := span.Events() + ev0 := evs.AppendEmpty() + ev0.SetTimestamp(spanEventTimestamp) + ev0.SetName("event-with-attr") + ev0.Attributes().PutStr("span-event-attr", "span-event-attr-val") + ev0.SetDroppedAttributesCount(2) + ev1 := evs.AppendEmpty() + ev1.SetTimestamp(spanEventTimestamp) + ev1.SetName("event") + ev1.SetDroppedAttributesCount(2) + span.SetDroppedEventsCount(1) + status := span.Status() + status.SetCode(ptrace.StatusCodeError) + status.SetMessage("status-cancelled") +} + +func TestContainerTags(t *testing.T) { + factory := NewFactory() + + creationParams := connectortest.NewNopCreateSettings() + cfg := factory.CreateDefaultConfig().(*Config) + cfg.Traces.ResourceAttributesAsContainerTags = []string{semconv.AttributeCloudAvailabilityZone, semconv.AttributeCloudRegion} + metricsSink := &consumertest.MetricsSink{} + + traceToMetricsConnector, err := factory.CreateTracesToMetrics(context.Background(), creationParams, cfg, metricsSink) + assert.NoError(t, err) + + connector, ok := traceToMetricsConnector.(*traceToMetricConnector) + err = connector.Start(context.Background(), componenttest.NewNopHost()) + if err != nil { + t.Errorf("Error starting connector: %v", err) + return + } + defer func() { + _ = connector.Shutdown(context.Background()) + }() + + assert.True(t, ok) // checks if the created connector implements the connectorImp struct + trace1 := generateTrace() + + err = connector.ConsumeTraces(context.Background(), trace1) + assert.NoError(t, err) + + // Send two traces to ensure unique container tags are added to the cache + trace2 := generateTrace() + err = connector.ConsumeTraces(context.Background(), trace2) + assert.NoError(t, err) + // check if the container tags are added to the cache + assert.Equal(t, 1, len(connector.containerTagCache.Items())) + assert.Equal(t, 2, len(connector.containerTagCache.Items()["my-container-id"].Object.(map[string]struct{}))) + + for { + if len(metricsSink.AllMetrics()) > 0 { + break + } + time.Sleep(100 * time.Millisecond) + } + + // check if the container tags are added to the metrics + metrics := metricsSink.AllMetrics() + assert.Equal(t, 1, len(metrics)) + + ch := make(chan []byte, 100) + tr := newTranslatorWithStatsChannel(t, zap.NewNop(), ch) + _, err = tr.MapMetrics(context.Background(), metrics[0], nil) + require.NoError(t, err) + msg := <-ch + sp := &pb.StatsPayload{} + + err = proto.Unmarshal(msg, sp) + require.NoError(t, err) + + tags := sp.Stats[0].Tags + assert.Equal(t, 2, len(tags)) + assert.ElementsMatch(t, []string{"region:my-region", "zone:my-zone"}, tags) +} + +func newTranslatorWithStatsChannel(t *testing.T, logger *zap.Logger, ch chan []byte) *otlpmetrics.Translator { + options := []otlpmetrics.TranslatorOption{ + otlpmetrics.WithHistogramMode(otlpmetrics.HistogramModeDistributions), + + otlpmetrics.WithNumberMode(otlpmetrics.NumberModeCumulativeToDelta), + otlpmetrics.WithHistogramAggregations(), + otlpmetrics.WithStatsOut(ch), + } + + set := componenttest.NewNopTelemetrySettings() + set.Logger = logger + + attributesTranslator, err := attributes.NewTranslator(set) + require.NoError(t, err) + tr, err := otlpmetrics.NewTranslator( + set, + attributesTranslator, + options..., + ) + + require.NoError(t, err) + return tr +} diff --git a/connector/datadogconnector/examples/config.yaml b/connector/datadogconnector/examples/config.yaml index d67578e841e3..5d6f03374b67 100644 --- a/connector/datadogconnector/examples/config.yaml +++ b/connector/datadogconnector/examples/config.yaml @@ -5,21 +5,13 @@ receivers: endpoint: "localhost:4318" grpc: endpoint: "localhost:4317" - processors: batch: send_batch_size: 10 timeout: 5s tail_sampling: decision_wait: 1s - policies: [ - { - name: sample_flag, - type: boolean_attribute, - boolean_attribute: { key: sampled, value: true }, - } - ] - + policies: [{name: sample_flag, type: boolean_attribute, boolean_attribute: {key: sampled, value: true}}] connectors: datadog/connector: traces: @@ -28,7 +20,6 @@ connectors: ## all entries must be surrounded by double quotes and separated by commas. # ignore_resources: ["(GET|POST) /healthcheck"] - ## @param span_name_remappings - map of key/value pairs - optional ## A map of Datadog span operation name keys and preferred name valuues to update those names to. This can be used to ## automatically map Datadog Span Operation Names to an updated value, and is useful when a user wants to @@ -39,21 +30,18 @@ connectors: io.opentelemetry.javaagent.spring.client: spring.client instrumentation:express.server: express go.opentelemetry.io_contrib_instrumentation_net_http_otelhttp.client: http.client - ## @param span_name_as_resource_name - use OpenTelemetry semantic convention for span naming - optional ## Option created to maintain similarity with the OpenTelemetry semantic conventions as discussed in the issue below. ## https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/trace/semantic_conventions ## https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/1909 # span_name_as_resource_name: true - ## @param compute_stats_by_span_kind - enables APM stats computation based on `span.kind` - optional ## If set to true, enables an additional stats computation check on spans to see they have an eligible `span.kind` (server, consumer, client, producer). ## If enabled, a span with an eligible `span.kind` will have stats computed. If disabled, only top-level and measured spans will have stats computed. ## NOTE: For stats computed from OTel traces, only top-level spans are considered when this option is off. # compute_stats_by_span_kind: true - ## @param peer_tags_aggregation - enables aggregation of peer related tags in Datadog exporter - optional ## If set to true, enables aggregation of peer related tags (e.g., `peer.service`, `db.instance`, etc.) in Datadog exporter. ## If disabled, aggregated trace stats will not include these tags as dimensions on trace metrics. @@ -66,20 +54,21 @@ connectors: ## The default list of peer tags can be found in https://github.com/DataDog/datadog-agent/blob/main/pkg/trace/stats/concentrator.go. # peer_tags_aggregation: true - ## @param trace_buffer - specifies the number of outgoing trace payloads to buffer before dropping - optional ## If unset, the default value is 1000. ## If you start seeing log messages like `Payload in channel full. Dropped 1 payload.` in the datadog exporter, consider ## setting a higher `trace_buffer` to avoid traces being dropped. # trace_buffer: 500 - ## @param peer_tags - [BETA] Optional list of supplementary peer tags that go beyond the defaults. The Datadog backend validates all tags ## and will drop ones that are unapproved. The default set of peer tags can be found at ## https://github.com/DataDog/datadog-agent/blob/505170c4ac8c3cbff1a61cf5f84b28d835c91058/pkg/trace/stats/concentrator.go#L55. # peer_tags: ["tag"] - + ## @param resource_attributes_as_container_tags - enables the use of resource attributes as container tags - Optional + ## A list of resource attributes that should be used as container tags. + # + resource_attributes_as_container_tags: ["could.availability_zone", "could.region"] exporters: debug: verbosity: detailed @@ -88,7 +77,6 @@ exporters: key: ${env:DD_API_KEY} traces: trace_buffer: 100 - service: pipelines: traces: @@ -102,4 +90,4 @@ service: metrics: receivers: [datadog/connector] processors: [batch] - exporters: [datadog, debug] \ No newline at end of file + exporters: [datadog, debug] diff --git a/connector/datadogconnector/generated_component_test.go b/connector/datadogconnector/generated_component_test.go new file mode 100644 index 000000000000..bf777c39bb36 --- /dev/null +++ b/connector/datadogconnector/generated_component_test.go @@ -0,0 +1,68 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package datadogconnector + +import ( + "context" + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/connector" + "go.opentelemetry.io/collector/connector/connectortest" + "go.opentelemetry.io/collector/consumer/consumertest" +) + +func TestComponentLifecycle(t *testing.T) { + factory := NewFactory() + + tests := []struct { + name string + createFn func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) + }{ + + { + name: "traces_to_metrics", + createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + return factory.CreateTracesToMetrics(ctx, set, cfg, consumertest.NewNop()) + }, + }, + + { + name: "traces_to_traces", + createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + return factory.CreateTracesToTraces(ctx, set, cfg, consumertest.NewNop()) + }, + }, + } + + cm, err := confmaptest.LoadConf("metadata.yaml") + require.NoError(t, err) + cfg := factory.CreateDefaultConfig() + sub, err := cm.Sub("tests::config") + require.NoError(t, err) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) + + for _, test := range tests { + t.Run(test.name+"-shutdown", func(t *testing.T) { + c, err := test.createFn(context.Background(), connectortest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + err = c.Shutdown(context.Background()) + require.NoError(t, err) + }) + t.Run(test.name+"-lifecycle", func(t *testing.T) { + firstConnector, err := test.createFn(context.Background(), connectortest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + host := componenttest.NewNopHost() + require.NoError(t, err) + require.NoError(t, firstConnector.Start(context.Background(), host)) + require.NoError(t, firstConnector.Shutdown(context.Background())) + secondConnector, err := test.createFn(context.Background(), connectortest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + require.NoError(t, secondConnector.Start(context.Background(), host)) + require.NoError(t, secondConnector.Shutdown(context.Background())) + }) + } +} diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index 4eea853c935c..4c2fa4272316 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -11,21 +11,25 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.96.0 + github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 + google.golang.org/protobuf v1.33.0 ) require ( @@ -77,7 +81,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -116,7 +120,6 @@ require ( github.com/openshift/api v3.9.0+incompatible // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/outcaste-io/ristretto v0.2.1 // indirect - github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect @@ -137,31 +140,29 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -188,19 +189,18 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.16.1 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect - google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect - k8s.io/client-go v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect + k8s.io/client-go v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index e2578412e8ab..85a5e7fa9b0d 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -268,8 +268,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -590,82 +590,82 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 h1:xUKjw/BUUY+MMo2FR5ibKGq2uAZS72qgOotaj9WdpRA= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TjMxdMv90TzH6HjMJUg/uF2G+jrUOG1rkLZZqpiA3P0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:kl4/vAgdVOycOCF1jDPbUXdZ8EkIDEgmFU2/Akgg39I= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TM0iDw+TINYMLYclaoAgtGKudMoun0zirQili7KZass= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -913,8 +913,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1015,14 +1015,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/connector/datadogconnector/metadata.yaml b/connector/datadogconnector/metadata.yaml index 0f6651c16612..7feb71b52186 100644 --- a/connector/datadogconnector/metadata.yaml +++ b/connector/datadogconnector/metadata.yaml @@ -11,5 +11,3 @@ status: emeritus: [gbbr] tests: - skip_lifecycle: true - skip_shutdown: true diff --git a/connector/exceptionsconnector/go.mod b/connector/exceptionsconnector/go.mod index 75e33b85a8ec..a31751cfdca2 100644 --- a/connector/exceptionsconnector/go.mod +++ b/connector/exceptionsconnector/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -29,6 +29,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -43,8 +44,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/connector/exceptionsconnector/go.sum b/connector/exceptionsconnector/go.sum index 2964cb688dc9..81a01196cc93 100644 --- a/connector/exceptionsconnector/go.sum +++ b/connector/exceptionsconnector/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,22 +64,22 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/connector/failoverconnector/go.mod b/connector/failoverconnector/go.mod index 33e38f6a550a..b402558ab913 100644 --- a/connector/failoverconnector/go.mod +++ b/connector/failoverconnector/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/connector/failoverconnector/go.sum b/connector/failoverconnector/go.sum index a40a26b52359..f94474defe68 100644 --- a/connector/failoverconnector/go.sum +++ b/connector/failoverconnector/go.sum @@ -22,6 +22,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -64,20 +66,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/connector/routingconnector/go.mod b/connector/routingconnector/go.mod index 44d06c6373f0..d6c56cb37ad2 100644 --- a/connector/routingconnector/go.mod +++ b/connector/routingconnector/go.mod @@ -5,11 +5,11 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/connector/routingconnector/go.sum b/connector/routingconnector/go.sum index 815af3ac5d2e..d5088264d9bc 100644 --- a/connector/routingconnector/go.sum +++ b/connector/routingconnector/go.sum @@ -78,20 +78,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/connector/servicegraphconnector/go.mod b/connector/servicegraphconnector/go.mod index ff0d4bea840d..3468124582ca 100644 --- a/connector/servicegraphconnector/go.mod +++ b/connector/servicegraphconnector/go.mod @@ -4,17 +4,17 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 @@ -53,24 +53,24 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // 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/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect diff --git a/connector/servicegraphconnector/go.sum b/connector/servicegraphconnector/go.sum index d419509463d0..e28cd6a37e31 100644 --- a/connector/servicegraphconnector/go.sum +++ b/connector/servicegraphconnector/go.sum @@ -107,8 +107,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -133,58 +133,58 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -263,7 +263,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/connector/spanmetricsconnector/go.mod b/connector/spanmetricsconnector/go.mod index 56ae1bd874cb..ee26c5be6255 100644 --- a/connector/spanmetricsconnector/go.mod +++ b/connector/spanmetricsconnector/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -31,6 +31,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -44,8 +45,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/connector/spanmetricsconnector/go.sum b/connector/spanmetricsconnector/go.sum index 31fb3b1cf30f..ceb6d3e10751 100644 --- a/connector/spanmetricsconnector/go.sum +++ b/connector/spanmetricsconnector/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -68,22 +70,22 @@ github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/examples/couchbase/docker-compose.yaml b/examples/couchbase/docker-compose.yaml index 119abb8d7727..1a7a2473e2cb 100644 --- a/examples/couchbase/docker-compose.yaml +++ b/examples/couchbase/docker-compose.yaml @@ -17,7 +17,7 @@ services: depends_on: - couchbase prometheus: - image: prom/prometheus:v2.50.1 + image: prom/prometheus:v2.51.0 volumes: - ./prometheus-config.yaml:/etc/prometheus/prometheus.yml ports: diff --git a/exporter/alertmanagerexporter/alertmanager_exporter_test.go b/exporter/alertmanagerexporter/alertmanager_exporter_test.go index 438c44824fe7..382e541fa716 100644 --- a/exporter/alertmanagerexporter/alertmanager_exporter_test.go +++ b/exporter/alertmanagerexporter/alertmanager_exporter_test.go @@ -347,7 +347,7 @@ func TestClientConfig(t *testing.T) { config: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -370,8 +370,8 @@ func TestClientConfig(t *testing.T) { config: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "testdata/test_cert.pem", }, }, @@ -383,8 +383,8 @@ func TestClientConfig(t *testing.T) { config: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "nosuchfile", }, }, diff --git a/exporter/alertmanagerexporter/config_test.go b/exporter/alertmanagerexporter/config_test.go index 41a3acda1b42..3583349ac1df 100644 --- a/exporter/alertmanagerexporter/config_test.go +++ b/exporter/alertmanagerexporter/config_test.go @@ -69,8 +69,8 @@ func TestLoadConfig(t *testing.T) { "another": "somevalue", }, Endpoint: "a.new.alertmanager.target:9093", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/var/lib/mycert.pem", }, }, diff --git a/exporter/alertmanagerexporter/generated_component_test.go b/exporter/alertmanagerexporter/generated_component_test.go index c4f131b980fd..3cc537978d84 100644 --- a/exporter/alertmanagerexporter/generated_component_test.go +++ b/exporter/alertmanagerexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/alertmanagerexporter/go.mod b/exporter/alertmanagerexporter/go.mod index 5179625eeb5e..e74aaacafc68 100644 --- a/exporter/alertmanagerexporter/go.mod +++ b/exporter/alertmanagerexporter/go.mod @@ -7,16 +7,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/prometheus/common v0.50.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -35,6 +35,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -50,15 +51,15 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/alertmanagerexporter/go.sum b/exporter/alertmanagerexporter/go.sum index c21576af54f9..b770aad5240a 100644 --- a/exporter/alertmanagerexporter/go.sum +++ b/exporter/alertmanagerexporter/go.sum @@ -29,6 +29,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -76,44 +78,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/alibabacloudlogserviceexporter/generated_component_test.go b/exporter/alibabacloudlogserviceexporter/generated_component_test.go index e0e39450530a..3f21d51c8285 100644 --- a/exporter/alibabacloudlogserviceexporter/generated_component_test.go +++ b/exporter/alibabacloudlogserviceexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index 65ee0c1334b9..3a1e04abe6cc 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,12 +7,12 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -30,6 +30,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -45,12 +46,12 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index 3df84f701b28..df47792e0979 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -155,6 +155,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= @@ -353,30 +355,30 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mI go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/awscloudwatchlogsexporter/generated_component_test.go b/exporter/awscloudwatchlogsexporter/generated_component_test.go index 6a0daa99272d..43a94327eafc 100644 --- a/exporter/awscloudwatchlogsexporter/generated_component_test.go +++ b/exporter/awscloudwatchlogsexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 1725c655e84c..ada9749ee347 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -45,10 +45,10 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index a92413c65dc1..c55e7255e2c2 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -74,26 +74,26 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/awsemfexporter/generated_component_test.go b/exporter/awsemfexporter/generated_component_test.go index 38476727c15b..8613a09d57d9 100644 --- a/exporter/awsemfexporter/generated_component_test.go +++ b/exporter/awsemfexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index dd586d83ea38..9859d51e6482 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -11,13 +11,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -51,11 +51,11 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 875b8f6fb063..f033efc0a96f 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -76,30 +76,30 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 7f19d1faaa5b..790eb314ab86 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -15,12 +15,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -63,11 +63,11 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index 5a6fac073662..99eb125be73c 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -108,28 +108,28 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/awss3exporter/generated_component_test.go b/exporter/awss3exporter/generated_component_test.go index c9b8a9eff686..cd70588d72a3 100644 --- a/exporter/awss3exporter/generated_component_test.go +++ b/exporter/awss3exporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/awss3exporter/go.mod b/exporter/awss3exporter/go.mod index d05c807e4d8f..3d57a5230a61 100644 --- a/exporter/awss3exporter/go.mod +++ b/exporter/awss3exporter/go.mod @@ -5,13 +5,13 @@ go 1.21 require ( github.com/aws/aws-sdk-go v1.50.27 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -50,30 +50,30 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // 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/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect diff --git a/exporter/awss3exporter/go.sum b/exporter/awss3exporter/go.sum index 493c8cdb18fb..23c529721f45 100644 --- a/exporter/awss3exporter/go.sum +++ b/exporter/awss3exporter/go.sum @@ -113,8 +113,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -139,60 +139,60 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -271,7 +271,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/exporter/awsxrayexporter/generated_component_test.go b/exporter/awsxrayexporter/generated_component_test.go index 692caacf546c..de2a712670ad 100644 --- a/exporter/awsxrayexporter/generated_component_test.go +++ b/exporter/awsxrayexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 9ae6d5611a2d..bbfe1d6ffd41 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -8,13 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -31,6 +31,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -46,11 +47,11 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 59dc573460bc..36fa50ae5f7c 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -25,6 +25,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -74,30 +76,30 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/azuredataexplorerexporter/go.mod b/exporter/azuredataexplorerexporter/go.mod index ac25664894bf..b3b8a91a3f61 100644 --- a/exporter/azuredataexplorerexporter/go.mod +++ b/exporter/azuredataexplorerexporter/go.mod @@ -8,12 +8,12 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -64,11 +64,11 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/samber/lo v1.38.1 // indirect github.com/shopspring/decimal v1.3.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/azuredataexplorerexporter/go.sum b/exporter/azuredataexplorerexporter/go.sum index d83118193222..c1023e09f011 100644 --- a/exporter/azuredataexplorerexporter/go.sum +++ b/exporter/azuredataexplorerexporter/go.sum @@ -135,28 +135,28 @@ github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pv 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/azuremonitorexporter/generated_component_test.go b/exporter/azuremonitorexporter/generated_component_test.go index 9e9048a6f007..d2d202bfd315 100644 --- a/exporter/azuremonitorexporter/generated_component_test.go +++ b/exporter/azuremonitorexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 9a8178819981..7369c4f7eea0 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -31,6 +31,7 @@ require ( github.com/gofrs/uuid v4.0.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -45,11 +46,11 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index b43037e097a9..410360896a59 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -30,6 +30,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= @@ -83,30 +85,30 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/carbonexporter/generated_component_test.go b/exporter/carbonexporter/generated_component_test.go index b4234639f099..7a02d6c0c47e 100644 --- a/exporter/carbonexporter/generated_component_test.go +++ b/exporter/carbonexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index f4eb327d8008..45b0650b99cc 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -29,6 +29,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -43,12 +44,12 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index 568fa2c3d7c7..4dad9f839ba4 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -23,6 +23,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -66,32 +68,32 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/cassandraexporter/go.mod b/exporter/cassandraexporter/go.mod index 53b6831c988c..88bbd327aeac 100644 --- a/exporter/cassandraexporter/go.mod +++ b/exporter/cassandraexporter/go.mod @@ -6,11 +6,11 @@ require ( github.com/gocql/gocql v1.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,6 +28,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -42,12 +43,12 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/cassandraexporter/go.sum b/exporter/cassandraexporter/go.sum index 2b9c473afb40..b71893fd2393 100644 --- a/exporter/cassandraexporter/go.sum +++ b/exporter/cassandraexporter/go.sum @@ -32,6 +32,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -78,28 +80,28 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index de00160dd7ca..3eeea256f9f6 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -3,19 +3,19 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickh go 1.21 require ( - github.com/ClickHouse/clickhouse-go/v2 v2.21.1 + github.com/ClickHouse/clickhouse-go/v2 v2.22.2 github.com/cenkalti/backoff/v4 v4.2.1 github.com/jmoiron/sqlx v1.3.5 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.28.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -77,18 +77,18 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/segmentio/asm v1.2.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index 7b142174afaa..4b503b1a7792 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -6,8 +6,8 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOEl github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeEI4= github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= -github.com/ClickHouse/clickhouse-go/v2 v2.21.1 h1:x8wZEMOHDh4K8kLQBtGMeIIguejiaj8/bUiF2VzG6n4= -github.com/ClickHouse/clickhouse-go/v2 v2.21.1/go.mod h1:hTWNkV9mkQwiQ/df0rbN17VXF05UTResY4krnjbzVZA= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2 h1:T1BljsIjj+3aQog80jKMTeF4EqAUG4P6TVcCvmakYAc= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2/go.mod h1:tBhdF3f3RdP7sS59+oBAtTyhWpy0024ZxDMhgxra0QE= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= @@ -150,8 +150,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -184,33 +184,33 @@ github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgk github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -272,7 +272,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/exporter/coralogixexporter/config_test.go b/exporter/coralogixexporter/config_test.go index e3ccf3a154c5..4ea81bbefefd 100644 --- a/exporter/coralogixexporter/config_test.go +++ b/exporter/coralogixexporter/config_test.go @@ -60,8 +60,8 @@ func TestLoadConfig(t *testing.T) { Traces: configgrpc.ClientConfig{ Endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Compression: configcompression.TypeGzip, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{}, + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{}, Insecure: false, InsecureSkipVerify: false, ServerName: "", @@ -73,8 +73,8 @@ func TestLoadConfig(t *testing.T) { }, ClientConfig: configgrpc.ClientConfig{ Endpoint: "https://", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{}, + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{}, Insecure: false, InsecureSkipVerify: false, ServerName: "", @@ -115,8 +115,8 @@ func TestLoadConfig(t *testing.T) { Traces: configgrpc.ClientConfig{ Endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Compression: configcompression.TypeGzip, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{}, + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{}, Insecure: false, InsecureSkipVerify: false, ServerName: "", @@ -130,8 +130,8 @@ func TestLoadConfig(t *testing.T) { SubSystemAttributes: []string{"service.name", "k8s.deployment.name", "k8s.statefulset.name", "k8s.daemonset.name", "k8s.cronjob.name", "k8s.job.name", "k8s.container.name"}, ClientConfig: configgrpc.ClientConfig{ Endpoint: "https://", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{}, + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{}, Insecure: false, InsecureSkipVerify: false, ServerName: "", diff --git a/exporter/coralogixexporter/factory_test.go b/exporter/coralogixexporter/factory_test.go index 9c98356722fd..bbac7634c6d4 100644 --- a/exporter/coralogixexporter/factory_test.go +++ b/exporter/coralogixexporter/factory_test.go @@ -92,7 +92,7 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ Traces: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -172,8 +172,8 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ Traces: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "nosuchfile", }, }, @@ -186,7 +186,7 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ Domain: "localhost", DomainSettings: configgrpc.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, diff --git a/exporter/coralogixexporter/generated_component_test.go b/exporter/coralogixexporter/generated_component_test.go index 229c40148100..18f1b2036164 100644 --- a/exporter/coralogixexporter/generated_component_test.go +++ b/exporter/coralogixexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index 45bdccd53875..ffc244948309 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -5,16 +5,16 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -34,6 +34,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.2 // indirect @@ -50,16 +51,16 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index d579dfe73d7a..1fc86bc17e81 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -1,20 +1,12 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/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/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= 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-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -35,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -82,46 +76,46 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -151,8 +145,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -173,8 +165,6 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index 26372229c40a..4f8d86117992 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -30,7 +30,6 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" - "go.opentelemetry.io/otel/metric/noop" "go.uber.org/zap" "google.golang.org/protobuf/proto" @@ -106,9 +105,6 @@ func (f *factory) SourceProvider(set component.TelemetrySettings, configHostname func (f *factory) AttributesTranslator(set component.TelemetrySettings) (*attributes.Translator, error) { f.onceAttributesTranslator.Do(func() { - // disable metrics for the translator - // Metrics are disabled until we figure out the details on how do we want to report the metric. - set.MeterProvider = noop.NewMeterProvider() f.attributesTranslator, f.attributesErr = attributes.NewTranslator(set) }) return f.attributesTranslator, f.attributesErr @@ -359,7 +355,8 @@ func (f *factory) createMetricsExporter( exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: true}), exporterhelper.WithQueue(cfg.QueueSettings), exporterhelper.WithShutdown(func(context.Context) error { - cancel() + cancel() // first cancel context + f.wg.Wait() // then wait for shutdown f.StopReporter() statsWriter.Stop() if statsIn != nil { diff --git a/exporter/datadogexporter/generated_component_test.go b/exporter/datadogexporter/generated_component_test.go index 0938f49b1bec..067e8b463c87 100644 --- a/exporter/datadogexporter/generated_component_test.go +++ b/exporter/datadogexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 7d79e7293580..fd36a3fcadc8 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -35,27 +35,27 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -63,8 +63,8 @@ require ( google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -131,7 +131,7 @@ require ( github.com/golang-jwt/jwt/v5 v5.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-querystring v1.1.0 // indirect @@ -235,21 +235,21 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect github.com/zorkian/go-datadog-api v2.30.0+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -277,7 +277,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.16.1 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/api v0.150.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect @@ -287,7 +287,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 7491d43e42f0..8ba2b8bdbf62 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -331,8 +331,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -782,82 +782,82 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 h1:xUKjw/BUUY+MMo2FR5ibKGq2uAZS72qgOotaj9WdpRA= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TjMxdMv90TzH6HjMJUg/uF2G+jrUOG1rkLZZqpiA3P0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:kl4/vAgdVOycOCF1jDPbUXdZ8EkIDEgmFU2/Akgg39I= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TM0iDw+TINYMLYclaoAgtGKudMoun0zirQili7KZass= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -1165,8 +1165,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1295,14 +1295,14 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index 9e4f046d7261..87d51eb2313b 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -9,17 +9,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.96.0 github.com/stretchr/testify v1.9.0 github.com/tinylib/msgp v1.1.9 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 go.opentelemetry.io/otel/sdk v1.24.0 @@ -80,7 +80,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -140,31 +140,31 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v1.24.0 // indirect @@ -190,7 +190,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.16.1 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect @@ -199,9 +199,9 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect - k8s.io/client-go v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect + k8s.io/client-go v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index e2578412e8ab..85a5e7fa9b0d 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -268,8 +268,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -590,82 +590,82 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 h1:xUKjw/BUUY+MMo2FR5ibKGq2uAZS72qgOotaj9WdpRA= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TjMxdMv90TzH6HjMJUg/uF2G+jrUOG1rkLZZqpiA3P0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:kl4/vAgdVOycOCF1jDPbUXdZ8EkIDEgmFU2/Akgg39I= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TM0iDw+TINYMLYclaoAgtGKudMoun0zirQili7KZass= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -913,8 +913,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1015,14 +1015,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/exporter/datasetexporter/go.mod b/exporter/datasetexporter/go.mod index edf67c9f3bee..db281db493a8 100644 --- a/exporter/datasetexporter/go.mod +++ b/exporter/datasetexporter/go.mod @@ -8,18 +8,18 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/scalyr/dataset-go v0.18.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/zap v1.27.0 ) require ( github.com/cenkalti/backoff/v4 v4.2.1 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 ) @@ -47,11 +47,11 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/datasetexporter/go.sum b/exporter/datasetexporter/go.sum index 3f874bd39167..ffd9cae53ab3 100644 --- a/exporter/datasetexporter/go.sum +++ b/exporter/datasetexporter/go.sum @@ -70,28 +70,28 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/dynatraceexporter/generated_component_test.go b/exporter/dynatraceexporter/generated_component_test.go index b31a9a2ae4d9..cf9af9d2bc5f 100644 --- a/exporter/dynatraceexporter/generated_component_test.go +++ b/exporter/dynatraceexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index 1604661748ef..074ff944b581 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -8,15 +8,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -36,6 +36,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,15 +53,15 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index 34acb6ee28f8..ae4b310fe965 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -31,6 +31,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -78,42 +80,42 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/dynatraceexporter/metrics_exporter_test.go b/exporter/dynatraceexporter/metrics_exporter_test.go index ae31e474dce4..0e095b6c6796 100644 --- a/exporter/dynatraceexporter/metrics_exporter_test.go +++ b/exporter/dynatraceexporter/metrics_exporter_test.go @@ -689,8 +689,8 @@ func Test_exporter_start_InvalidClientConfig(t *testing.T) { cfg := &config.Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:9090", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/exporter/elasticsearchexporter/config.go b/exporter/elasticsearchexporter/config.go index b30f486c4116..63dfe75dde89 100644 --- a/exporter/elasticsearchexporter/config.go +++ b/exporter/elasticsearchexporter/config.go @@ -90,7 +90,7 @@ type ClientConfig struct { // will be send with each HTTP request. Headers map[string]string `mapstructure:"headers,omitempty"` - configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + configtls.ClientConfig `mapstructure:"tls,omitempty"` } // AuthenticationSettings defines user authentication related settings. diff --git a/exporter/elasticsearchexporter/elasticsearch_bulk.go b/exporter/elasticsearchexporter/elasticsearch_bulk.go index b0ad977cd1a6..9885b70a4127 100644 --- a/exporter/elasticsearchexporter/elasticsearch_bulk.go +++ b/exporter/elasticsearchexporter/elasticsearch_bulk.go @@ -65,7 +65,7 @@ func (*clientLogger) ResponseBodyEnabled() bool { } func newElasticsearchClient(logger *zap.Logger, config *Config) (*esClientCurrent, error) { - tlsCfg, err := config.TLSClientSetting.LoadTLSConfig() + tlsCfg, err := config.ClientConfig.LoadTLSConfig() if err != nil { return nil, err } diff --git a/exporter/elasticsearchexporter/generated_component_test.go b/exporter/elasticsearchexporter/generated_component_test.go index 8f123f42726f..57761a699ae0 100644 --- a/exporter/elasticsearchexporter/generated_component_test.go +++ b/exporter/elasticsearchexporter/generated_component_test.go @@ -63,20 +63,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index ea26f7a172af..4b78d7d596b4 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -33,6 +33,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -47,12 +48,12 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index 740814113d4b..05825bfd9b18 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -29,6 +29,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -77,32 +79,32 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/fileexporter/README.md b/exporter/fileexporter/README.md index ce011b725c67..986343386155 100644 --- a/exporter/fileexporter/README.md +++ b/exporter/fileexporter/README.md @@ -47,6 +47,7 @@ The following settings are optional: - localtime : [default: false (use UTC)] whether or not the timestamps in backup files is formatted according to the host's local time. - `format`[default: json]: define the data format of encoded telemetry data. The setting can be overridden with `proto`. +- `encoding`[default: none]: if specified, uses an encoding extension to encode telemetry data. Overrides `format`. - `append`[default: `false`] defines whether append to the file (`true`) or truncate (`false`). If `append: true` is set then setting `rotation` or `compression` is currently not supported. - `compression`[no default]: the compression algorithm used when exporting telemetry data to file. Supported compression algorithms:`zstd` - `flush_interval`[default: 1s]: `time.Duration` interval between flushes. See [time.ParseDuration](https://pkg.go.dev/time#ParseDuration) for valid formats. diff --git a/exporter/fileexporter/config.go b/exporter/fileexporter/config.go index 8508b6b01d9e..bdd05dd278b5 100644 --- a/exporter/fileexporter/config.go +++ b/exporter/fileexporter/config.go @@ -40,6 +40,10 @@ type Config struct { // - proto: OTLP binary protobuf bytes. FormatType string `mapstructure:"format"` + // Encoding defines the encoding of the telemetry data. + // If specified, it overrides `FormatType` and applies an encoding extension. + Encoding *component.ID `mapstructure:"encoding"` + // Compression Codec used to export telemetry data // Supported compression algorithms:`zstd` Compression string `mapstructure:"compression"` diff --git a/exporter/fileexporter/encoding_test.go b/exporter/fileexporter/encoding_test.go new file mode 100644 index 000000000000..fbcf35415879 --- /dev/null +++ b/exporter/fileexporter/encoding_test.go @@ -0,0 +1,120 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package fileexporter + +import ( + "context" + "os" + "path/filepath" + "testing" + "time" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/extension/extensiontest" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/pdata/ptrace" + + "github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension" +) + +type hostWithEncoding struct { + encodings map[component.ID]component.Component +} + +func (h hostWithEncoding) GetFactory(_ component.Kind, _ component.Type) component.Factory { + panic("unsupported") +} + +func (h hostWithEncoding) GetExtensions() map[component.ID]component.Component { + return h.encodings +} + +func (h hostWithEncoding) GetExporters() map[component.DataType]map[component.ID]component.Component { + panic("unsupported") +} + +func TestEncoding(t *testing.T) { + f := NewFactory() + cfg := f.CreateDefaultConfig().(*Config) + cfg.Path = filepath.Join(t.TempDir(), "encoding.txt") + id := component.MustNewID("otlpjson") + cfg.Encoding = &id + + ef := otlpencodingextension.NewFactory() + efCfg := ef.CreateDefaultConfig().(*otlpencodingextension.Config) + efCfg.Protocol = "otlp_json" + ext, err := ef.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), efCfg) + require.NoError(t, err) + require.NoError(t, ext.Start(context.Background(), componenttest.NewNopHost())) + + me, err := f.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + te, err := f.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + le, err := f.CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + host := hostWithEncoding{ + map[component.ID]component.Component{id: ext}, + } + require.NoError(t, me.Start(context.Background(), host)) + require.NoError(t, te.Start(context.Background(), host)) + require.NoError(t, le.Start(context.Background(), host)) + t.Cleanup(func() { + + }) + + require.NoError(t, me.ConsumeMetrics(context.Background(), generateMetrics())) + require.NoError(t, te.ConsumeTraces(context.Background(), generateTraces())) + require.NoError(t, le.ConsumeLogs(context.Background(), generateLogs())) + + require.NoError(t, me.Shutdown(context.Background())) + require.NoError(t, te.Shutdown(context.Background())) + require.NoError(t, le.Shutdown(context.Background())) + + b, err := os.ReadFile(cfg.Path) + require.NoError(t, err) + require.Contains(t, string(b), `{"resourceMetrics":`) + require.Contains(t, string(b), `{"resourceSpans":`) + require.Contains(t, string(b), `{"resourceLogs":`) +} + +func generateLogs() plog.Logs { + logs := plog.NewLogs() + rl := logs.ResourceLogs().AppendEmpty() + rl.Resource().Attributes().PutStr("resource", "R1") + l := rl.ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() + l.Body().SetStr("test log message") + l.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + return logs +} + +func generateMetrics() pmetric.Metrics { + metrics := pmetric.NewMetrics() + rm := metrics.ResourceMetrics().AppendEmpty() + rm.Resource().Attributes().PutStr("resource", "R1") + m := rm.ScopeMetrics().AppendEmpty().Metrics().AppendEmpty() + m.SetName("test_metric") + dp := m.SetEmptyGauge().DataPoints().AppendEmpty() + dp.Attributes().PutStr("test_attr", "value_1") + dp.SetIntValue(123) + dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + return metrics +} + +func generateTraces() ptrace.Traces { + traces := ptrace.NewTraces() + rs := traces.ResourceSpans().AppendEmpty() + rs.Resource().Attributes().PutStr("resource", "R1") + span := rs.ScopeSpans().AppendEmpty().Spans().AppendEmpty() + span.Attributes().PutStr("test_attr", "value_1") + span.SetName("test_span") + span.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now().Add(-1 * time.Second))) + span.SetEndTimestamp(pcommon.NewTimestampFromTime(time.Now())) + return traces +} diff --git a/exporter/fileexporter/file_exporter.go b/exporter/fileexporter/file_exporter.go index e3b6a2f6b095..c7a090f28c6c 100644 --- a/exporter/fileexporter/file_exporter.go +++ b/exporter/fileexporter/file_exporter.go @@ -44,11 +44,14 @@ func (e *fileExporter) consumeLogs(_ context.Context, ld plog.Logs) error { } // Start starts the flush timer if set. -func (e *fileExporter) Start(_ context.Context, _ component.Host) error { - e.marshaller = newMarshaller(e.conf) +func (e *fileExporter) Start(_ context.Context, host component.Host) error { + var err error + e.marshaller, err = newMarshaller(e.conf, host) + if err != nil { + return err + } export := buildExportFunc(e.conf) - var err error e.writer, err = newFileWriter(e.conf.Path, e.conf.Append, e.conf.Rotation, e.conf.FlushInterval, export) if err != nil { return err diff --git a/exporter/fileexporter/generated_component_test.go b/exporter/fileexporter/generated_component_test.go index 01de9d0396be..338d3e841ea2 100644 --- a/exporter/fileexporter/generated_component_test.go +++ b/exporter/fileexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 04ff79bdeb90..9311f978264a 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -5,14 +5,16 @@ go 1.21 require ( github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/klauspost/compress v1.17.7 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,12 +26,13 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -38,16 +41,16 @@ require ( 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/pmezard/go-difflib v1.0.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.96.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -77,3 +80,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension => ../../extension/encoding/otlpencodingextension + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding => ../../extension/encoding diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index dad2fce4cc43..0221e549ded4 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -5,8 +5,9 @@ github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY 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/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= 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= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= @@ -23,6 +24,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -50,8 +53,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w 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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= 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/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= @@ -68,26 +72,26 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/fileexporter/grouping_file_exporter.go b/exporter/fileexporter/grouping_file_exporter.go index 10a7385b05fb..329c61878577 100644 --- a/exporter/fileexporter/grouping_file_exporter.go +++ b/exporter/fileexporter/grouping_file_exporter.go @@ -244,8 +244,12 @@ func group[T any](e *groupingFileExporter, groups map[string][]T, resource pcomm } // Start initializes and starts the exporter. -func (e *groupingFileExporter) Start(context.Context, component.Host) error { - e.marshaller = newMarshaller(e.conf) +func (e *groupingFileExporter) Start(_ context.Context, host component.Host) error { + var err error + e.marshaller, err = newMarshaller(e.conf, host) + if err != nil { + return err + } export := buildExportFunc(e.conf) pathParts := strings.Split(e.conf.Path, "*") diff --git a/exporter/fileexporter/marshaller.go b/exporter/fileexporter/marshaller.go index d45302d86aea..9090640d8be7 100644 --- a/exporter/fileexporter/marshaller.go +++ b/exporter/fileexporter/marshaller.go @@ -4,6 +4,10 @@ package fileexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter" import ( + "errors" + "fmt" + + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -34,7 +38,24 @@ type marshaller struct { formatType string } -func newMarshaller(conf *Config) *marshaller { +func newMarshaller(conf *Config, host component.Host) (*marshaller, error) { + if conf.Encoding != nil { + encoding := host.GetExtensions()[*conf.Encoding] + if encoding == nil { + return nil, fmt.Errorf("unknown encoding %q", conf.Encoding) + } + // cast with ok to avoid panics. + tm, _ := encoding.(ptrace.Marshaler) + pm, _ := encoding.(pmetric.Marshaler) + lm, _ := encoding.(plog.Marshaler) + return &marshaller{ + tracesMarshaler: tm, + metricsMarshaler: pm, + logsMarshaler: lm, + compression: conf.Compression, + compressor: buildCompressor(conf.Compression), + }, nil + } return &marshaller{ formatType: conf.FormatType, tracesMarshaler: tracesMarshalers[conf.FormatType], @@ -42,10 +63,13 @@ func newMarshaller(conf *Config) *marshaller { logsMarshaler: logsMarshalers[conf.FormatType], compression: conf.Compression, compressor: buildCompressor(conf.Compression), - } + }, nil } func (m *marshaller) marshalTraces(td ptrace.Traces) ([]byte, error) { + if m.metricsMarshaler == nil { + return nil, errors.New("traces are not supported by encoding") + } buf, err := m.tracesMarshaler.MarshalTraces(td) if err != nil { return nil, err @@ -55,6 +79,9 @@ func (m *marshaller) marshalTraces(td ptrace.Traces) ([]byte, error) { } func (m *marshaller) marshalMetrics(md pmetric.Metrics) ([]byte, error) { + if m.metricsMarshaler == nil { + return nil, errors.New("metrics are not supported by encoding") + } buf, err := m.metricsMarshaler.MarshalMetrics(md) if err != nil { return nil, err @@ -64,6 +91,9 @@ func (m *marshaller) marshalMetrics(md pmetric.Metrics) ([]byte, error) { } func (m *marshaller) marshalLogs(ld plog.Logs) ([]byte, error) { + if m.metricsMarshaler == nil { + return nil, errors.New("logs are not supported by encoding") + } buf, err := m.logsMarshaler.MarshalLogs(ld) if err != nil { return nil, err diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 84c7428ce92e..481c8ea7bb91 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.45.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -37,6 +37,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect @@ -59,14 +60,14 @@ require ( github.com/tidwall/tinylru v1.1.0 // indirect github.com/tidwall/wal v1.1.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.24.0 // indirect diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index 063149089d54..d83573fb1ddd 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -154,30 +154,30 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index ffd97316d5c6..1dda6b48a058 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -6,16 +6,16 @@ require ( cloud.google.com/go/pubsub v1.36.2 github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 - google.golang.org/api v0.166.0 + google.golang.org/api v0.170.0 google.golang.org/grpc v1.62.1 ) @@ -38,7 +38,7 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/s2a-go v0.1.7 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.1 // indirect + github.com/googleapis/gax-go/v2 v2.12.2 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -54,20 +54,20 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect go.einride.tech/aip v0.66.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect @@ -75,7 +75,7 @@ require ( google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index bc42f2864510..aa1b0f328e6d 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -19,8 +19,6 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj 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-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -28,8 +26,6 @@ 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.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -76,8 +72,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.12.1 h1:9F8GV9r9ztXyAi00gsMQHNoF51xPZm8uj1dpYt2ZETM= -github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= +github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= +github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= 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= @@ -130,30 +126,30 @@ go.einride.tech/aip v0.66.0 h1:XfV+NQX6L7EOYK11yoHHFtndeaWh3KbD9/cN/6iWEt8= go.einride.tech/aip v0.66.0/go.mod h1:qAhMsfT7plxBX+Oy7Huol6YUvZ0ZzdUz26yZsQwfl1M= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 h1:doUP+ExOpH3spVTLS0FcWGLnQrPct/hD/bCPbDRUEAU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -176,8 +172,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= 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= @@ -196,11 +192,11 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= -golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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= @@ -242,8 +238,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.166.0 h1:6m4NUwrZYhAaVIHZWxaKjw1L1vNAjtMwORmKRyEEo24= -google.golang.org/api v0.166.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= +google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= 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= @@ -255,8 +251,8 @@ google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJ google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c h1:9g7erC9qu44ks7UK4gDNlnk4kOxZG707xKm4jVniy6o= google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index 1f826f9be88f..706759015ac1 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -6,9 +6,9 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.45.0 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.45.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -60,7 +60,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect @@ -71,27 +71,27 @@ require ( github.com/tidwall/wal v1.1.7 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index 160e09a1ba2b..dae7e8a24533 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -146,8 +146,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -183,58 +183,58 @@ github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9f 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= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= @@ -334,7 +334,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/exporter/honeycombmarkerexporter/generated_component_test.go b/exporter/honeycombmarkerexporter/generated_component_test.go index f1d77f7a1ee8..688be75d6f16 100644 --- a/exporter/honeycombmarkerexporter/generated_component_test.go +++ b/exporter/honeycombmarkerexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/honeycombmarkerexporter/go.mod b/exporter/honeycombmarkerexporter/go.mod index 4307bf2e18ee..12b284987c37 100644 --- a/exporter/honeycombmarkerexporter/go.mod +++ b/exporter/honeycombmarkerexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -54,17 +54,17 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/honeycombmarkerexporter/go.sum b/exporter/honeycombmarkerexporter/go.sum index 70b38e8db7d0..82427438e8e5 100644 --- a/exporter/honeycombmarkerexporter/go.sum +++ b/exporter/honeycombmarkerexporter/go.sum @@ -92,42 +92,42 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/influxdbexporter/generated_component_test.go b/exporter/influxdbexporter/generated_component_test.go index 68d79ff2a0d4..03b0dcab5a4f 100644 --- a/exporter/influxdbexporter/generated_component_test.go +++ b/exporter/influxdbexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index 2f482c4d92bf..10ad4dd8847a 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -8,14 +8,14 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.5.8 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -36,6 +36,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,17 +53,17 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index 30190585d8ee..f5fbcd60e200 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -37,6 +37,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/influxdata/influxdb-observability/common v0.5.8 h1:nyk4dqnKbPGIyr1vAs6oEsFQEHWi5jkSQ7PtP4v//lc= @@ -102,44 +104,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/instanaexporter/config_test.go b/exporter/instanaexporter/config_test.go index fa05153942b6..207b2fe2daa9 100644 --- a/exporter/instanaexporter/config_test.go +++ b/exporter/instanaexporter/config_test.go @@ -29,8 +29,8 @@ func TestConfigValidate(t *testing.T) { t.Run("Valid configuration with ca_file", func(t *testing.T) { c := &Config{Endpoint: "https://example.com/", AgentKey: "key1", ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "ca.crt", }, }, diff --git a/exporter/instanaexporter/exporter_test.go b/exporter/instanaexporter/exporter_test.go index d81a7711202f..6c7319e28ecf 100644 --- a/exporter/instanaexporter/exporter_test.go +++ b/exporter/instanaexporter/exporter_test.go @@ -84,8 +84,8 @@ func TestSelfSignedBackend(t *testing.T) { AgentKey: "key11", ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: caFile, }, }, @@ -110,8 +110,8 @@ func TestSelfSignedBackendCAFileNotFound(t *testing.T) { AgentKey: "key11", ClientConfig: confighttp.ClientConfig{ Endpoint: "", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "ca_file_not_found.pem", }, }, diff --git a/exporter/instanaexporter/factory_test.go b/exporter/instanaexporter/factory_test.go index 63643b76f855..4a9d867c9701 100644 --- a/exporter/instanaexporter/factory_test.go +++ b/exporter/instanaexporter/factory_test.go @@ -79,8 +79,8 @@ func TestLoadConfig(t *testing.T) { Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, WriteBufferSize: 512 * 1024, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "ca.crt", }, }, diff --git a/exporter/instanaexporter/generated_component_test.go b/exporter/instanaexporter/generated_component_test.go index bbb5b6fab6c3..6de7f21420ad 100644 --- a/exporter/instanaexporter/generated_component_test.go +++ b/exporter/instanaexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/instanaexporter/go.mod b/exporter/instanaexporter/go.mod index 92820e8eb961..5d91a03a3c12 100644 --- a/exporter/instanaexporter/go.mod +++ b/exporter/instanaexporter/go.mod @@ -5,16 +5,16 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -34,6 +34,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -50,15 +51,15 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/instanaexporter/go.sum b/exporter/instanaexporter/go.sum index 7e2c242ed6ad..c7f78eb1db14 100644 --- a/exporter/instanaexporter/go.sum +++ b/exporter/instanaexporter/go.sum @@ -29,6 +29,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -76,44 +78,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index ba90a47f6b9f..d1c8ea857387 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -14,14 +14,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.96.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -44,6 +44,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect @@ -72,11 +73,11 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index a357aff03387..73751ab879cc 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -42,6 +42,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -133,32 +135,32 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/kafkaexporter/kafka_exporter_test.go b/exporter/kafkaexporter/kafka_exporter_test.go index ef91f0892d1e..7035bf186905 100644 --- a/exporter/kafkaexporter/kafka_exporter_test.go +++ b/exporter/kafkaexporter/kafka_exporter_test.go @@ -87,8 +87,8 @@ func TestNewExporter_err_auth_type(t *testing.T) { c := Config{ ProtocolVersion: "2.0.0", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/doesnotexist", }, }, diff --git a/exporter/kineticaexporter/go.mod b/exporter/kineticaexporter/go.mod index fd9d425a9259..353b869e0865 100644 --- a/exporter/kineticaexporter/go.mod +++ b/exporter/kineticaexporter/go.mod @@ -8,11 +8,11 @@ require ( github.com/samber/lo v1.39.0 github.com/stretchr/testify v1.9.0 github.com/wk8/go-ordered-map/v2 v2.1.8 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -53,12 +53,12 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/ztrue/tracerr v0.3.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/kineticaexporter/go.sum b/exporter/kineticaexporter/go.sum index c6c50d293aa1..f9fdf51c4d79 100644 --- a/exporter/kineticaexporter/go.sum +++ b/exporter/kineticaexporter/go.sum @@ -94,28 +94,28 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/ztrue/tracerr v0.3.0 h1:lDi6EgEYhPYPnKcjsYzmWw4EkFEoA/gfe+I9Y5f+h6Y= github.com/ztrue/tracerr v0.3.0/go.mod h1:qEalzze4VN9O8tnhBXScfCrmoJo10o8TN5ciKjm6Mww= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/loadbalancingexporter/generated_component_test.go b/exporter/loadbalancingexporter/generated_component_test.go index 89d139bd0614..f8e5b0c1fc4f 100644 --- a/exporter/loadbalancingexporter/generated_component_test.go +++ b/exporter/loadbalancingexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index d886ca2a8e8b..7137319a7ae3 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -9,28 +9,27 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 k8s.io/utils v0.0.0-20240102154912-e7106e64919e sigs.k8s.io/controller-runtime v0.17.2 ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect github.com/aws/aws-sdk-go-v2 v1.25.3 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.17.7 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 // indirect @@ -59,7 +58,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.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/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -90,38 +89,38 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // 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/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v1.24.0 // indirect diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index f3d8e4c18266..1498e85ceba4 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -1,9 +1,4 @@ -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 v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/aws/aws-sdk-go-v2 v1.25.3 h1:xYiLpZTQs1mzvz5PaI6uR0Wh57ippuEthxS4iK5v0n0= github.com/aws/aws-sdk-go-v2 v1.25.3/go.mod h1:35hUlJVYd+M++iLI3ALmVwMOyRYMmRqUXpTtRGW+K9I= @@ -42,8 +37,6 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj 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-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -55,8 +48,6 @@ 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.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro= @@ -101,8 +92,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -194,8 +185,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -221,78 +212,78 @@ github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9f 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= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 h1:wF6wlGx+CXujq8Lvtnbd03uHO5e3QT2RzownXPTnnnI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:swQIq8hlnQYRr7tiEc4z72PE573mnkiEFGMCdlK+Z2A= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= go.opentelemetry.io/contrib/propagators/b3 v1.24.0/go.mod h1:k5wRxKRU2uXx2F8uNJ4TaonuEO/V7/5xoz7kdsDACT8= go.opentelemetry.io/contrib/zpages v0.49.0 h1:Wk217PkNBxcKWnIQpwtbZZE286K4ZY9uajnM5woSeLU= @@ -380,7 +371,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -458,14 +449,14 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apiextensions-apiserver v0.29.0 h1:0VuspFG7Hj+SxyF/Z/2T0uFbI5gb5LRgEyUVE3Q4lV0= k8s.io/apiextensions-apiserver v0.29.0/go.mod h1:TKmpy3bTS0mr9pylH0nOt/QzQRrW7/h7yLdRForMZwc= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= diff --git a/exporter/logicmonitorexporter/generated_component_test.go b/exporter/logicmonitorexporter/generated_component_test.go index e1a8f14804c2..08361ca97790 100644 --- a/exporter/logicmonitorexporter/generated_component_test.go +++ b/exporter/logicmonitorexporter/generated_component_test.go @@ -63,20 +63,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/logicmonitorexporter/go.mod b/exporter/logicmonitorexporter/go.mod index ced3e41c2699..ddb51ef454c8 100644 --- a/exporter/logicmonitorexporter/go.mod +++ b/exporter/logicmonitorexporter/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -51,16 +51,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/logicmonitorexporter/go.sum b/exporter/logicmonitorexporter/go.sum index 7d60ec506699..df7e4334ecbc 100644 --- a/exporter/logicmonitorexporter/go.sum +++ b/exporter/logicmonitorexporter/go.sum @@ -80,42 +80,42 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/logzioexporter/generated_component_test.go b/exporter/logzioexporter/generated_component_test.go index 2e975d99def4..a9cb10971d20 100644 --- a/exporter/logzioexporter/generated_component_test.go +++ b/exporter/logzioexporter/generated_component_test.go @@ -63,20 +63,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index e49d02af28e3..00395f526aee 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -8,16 +8,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -41,6 +41,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -59,15 +60,15 @@ require ( github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index bd4db4e74598..e0d76d888041 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -35,6 +35,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I= github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= @@ -97,44 +99,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/lokiexporter/config_test.go b/exporter/lokiexporter/config_test.go index bd0078f5ca5a..901b73ef817b 100644 --- a/exporter/lokiexporter/config_test.go +++ b/exporter/lokiexporter/config_test.go @@ -41,8 +41,8 @@ func TestLoadConfigNewExporter(t *testing.T) { "X-Custom-Header": "loki_rocks", }, Endpoint: "https://loki:3100/loki/api/v1/push", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/var/lib/mycert.pem", CertFile: "certfile", KeyFile: "keyfile", diff --git a/exporter/lokiexporter/generated_component_test.go b/exporter/lokiexporter/generated_component_test.go index 2b3aa25c5205..7f18cd15120d 100644 --- a/exporter/lokiexporter/generated_component_test.go +++ b/exporter/lokiexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 3d4281f8bb77..67d9bdd2915f 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -10,16 +10,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.96.0 github.com/prometheus/common v0.50.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -40,6 +40,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -60,15 +61,15 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/prometheus v0.48.1 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index 5822567a2707..785158024919 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -122,44 +122,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/mezmoexporter/generated_component_test.go b/exporter/mezmoexporter/generated_component_test.go index b075ef51e2da..0d2dbd025443 100644 --- a/exporter/mezmoexporter/generated_component_test.go +++ b/exporter/mezmoexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index c2f9def37703..b2109bb0544a 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -5,14 +5,14 @@ go 1.21 require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -31,6 +31,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -47,17 +48,17 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/mezmoexporter/go.sum b/exporter/mezmoexporter/go.sum index 7e2c242ed6ad..c7f78eb1db14 100644 --- a/exporter/mezmoexporter/go.sum +++ b/exporter/mezmoexporter/go.sum @@ -29,6 +29,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -76,44 +78,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index 5e80135b8291..1cd3b1a8b9bd 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -57,8 +57,8 @@ func TestLoadConfig(t *testing.T) { }, Endpoint: "1.2.3.4:1234", Compression: "gzip", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/var/lib/mycert.pem", }, Insecure: false, diff --git a/exporter/opencensusexporter/factory_test.go b/exporter/opencensusexporter/factory_test.go index 54f8409442e2..4ff456c9fbd8 100644 --- a/exporter/opencensusexporter/factory_test.go +++ b/exporter/opencensusexporter/factory_test.go @@ -49,7 +49,7 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -62,7 +62,7 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -123,8 +123,8 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "testdata/test_cert.pem", }, }, @@ -137,8 +137,8 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "nosuchfile", }, }, diff --git a/exporter/opencensusexporter/generated_component_test.go b/exporter/opencensusexporter/generated_component_test.go index c9356009d0f1..d84aadc3e869 100644 --- a/exporter/opencensusexporter/generated_component_test.go +++ b/exporter/opencensusexporter/generated_component_test.go @@ -63,20 +63,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index d0a088174a15..4a2c28d9f3df 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -9,16 +9,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -38,6 +38,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -59,16 +60,16 @@ require ( github.com/rs/cors v1.10.1 // indirect github.com/soheilhy/cmux v0.1.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index 9f725079eec5..83104811c3ac 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -57,6 +57,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -118,46 +120,46 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/opencensusexporter/opencensus_test.go b/exporter/opencensusexporter/opencensus_test.go index 947c632bbb95..5bc8001ef255 100644 --- a/exporter/opencensusexporter/opencensus_test.go +++ b/exporter/opencensusexporter/opencensus_test.go @@ -41,7 +41,7 @@ func TestSendTraces(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, } @@ -83,7 +83,7 @@ func TestSendTraces_NoBackend(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, } @@ -107,7 +107,7 @@ func TestSendTraces_AfterStop(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, } @@ -140,7 +140,7 @@ func TestSendMetrics(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, } @@ -180,7 +180,7 @@ func TestSendMetrics_NoBackend(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, } @@ -204,7 +204,7 @@ func TestSendMetrics_AfterStop(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, } diff --git a/exporter/opensearchexporter/generated_component_test.go b/exporter/opensearchexporter/generated_component_test.go index e40a2952d28b..f3abc6a94cca 100644 --- a/exporter/opensearchexporter/generated_component_test.go +++ b/exporter/opensearchexporter/generated_component_test.go @@ -63,20 +63,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/opensearchexporter/go.mod b/exporter/opensearchexporter/go.mod index 94cf0878b376..63a8f3ee969f 100644 --- a/exporter/opensearchexporter/go.mod +++ b/exporter/opensearchexporter/go.mod @@ -6,15 +6,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/opensearch-project/opensearch-go/v2 v2.3.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -23,6 +23,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 // indirect github.com/prometheus/client_golang v1.19.0 // indirect @@ -57,15 +58,15 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 diff --git a/exporter/opensearchexporter/go.sum b/exporter/opensearchexporter/go.sum index 8750f27a8cab..ac53b83b4cd6 100644 --- a/exporter/opensearchexporter/go.sum +++ b/exporter/opensearchexporter/go.sum @@ -45,6 +45,8 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -104,42 +106,42 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/otelarrowexporter/config_test.go b/exporter/otelarrowexporter/config_test.go index 9f4d83ea5ef7..057e2137fefb 100644 --- a/exporter/otelarrowexporter/config_test.go +++ b/exporter/otelarrowexporter/config_test.go @@ -66,8 +66,8 @@ func TestUnmarshalConfig(t *testing.T) { }, Endpoint: "1.2.3.4:1234", Compression: "none", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/var/lib/mycert.pem", }, Insecure: false, diff --git a/exporter/otelarrowexporter/factory_test.go b/exporter/otelarrowexporter/factory_test.go index 1aa923384d6a..3c827d6b4ef4 100644 --- a/exporter/otelarrowexporter/factory_test.go +++ b/exporter/otelarrowexporter/factory_test.go @@ -77,7 +77,7 @@ func TestCreateTracesExporter(t *testing.T) { config: Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -157,8 +157,8 @@ func TestCreateTracesExporter(t *testing.T) { config: Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: filepath.Join("testdata", "test_cert.pem"), }, }, @@ -170,8 +170,8 @@ func TestCreateTracesExporter(t *testing.T) { config: Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "nosuchfile", }, }, diff --git a/exporter/otelarrowexporter/go.mod b/exporter/otelarrowexporter/go.mod index bc627a5a6581..f7aedcab2457 100644 --- a/exporter/otelarrowexporter/go.mod +++ b/exporter/otelarrowexporter/go.mod @@ -6,17 +6,17 @@ require ( github.com/open-telemetry/otel-arrow v0.18.0 github.com/open-telemetry/otel-arrow/collector v0.18.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 google.golang.org/grpc v1.62.1 @@ -37,6 +37,7 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -55,15 +56,15 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/otelarrowexporter/go.sum b/exporter/otelarrowexporter/go.sum index b2b546b3c1e6..f50173c453d9 100644 --- a/exporter/otelarrowexporter/go.sum +++ b/exporter/otelarrowexporter/go.sum @@ -1,7 +1,3 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/apache/arrow/go/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -10,13 +6,9 @@ github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqy github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= 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/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= 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-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -103,46 +95,46 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -176,8 +168,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -207,8 +197,6 @@ golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSm golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= 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.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c h1:NUsgEN92SQQqzfA+YtqYNqYmB3DMMYLlIwUZAQFVFbo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/exporter/prometheusexporter/config_test.go b/exporter/prometheusexporter/config_test.go index 833a1a123776..d0eaf69d7fc9 100644 --- a/exporter/prometheusexporter/config_test.go +++ b/exporter/prometheusexporter/config_test.go @@ -37,8 +37,8 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "1.2.3.4:1234", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "certs/server.crt", KeyFile: "certs/server.key", CAFile: "certs/ca.crt", diff --git a/exporter/prometheusexporter/generated_component_test.go b/exporter/prometheusexporter/generated_component_test.go index 9fdc955b8305..98bfc75a3f89 100644 --- a/exporter/prometheusexporter/generated_component_test.go +++ b/exporter/prometheusexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index 1ab62c4f270c..cd7fbe85b04a 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -11,15 +11,15 @@ require ( github.com/prometheus/client_model v0.6.0 github.com/prometheus/common v0.50.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -137,16 +137,16 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index 4988d490353f..95689963c4f3 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -502,8 +502,8 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULu github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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.6 h1:Oe8TPH9wAbv++YPNDKJWUnI8Q4PPWCx3UbOfH+FxiMU= @@ -553,8 +553,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/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= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -562,66 +562,66 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= diff --git a/exporter/prometheusexporter/prometheus_test.go b/exporter/prometheusexporter/prometheus_test.go index 763f3a34fef2..ccec75923914 100644 --- a/exporter/prometheusexporter/prometheus_test.go +++ b/exporter/prometheusexporter/prometheus_test.go @@ -98,8 +98,8 @@ func TestPrometheusExporter_WithTLS(t *testing.T) { }, ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7777", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/certs/server.crt", KeyFile: "./testdata/certs/server.key", CAFile: "./testdata/certs/ca.crt", @@ -117,8 +117,8 @@ func TestPrometheusExporter_WithTLS(t *testing.T) { exp, err := factory.CreateMetricsExporter(context.Background(), set, cfg) require.NoError(t, err) - tlscs := configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + tlscs := configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/ca.crt", CertFile: "./testdata/certs/client.crt", KeyFile: "./testdata/certs/client.key", diff --git a/exporter/prometheusremotewriteexporter/config_test.go b/exporter/prometheusremotewriteexporter/config_test.go index 8b6b7345fe77..690acbc25462 100644 --- a/exporter/prometheusremotewriteexporter/config_test.go +++ b/exporter/prometheusremotewriteexporter/config_test.go @@ -61,8 +61,8 @@ func TestLoadConfig(t *testing.T) { ExternalLabels: map[string]string{"key1": "value1", "key2": "value2"}, ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:8888", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/var/lib/mycert.pem", // This is subject to change, but currently I have no idea what else to put here lol }, Insecure: false, diff --git a/exporter/prometheusremotewriteexporter/exporter_test.go b/exporter/prometheusremotewriteexporter/exporter_test.go index ef2f0f195c14..cec87c5b0def 100644 --- a/exporter/prometheusremotewriteexporter/exporter_test.go +++ b/exporter/prometheusremotewriteexporter/exporter_test.go @@ -180,8 +180,8 @@ func Test_Start(t *testing.T) { returnErrorOnStartUp: true, clientSettings: confighttp.ClientConfig{ Endpoint: "https://some.url:9411/api/prom/push", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "non-existent file", CertFile: "", KeyFile: "", diff --git a/exporter/prometheusremotewriteexporter/factory_test.go b/exporter/prometheusremotewriteexporter/factory_test.go index ea3be196bac5..ed86ed403a60 100644 --- a/exporter/prometheusremotewriteexporter/factory_test.go +++ b/exporter/prometheusremotewriteexporter/factory_test.go @@ -29,8 +29,8 @@ func Test_createMetricsExporter(t *testing.T) { invalidConfig := createDefaultConfig().(*Config) invalidConfig.ClientConfig = confighttp.ClientConfig{} invalidTLSConfig := createDefaultConfig().(*Config) - invalidTLSConfig.ClientConfig.TLSSetting = configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + invalidTLSConfig.ClientConfig.TLSSetting = configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "non-existent file", CertFile: "", KeyFile: "", diff --git a/exporter/prometheusremotewriteexporter/generated_component_test.go b/exporter/prometheusremotewriteexporter/generated_component_test.go index feee79c38994..5ffca178a9d8 100644 --- a/exporter/prometheusremotewriteexporter/generated_component_test.go +++ b/exporter/prometheusremotewriteexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index 8a6d8c0f746d..04fd6b4fad9b 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -14,15 +14,15 @@ require ( github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 github.com/tidwall/wal v1.1.7 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 @@ -40,6 +40,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -60,16 +61,16 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/tinylru v1.1.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index cfc62a139538..b2f695f7e67c 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -30,6 +30,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -90,44 +92,44 @@ github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= github.com/tidwall/wal v1.1.7/go.mod h1:r6lR1j27W9EPalgHiB7zLJDYu3mzW5BQP5KrzBpYY/E= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index 57e688ad7b06..b052e7e2482d 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -10,14 +10,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -44,6 +44,7 @@ require ( github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect @@ -68,10 +69,10 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/pulsarexporter/go.sum b/exporter/pulsarexporter/go.sum index 677223f4cc44..a25aac2feb83 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -420,30 +420,30 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/sapmexporter/generated_component_test.go b/exporter/sapmexporter/generated_component_test.go index 8007975490d4..8a15e3679afc 100644 --- a/exporter/sapmexporter/generated_component_test.go +++ b/exporter/sapmexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 734ac3a43071..967809c309e4 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -11,13 +11,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/signalfx/sapm-proto v0.14.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -35,6 +35,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -50,11 +51,11 @@ require ( github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index 442057101e3e..d19b383f024c 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -58,6 +58,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -114,30 +116,30 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/sentryexporter/generated_component_test.go b/exporter/sentryexporter/generated_component_test.go index 28e5fe7698ab..e22a7b4b5e9b 100644 --- a/exporter/sentryexporter/generated_component_test.go +++ b/exporter/sentryexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index adf6e71924b8..c47f4caf515b 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -7,11 +7,11 @@ require ( github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -40,12 +41,12 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 205ee5863aa7..f86c0e16505f 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -72,28 +74,28 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/signalfxexporter/config.go b/exporter/signalfxexporter/config.go index aed4f7c82d9a..d7b27608c9b2 100644 --- a/exporter/signalfxexporter/config.go +++ b/exporter/signalfxexporter/config.go @@ -68,7 +68,7 @@ type Config struct { // ingest_tls needs to be set if the exporter's IngestURL is pointing to a signalfx receiver // with TLS enabled and using a self-signed certificate where its CA is not loaded in the system cert pool. - IngestTLSSettings configtls.TLSClientSetting `mapstructure:"ingest_tls,omitempty"` + IngestTLSSettings configtls.ClientConfig `mapstructure:"ingest_tls,omitempty"` // APIURL is the destination to where SignalFx metadata will be sent. This // value takes precedence over the value of Realm @@ -76,7 +76,7 @@ type Config struct { // api_tls needs to be set if the exporter's APIURL is pointing to a httforwarder extension // with TLS enabled and using a self-signed certificate where its CA is not loaded in the system cert pool. - APITLSSettings configtls.TLSClientSetting `mapstructure:"api_tls,omitempty"` + APITLSSettings configtls.ClientConfig `mapstructure:"api_tls,omitempty"` // Whether to log datapoints dispatched to Splunk Observability Cloud LogDataPoints bool `mapstructure:"log_data_points"` diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index 1aee96407471..b5203af95ed6 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -1277,13 +1277,13 @@ func TestTLSExporterInit(t *testing.T) { config: &Config{ APIURL: "https://test", IngestURL: "https://test", - IngestTLSSettings: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + IngestTLSSettings: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/ca.pem", }, }, - APITLSSettings: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + APITLSSettings: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/ca.pem", }, }, @@ -1297,8 +1297,8 @@ func TestTLSExporterInit(t *testing.T) { config: &Config{ APIURL: "https://test", IngestURL: "https://test", - IngestTLSSettings: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + IngestTLSSettings: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/missingfile", }, }, @@ -1313,8 +1313,8 @@ func TestTLSExporterInit(t *testing.T) { config: &Config{ APIURL: "https://test", IngestURL: "https://test", - IngestTLSSettings: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + IngestTLSSettings: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/invalid-ca.pem", }, }, @@ -1384,8 +1384,8 @@ func TestTLSIngestConnection(t *testing.T) { config: &Config{ APIURL: serverURL, IngestURL: serverURL, - IngestTLSSettings: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + IngestTLSSettings: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/ca.pem", }, }, @@ -1497,8 +1497,8 @@ func TestTLSAPIConnection(t *testing.T) { IngestURL: server.URL, AccessToken: "random", SyncHostMetadata: true, - APITLSSettings: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + APITLSSettings: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/ca.pem", }, }, diff --git a/exporter/signalfxexporter/generated_component_test.go b/exporter/signalfxexporter/generated_component_test.go index 189d9cc9d455..bd3e511048c3 100644 --- a/exporter/signalfxexporter/generated_component_test.go +++ b/exporter/signalfxexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index 9a428cb0428c..50e92f0b4f31 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -17,16 +17,16 @@ require ( github.com/shirou/gopsutil/v3 v3.24.2 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -48,6 +48,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -71,15 +72,15 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 044e99a5ea46..ed65333639f9 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -44,6 +44,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -115,44 +117,44 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/signalfxexporter/internal/correlation/correlation_test.go b/exporter/signalfxexporter/internal/correlation/correlation_test.go index d1e9db2f7c03..27633dcb2d1b 100644 --- a/exporter/signalfxexporter/internal/correlation/correlation_test.go +++ b/exporter/signalfxexporter/internal/correlation/correlation_test.go @@ -56,8 +56,8 @@ func TestTrackerStart(t *testing.T) { config: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:9090", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/exporter/skywalkingexporter/config_test.go b/exporter/skywalkingexporter/config_test.go index 3f53ff4356bc..c86f14588567 100644 --- a/exporter/skywalkingexporter/config_test.go +++ b/exporter/skywalkingexporter/config_test.go @@ -66,8 +66,8 @@ func TestLoadConfig(t *testing.T) { }, Endpoint: "1.2.3.4:11800", Compression: "gzip", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/var/lib/mycert.pem", }, Insecure: false, diff --git a/exporter/skywalkingexporter/factory_test.go b/exporter/skywalkingexporter/factory_test.go index e5f5880e3015..37b732f71040 100644 --- a/exporter/skywalkingexporter/factory_test.go +++ b/exporter/skywalkingexporter/factory_test.go @@ -39,7 +39,7 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -100,8 +100,8 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "testdata/test_cert.pem", }, Insecure: false, @@ -115,8 +115,8 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "nosuchfile", }, }, diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index 0bb7f86cab71..90cfb4d4ee8c 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -7,16 +7,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 google.golang.org/grpc v1.62.1 @@ -24,7 +24,6 @@ require ( ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -35,6 +34,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.2 // indirect @@ -51,17 +51,17 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/skywalkingexporter/go.sum b/exporter/skywalkingexporter/go.sum index bf9ce708b5ee..ef11767d0b3e 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -1,10 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg= cloud.google.com/go v0.34.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 v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= @@ -20,8 +15,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -32,8 +25,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= 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/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -76,6 +67,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= @@ -130,48 +123,48 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -227,8 +220,6 @@ golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -286,8 +277,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= 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-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= diff --git a/exporter/skywalkingexporter/skywalking_benchmark_test.go b/exporter/skywalkingexporter/skywalking_benchmark_test.go index a62aff28ffbf..4a232bbb19ad 100644 --- a/exporter/skywalkingexporter/skywalking_benchmark_test.go +++ b/exporter/skywalkingexporter/skywalking_benchmark_test.go @@ -128,7 +128,7 @@ func doInit(numStream int, t *testing.T) (*swExporter, *grpc.Server, *mockLogHan }, ClientConfig: configgrpc.ClientConfig{ Endpoint: addr.String(), - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, diff --git a/exporter/skywalkingexporter/skywalking_test.go b/exporter/skywalkingexporter/skywalking_test.go index cebb52485bb0..e75c957b621c 100644 --- a/exporter/skywalkingexporter/skywalking_test.go +++ b/exporter/skywalkingexporter/skywalking_test.go @@ -33,7 +33,7 @@ func TestSwExporter(t *testing.T) { NumStreams: 10, ClientConfig: configgrpc.ClientConfig{ Endpoint: addr.String(), - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, @@ -106,7 +106,7 @@ func TestSwExporter(t *testing.T) { NumStreams: 10, ClientConfig: configgrpc.ClientConfig{ Endpoint: addr.String(), - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, diff --git a/exporter/splunkhecexporter/config_test.go b/exporter/splunkhecexporter/config_test.go index dd6c4c689581..023b3eed3a6e 100644 --- a/exporter/splunkhecexporter/config_test.go +++ b/exporter/splunkhecexporter/config_test.go @@ -63,8 +63,8 @@ func TestLoadConfig(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Timeout: 10 * time.Second, Endpoint: "https://splunk:8088/services/collector", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "", CertFile: "", KeyFile: "", diff --git a/exporter/splunkhecexporter/generated_component_test.go b/exporter/splunkhecexporter/generated_component_test.go index 4f617c1b3d48..96814b3ddc8a 100644 --- a/exporter/splunkhecexporter/generated_component_test.go +++ b/exporter/splunkhecexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 711a4baa154e..de50c54c0ad6 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -13,16 +13,16 @@ require ( github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -83,21 +83,21 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index b08bb8171170..c1280771ae29 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -155,8 +155,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -182,48 +182,48 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -286,7 +286,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 057412091df8..722d386ba154 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -4,13 +4,13 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 ) @@ -28,6 +28,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -44,17 +45,17 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index 68b7ee252a05..a211d278c6cb 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -29,6 +29,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -76,42 +78,42 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/exporter/syslogexporter/config.go b/exporter/syslogexporter/config.go index c5f0c9c3d767..31f0c0c4bfc1 100644 --- a/exporter/syslogexporter/config.go +++ b/exporter/syslogexporter/config.go @@ -38,7 +38,7 @@ type Config struct { EnableOctetCounting bool `mapstructure:"enable_octet_counting"` // TLSSetting struct exposes TLS client configuration. - TLSSetting configtls.TLSClientSetting `mapstructure:"tls"` + TLSSetting configtls.ClientConfig `mapstructure:"tls"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` diff --git a/exporter/syslogexporter/exporter_test.go b/exporter/syslogexporter/exporter_test.go index 58a025701b3a..189e89e73f40 100644 --- a/exporter/syslogexporter/exporter_test.go +++ b/exporter/syslogexporter/exporter_test.go @@ -191,27 +191,27 @@ func TestTLSConfig(t *testing.T) { tests := []struct { name string network string - tlsSettings configtls.TLSClientSetting + tlsSettings configtls.ClientConfig tlsConfig *tls.Config }{ {name: "TCP with TLS configuration", network: "tcp", - tlsSettings: configtls.TLSClientSetting{}, + tlsSettings: configtls.ClientConfig{}, tlsConfig: &tls.Config{}, }, {name: "TCP insecure", network: "tcp", - tlsSettings: configtls.TLSClientSetting{Insecure: true}, + tlsSettings: configtls.ClientConfig{Insecure: true}, tlsConfig: nil, }, {name: "UDP with TLS configuration", network: "udp", - tlsSettings: configtls.TLSClientSetting{}, + tlsSettings: configtls.ClientConfig{}, tlsConfig: nil, }, {name: "UDP insecure", network: "udp", - tlsSettings: configtls.TLSClientSetting{Insecure: true}, + tlsSettings: configtls.ClientConfig{Insecure: true}, tlsConfig: nil, }, } diff --git a/exporter/syslogexporter/go.mod b/exporter/syslogexporter/go.mod index 420c10eebb3e..18b0fe394ed8 100644 --- a/exporter/syslogexporter/go.mod +++ b/exporter/syslogexporter/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -20,6 +20,7 @@ require ( github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/google/uuid v1.6.0 // 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.1.0 // indirect @@ -27,11 +28,11 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect @@ -49,8 +50,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 diff --git a/exporter/syslogexporter/go.sum b/exporter/syslogexporter/go.sum index a56a71d17ac7..f87377a56536 100644 --- a/exporter/syslogexporter/go.sum +++ b/exporter/syslogexporter/go.sum @@ -25,6 +25,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -66,30 +68,30 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index 9484f7aa04fc..a230e20e3b33 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -7,12 +7,12 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible github.com/stretchr/testify v1.9.0 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -30,6 +30,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -43,12 +44,12 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index 140439f2d8f5..4544e9c3a047 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -77,30 +79,30 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857 h1:6TxC github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/exporter/zipkinexporter/config_test.go b/exporter/zipkinexporter/config_test.go index cd317d160568..db89e0619f7a 100644 --- a/exporter/zipkinexporter/config_test.go +++ b/exporter/zipkinexporter/config_test.go @@ -61,7 +61,7 @@ func TestLoadConfig(t *testing.T) { Endpoint: "https://somedest:1234/api/v2/spans", WriteBufferSize: 524288, Timeout: 5 * time.Second, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ InsecureSkipVerify: true, }, MaxIdleConns: &maxIdleConns, diff --git a/exporter/zipkinexporter/generated_component_test.go b/exporter/zipkinexporter/generated_component_test.go index c223b5d0bc5c..226279eed4ab 100644 --- a/exporter/zipkinexporter/generated_component_test.go +++ b/exporter/zipkinexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index c12ec3de1742..4034a358bab5 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -9,15 +9,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.96.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -36,6 +36,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/jaegertracing/jaeger v1.55.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -54,16 +55,16 @@ require ( github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index 135135f292a7..8d5f72465159 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -32,6 +32,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= @@ -84,44 +86,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/extension/ackextension/go.mod b/extension/ackextension/go.mod index 38f4824ac998..ff16e58d33a0 100644 --- a/extension/ackextension/go.mod +++ b/extension/ackextension/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 ) @@ -21,9 +21,9 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect diff --git a/extension/ackextension/go.sum b/extension/ackextension/go.sum index 85c13ca75f6b..39bc13f5f031 100644 --- a/extension/ackextension/go.sum +++ b/extension/ackextension/go.sum @@ -50,16 +50,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index 7a2e50c87171..1dcccbf1886c 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -6,11 +6,11 @@ require ( bitbucket.org/atlassian/go-asap/v2 v2.8.0 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -39,8 +39,8 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/vincent-petithory/dataurl v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index 724aa97e0daf..a363688e0e82 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -66,20 +66,20 @@ github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8A github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/awsproxy/config_test.go b/extension/awsproxy/config_test.go index 4834342dfa2c..a6171a652990 100644 --- a/extension/awsproxy/config_test.go +++ b/extension/awsproxy/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { Endpoint: "0.0.0.0:1234", }, ProxyAddress: "https://proxy.proxy.com", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, ServerName: "something", }, diff --git a/extension/awsproxy/factory.go b/extension/awsproxy/factory.go index b371d643b4c0..9c56133faceb 100644 --- a/extension/awsproxy/factory.go +++ b/extension/awsproxy/factory.go @@ -36,7 +36,7 @@ func createDefaultConfig() component.Config { TCPAddrConfig: confignet.TCPAddrConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index 307a25ab6176..057c1e765b8d 100644 --- a/extension/awsproxy/go.mod +++ b/extension/awsproxy/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -39,10 +40,10 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index e86148b5a453..c2310915cb6d 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -24,6 +24,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -63,24 +65,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index 49f0a667ff16..840bd1600f93 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -5,12 +5,12 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 github.com/tg123/go-htpasswd v1.2.2 - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // 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.1.0 // indirect @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index e08116152b1a..a2beae3b394e 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -21,6 +21,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -61,24 +63,24 @@ github.com/tg123/go-htpasswd v1.2.2 h1:tmNccDsQ+wYsoRfiONzIhDm5OkVHQzN3w4FOBAlN6 github.com/tg123/go-htpasswd v1.2.2/go.mod h1:FcIrK0J+6zptgVwK1JDlqyajW/1B4PtuJ/FLWl7nx8A= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index 4b5d70e0310e..ddc5ab5bc40b 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -5,11 +5,11 @@ go 1.21 require ( github.com/fsnotify/fsnotify v1.7.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // 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.1.0 // indirect @@ -36,8 +37,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index 306c16bfc8a4..be09277156a0 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -21,6 +21,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= @@ -53,20 +55,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/encoding/go.mod b/extension/encoding/go.mod index 5e79986a822f..ebd943d5ca7b 100644 --- a/extension/encoding/go.mod +++ b/extension/encoding/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/encod go 1.21 require ( - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 ) require ( @@ -21,9 +21,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect diff --git a/extension/encoding/go.sum b/extension/encoding/go.sum index 9ec6783a6a8c..f97a1f66a6d7 100644 --- a/extension/encoding/go.sum +++ b/extension/encoding/go.sum @@ -57,16 +57,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/encoding/jaegerencodingextension/go.mod b/extension/encoding/jaegerencodingextension/go.mod index cb7ab94b55f4..3e14873aecf9 100644 --- a/extension/encoding/jaegerencodingextension/go.mod +++ b/extension/encoding/jaegerencodingextension/go.mod @@ -8,10 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -40,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/encoding/jaegerencodingextension/go.sum b/extension/encoding/jaegerencodingextension/go.sum index 5bed508d4dce..59b2e6359014 100644 --- a/extension/encoding/jaegerencodingextension/go.sum +++ b/extension/encoding/jaegerencodingextension/go.sum @@ -24,6 +24,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -68,18 +70,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/encoding/jsonlogencodingextension/go.mod b/extension/encoding/jsonlogencodingextension/go.mod index bd64a448f4a1..11fbf95b1767 100644 --- a/extension/encoding/jsonlogencodingextension/go.mod +++ b/extension/encoding/jsonlogencodingextension/go.mod @@ -6,10 +6,10 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // 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.1.0 // indirect @@ -36,7 +37,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/encoding/jsonlogencodingextension/go.sum b/extension/encoding/jsonlogencodingextension/go.sum index 2fca730b1221..fc2ddd5ba317 100644 --- a/extension/encoding/jsonlogencodingextension/go.sum +++ b/extension/encoding/jsonlogencodingextension/go.sum @@ -22,6 +22,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -64,16 +66,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/encoding/otlpencodingextension/go.mod b/extension/encoding/otlpencodingextension/go.mod index 7cde4a3da600..2946d2fa5352 100644 --- a/extension/encoding/otlpencodingextension/go.mod +++ b/extension/encoding/otlpencodingextension/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -23,6 +23,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -36,7 +37,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/encoding/otlpencodingextension/go.sum b/extension/encoding/otlpencodingextension/go.sum index 2fca730b1221..fc2ddd5ba317 100644 --- a/extension/encoding/otlpencodingextension/go.sum +++ b/extension/encoding/otlpencodingextension/go.sum @@ -22,6 +22,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -64,16 +66,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/encoding/textencodingextension/go.mod b/extension/encoding/textencodingextension/go.mod index 388c401eb6cb..321dd93a5399 100644 --- a/extension/encoding/textencodingextension/go.mod +++ b/extension/encoding/textencodingextension/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -37,7 +38,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/encoding/textencodingextension/go.sum b/extension/encoding/textencodingextension/go.sum index 781a57297e73..cf2a2ea94b35 100644 --- a/extension/encoding/textencodingextension/go.sum +++ b/extension/encoding/textencodingextension/go.sum @@ -22,6 +22,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -64,16 +66,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/encoding/zipkinencodingextension/go.mod b/extension/encoding/zipkinencodingextension/go.mod index 639bfa54b025..564917e4d4aa 100644 --- a/extension/encoding/zipkinencodingextension/go.mod +++ b/extension/encoding/zipkinencodingextension/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -25,6 +25,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/jaegertracing/jaeger v1.55.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -41,8 +42,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/encoding/zipkinencodingextension/go.sum b/extension/encoding/zipkinencodingextension/go.sum index 8d1d13cfff44..913b4405dbd5 100644 --- a/extension/encoding/zipkinencodingextension/go.sum +++ b/extension/encoding/zipkinencodingextension/go.sum @@ -24,6 +24,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -70,18 +72,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/headerssetterextension/go.mod b/extension/headerssetterextension/go.mod index 974d9df8107a..c900135badee 100644 --- a/extension/headerssetterextension/go.mod +++ b/extension/headerssetterextension/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -25,6 +25,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // 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.1.0 // indirect @@ -35,8 +36,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/headerssetterextension/go.sum b/extension/headerssetterextension/go.sum index a2ffb4760463..d1fc82f5c3e8 100644 --- a/extension/headerssetterextension/go.sum +++ b/extension/headerssetterextension/go.sum @@ -19,6 +19,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -57,22 +59,22 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/healthcheckextension/config_test.go b/extension/healthcheckextension/config_test.go index 16729c019b64..43dc962b1ae7 100644 --- a/extension/healthcheckextension/config_test.go +++ b/extension/healthcheckextension/config_test.go @@ -34,8 +34,8 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:13", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CAFile: "/path/to/ca", CertFile: "/path/to/cert", KeyFile: "/path/to/key", diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index aa4383ad2926..cc86405c1615 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -30,6 +30,7 @@ require ( 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.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -44,15 +45,15 @@ require ( 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 - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index e67a7229cd65..3e7a10b695d3 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -57,6 +57,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -111,36 +113,36 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/extension/httpforwarderextension/extension_test.go b/extension/httpforwarderextension/extension_test.go index 352fe7b331dd..3a9747857d34 100644 --- a/extension/httpforwarderextension/extension_test.go +++ b/extension/httpforwarderextension/extension_test.go @@ -132,8 +132,8 @@ func TestExtension(t *testing.T) { config: &Config{ Egress: confighttp.ClientConfig{ Endpoint: "localhost:9090", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/extension/httpforwarderextension/go.mod b/extension/httpforwarderextension/go.mod index a75df1c442cc..e76f89ea03e2 100644 --- a/extension/httpforwarderextension/go.mod +++ b/extension/httpforwarderextension/go.mod @@ -5,12 +5,12 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -29,6 +29,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -42,14 +43,14 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/extension/httpforwarderextension/go.sum b/extension/httpforwarderextension/go.sum index 34fd2b5906de..075467a7404d 100644 --- a/extension/httpforwarderextension/go.sum +++ b/extension/httpforwarderextension/go.sum @@ -25,6 +25,8 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -69,36 +71,36 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/extension/jaegerremotesampling/config_test.go b/extension/jaegerremotesampling/config_test.go index 45b3e321767d..cd9ef017e888 100644 --- a/extension/jaegerremotesampling/config_test.go +++ b/extension/jaegerremotesampling/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { HTTPServerConfig: &confighttp.ServerConfig{Endpoint: "0.0.0.0:5778"}, GRPCServerConfig: &configgrpc.ServerConfig{NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }}, Source: Source{ Remote: &configgrpc.ClientConfig{ @@ -47,7 +47,7 @@ func TestLoadConfig(t *testing.T) { HTTPServerConfig: &confighttp.ServerConfig{Endpoint: "0.0.0.0:5778"}, GRPCServerConfig: &configgrpc.ServerConfig{NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }}, Source: Source{ ReloadInterval: time.Second, diff --git a/extension/jaegerremotesampling/extension_test.go b/extension/jaegerremotesampling/extension_test.go index 53be6b87d7d8..072b45268e76 100644 --- a/extension/jaegerremotesampling/extension_test.go +++ b/extension/jaegerremotesampling/extension_test.go @@ -102,7 +102,7 @@ func TestRemote(t *testing.T) { cfg.Source.ReloadInterval = tc.reloadInterval cfg.Source.Remote = &configgrpc.ClientConfig{ Endpoint: fmt.Sprintf("127.0.0.1:%d", lis.Addr().(*net.TCPAddr).Port), - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, // test only }, WaitForReady: true, diff --git a/extension/jaegerremotesampling/factory.go b/extension/jaegerremotesampling/factory.go index 0fbbe898230d..a952674da6ef 100644 --- a/extension/jaegerremotesampling/factory.go +++ b/extension/jaegerremotesampling/factory.go @@ -37,7 +37,7 @@ func createDefaultConfig() component.Config { GRPCServerConfig: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: localhostgate.EndpointForPort(14250), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, Source: Source{}, diff --git a/extension/jaegerremotesampling/factory_test.go b/extension/jaegerremotesampling/factory_test.go index 237e8806a25b..10b37cec0f09 100644 --- a/extension/jaegerremotesampling/factory_test.go +++ b/extension/jaegerremotesampling/factory_test.go @@ -21,7 +21,7 @@ func TestCreateDefaultConfig(t *testing.T) { HTTPServerConfig: &confighttp.ServerConfig{Endpoint: "0.0.0.0:5778"}, GRPCServerConfig: &configgrpc.ServerConfig{NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }}, } diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index cbe74b17c5e2..cf339c4dd7f9 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -8,15 +8,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -38,6 +38,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -64,13 +65,13 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.18.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index 65c447045192..269303707e4f 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -37,6 +37,8 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -122,40 +124,40 @@ github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= diff --git a/extension/jaegerremotesampling/internal/grpc.go b/extension/jaegerremotesampling/internal/grpc.go index 5dcc85dff672..ef9f1842850e 100644 --- a/extension/jaegerremotesampling/internal/grpc.go +++ b/extension/jaegerremotesampling/internal/grpc.go @@ -57,7 +57,7 @@ type SamplingGRPCServer struct { } func (s *SamplingGRPCServer) Start(ctx context.Context, host component.Host) error { - server, err := s.settings.ToServer(host, s.telemetry) + server, err := s.settings.ToServerContext(ctx, host, s.telemetry) if err != nil { return err } diff --git a/extension/jaegerremotesampling/internal/grpc_test.go b/extension/jaegerremotesampling/internal/grpc_test.go index 731b6a40412c..1ce92a729b9b 100644 --- a/extension/jaegerremotesampling/internal/grpc_test.go +++ b/extension/jaegerremotesampling/internal/grpc_test.go @@ -27,7 +27,7 @@ func TestStartAndStopGRPC(t *testing.T) { srvSettings := configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "127.0.0.1:0", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } s, err := NewGRPC(componenttest.NewNopTelemetrySettings(), srvSettings, &mockCfgMgr{}) diff --git a/extension/oauth2clientauthextension/config.go b/extension/oauth2clientauthextension/config.go index c5e31064070a..ea99916f4d73 100644 --- a/extension/oauth2clientauthextension/config.go +++ b/extension/oauth2clientauthextension/config.go @@ -49,7 +49,7 @@ type Config struct { Scopes []string `mapstructure:"scopes,omitempty"` // TLSSetting struct exposes TLS client configuration for the underneath client to authorization server. - TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + TLSSetting configtls.ClientConfig `mapstructure:"tls,omitempty"` // Timeout parameter configures `http.Client.Timeout` for the underneath client to authorization // server while fetching and refreshing tokens. diff --git a/extension/oauth2clientauthextension/config_test.go b/extension/oauth2clientauthextension/config_test.go index 288b4340c567..10fae26ecaf7 100644 --- a/extension/oauth2clientauthextension/config_test.go +++ b/extension/oauth2clientauthextension/config_test.go @@ -45,8 +45,8 @@ func TestLoadConfig(t *testing.T) { Scopes: []string{"api.metrics"}, TokenURL: "https://example2.com/oauth2/default/v1/token", Timeout: time.Second, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "cafile", CertFile: "certfile", KeyFile: "keyfile", diff --git a/extension/oauth2clientauthextension/extension_test.go b/extension/oauth2clientauthextension/extension_test.go index 2e68687aeafd..bfc0886cbf77 100644 --- a/extension/oauth2clientauthextension/extension_test.go +++ b/extension/oauth2clientauthextension/extension_test.go @@ -43,8 +43,8 @@ func TestOAuthClientSettings(t *testing.T) { TokenURL: "https://example.com/v1/token", Scopes: []string{"resource.read"}, Timeout: 2, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: testCAFile, CertFile: testCertFile, KeyFile: testKeyFile, @@ -64,8 +64,8 @@ func TestOAuthClientSettings(t *testing.T) { TokenURL: "https://example.com/v1/token", Scopes: []string{"resource.read"}, Timeout: 2, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: testCAFile, CertFile: "doestexist.cert", KeyFile: testKeyFile, diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index c70e14f07429..c0831e7b3310 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,13 +4,13 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -34,6 +34,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -47,13 +48,13 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index 461dfad4d53d..02f9aad6c1e3 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -30,6 +30,8 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -75,36 +77,36 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index dc56b5d4308f..6760e09b96ae 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -10,9 +10,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -68,8 +68,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index 7119ddef8f83..069e3303df24 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -137,16 +137,16 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/observer/dockerobserver/integration_test.go b/extension/observer/dockerobserver/integration_test.go index 68c7dad13346..26362af8b12e 100644 --- a/extension/observer/dockerobserver/integration_test.go +++ b/extension/observer/dockerobserver/integration_test.go @@ -16,24 +16,12 @@ import ( "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" ) -type testHost struct { - component.Host - t *testing.T -} - -// ReportFatalError causes the test to be run to fail. -func (h *testHost) ReportFatalError(err error) { - h.t.Fatalf("Receiver reported a fatal error: %v", err) -} - -var _ component.Host = (*testHost)(nil) - func TestObserverEmitsEndpointsIntegration(t *testing.T) { image := "docker.io/library/nginx" tag := "1.17" @@ -226,9 +214,7 @@ func startObserverWithConfig(t *testing.T, listener observer.Notify, c *Config) obvs, ok := ext.(*dockerObserver) require.True(t, ok) require.NoError(t, err, "failed creating extension") - require.NoError(t, obvs.Start(ctx, &testHost{ - t: t, - })) + require.NoError(t, obvs.Start(ctx, componenttest.NewNopHost())) go obvs.ListAndWatch(listener) return obvs diff --git a/extension/observer/ecsobserver/README.md b/extension/observer/ecsobserver/README.md index 73bb1119e302..21a399e6fa10 100644 --- a/extension/observer/ecsobserver/README.md +++ b/extension/observer/ecsobserver/README.md @@ -443,7 +443,7 @@ otel's own /metrics. ### Error Handling -- Auth and cluster not found error will cause the extension to stop (calling `host.ReportFatalError`). Although IAM role +- Auth and cluster not found error will cause the extension to stop (calling `ReportStatus`). Although IAM role can be updated at runtime without restarting the collector, it's better to fail to make the problem obvious. Same applies to cluster not found. In the future we can add config to downgrade those errors if user want to monitor an ECS cluster with collector running outside the cluster, the collector can run anywhere as long as it can reach scrape diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 7f7177fc0e2b..bb4e7d587e55 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -6,9 +6,9 @@ require ( github.com/aws/aws-sdk-go v1.50.27 github.com/hashicorp/golang-lru v1.0.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index 8e480891b628..4ec6084143fe 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -22,6 +22,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -61,16 +63,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 6aad70488166..1f73bdab50c1 100644 --- a/extension/observer/ecstaskobserver/go.mod +++ b/extension/observer/ecstaskobserver/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -29,6 +29,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -42,16 +43,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index b3c3521be2b0..2f87d69bd660 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -25,6 +25,8 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -71,36 +73,36 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index b5cc8107bf85..7d545b1f5d74 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.96.0 github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -25,6 +25,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // 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.1.0 // indirect @@ -41,8 +42,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index 42205758b6a6..e4d7f2f4eaea 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -24,6 +24,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= @@ -80,16 +82,16 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 0e6e00f85a3e..3c7f2bcf6267 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,15 +6,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -29,7 +29,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -54,8 +54,8 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index 92bf51b89ba8..94953d1bd72f 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -113,8 +113,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -264,16 +264,16 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -558,14 +558,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index 4bd1f04fdc42..61d5e7e4919f 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidca go 1.21 require ( - github.com/coreos/go-oidc/v3 v3.9.0 + github.com/coreos/go-oidc/v3 v3.10.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -19,12 +19,13 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-jose/go-jose/v3 v3.0.3 // indirect + github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // 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.1.0 // indirect @@ -35,8 +36,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index de405b5e50f3..9ea0e3add0a3 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -2,13 +2,12 @@ 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/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/coreos/go-oidc/v3 v3.9.0 h1:0J/ogVOd4y8P0f0xUh8l9t07xRP/d8tccvjHl2dcsSo= -github.com/coreos/go-oidc/v3 v3.9.0/go.mod h1:rTKz2PYwftcrtoCzV5g5kvfJoWcm0Mk8AF8y1iAQro4= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/coreos/go-oidc/v3 v3.10.0 h1:tDnXHnLyiTVyT/2zLDGj09pFPkhND8Gl8lnTRhoEaJU= +github.com/coreos/go-oidc/v3 v3.10.0/go.mod h1:5j11xcw0D3+SGxn6Z/WFADsgcWVMyNAlSQupk0KK3ac= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= -github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= +github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U= +github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= 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= @@ -23,9 +22,10 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -60,29 +60,27 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -110,15 +108,12 @@ golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDf 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/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= 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-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.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= @@ -127,7 +122,6 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ 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/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -135,21 +129,14 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w 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.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.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/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= 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.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= 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= @@ -157,7 +144,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn 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/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= 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= @@ -175,6 +161,5 @@ google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh 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/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -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/opampextension/config.go b/extension/opampextension/config.go index 0ed2bb11e4a1..7756b1e1164a 100644 --- a/extension/opampextension/config.go +++ b/extension/opampextension/config.go @@ -46,7 +46,7 @@ func (caps Capabilities) toAgentCapabilities() protobufs.AgentCapabilities { type commonFields struct { Endpoint string `mapstructure:"endpoint"` - TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + TLSSetting configtls.ClientConfig `mapstructure:"tls,omitempty"` Headers map[string]configopaque.String `mapstructure:"headers,omitempty"` } @@ -87,13 +87,13 @@ func (s OpAMPServer) GetHeaders() map[string]configopaque.String { return map[string]configopaque.String{} } -func (s OpAMPServer) GetTLSSetting() configtls.TLSClientSetting { +func (s OpAMPServer) GetTLSSetting() configtls.ClientConfig { if s.WS != nil { return s.WS.TLSSetting } else if s.HTTP != nil { return s.HTTP.TLSSetting } - return configtls.TLSClientSetting{} + return configtls.ClientConfig{} } func (s OpAMPServer) GetEndpoint() string { diff --git a/extension/opampextension/config_test.go b/extension/opampextension/config_test.go index 364f1236f1e5..7a0d0ddd4461 100644 --- a/extension/opampextension/config_test.go +++ b/extension/opampextension/config_test.go @@ -97,7 +97,7 @@ func TestConfig_Getters(t *testing.T) { Headers: map[string]configopaque.String{ "test": configopaque.String("test"), }, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, @@ -118,7 +118,7 @@ func TestConfig_Getters(t *testing.T) { Headers: map[string]configopaque.String{ "test": configopaque.String("test"), }, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, diff --git a/extension/opampextension/go.mod b/extension/opampextension/go.mod index fc6c659c6efc..8bbf0cc5b2e9 100644 --- a/extension/opampextension/go.mod +++ b/extension/opampextension/go.mod @@ -7,13 +7,13 @@ require ( github.com/oklog/ulid/v2 v2.1.0 github.com/open-telemetry/opamp-go v0.12.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -44,7 +44,7 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/opampextension/go.sum b/extension/opampextension/go.sum index 896da4c613bc..4f23ca9746f3 100644 --- a/extension/opampextension/go.sum +++ b/extension/opampextension/go.sum @@ -64,22 +64,22 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index 8c9c15c10e5a..27af8794537f 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -35,9 +36,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index e361ce18c28b..daedc3f23339 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -19,6 +19,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -53,20 +55,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/remotetapextension/go.mod b/extension/remotetapextension/go.mod index 3ceeed681a0f..6b886614dbbd 100644 --- a/extension/remotetapextension/go.mod +++ b/extension/remotetapextension/go.mod @@ -4,10 +4,10 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -25,6 +25,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -38,16 +39,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/extension/remotetapextension/go.sum b/extension/remotetapextension/go.sum index 34fd2b5906de..075467a7404d 100644 --- a/extension/remotetapextension/go.sum +++ b/extension/remotetapextension/go.sum @@ -25,6 +25,8 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -69,36 +71,36 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index e8acd156378d..04b2a5ad5f59 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -8,10 +8,10 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.17.4 github.com/aws/aws-sdk-go-v2/service/sts v1.28.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -36,6 +36,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // 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.1.0 // indirect @@ -46,8 +47,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index 1c7c803e3156..d77227dec488 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -45,6 +45,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= @@ -77,18 +79,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/solarwindsapmsettingsextension/go.mod b/extension/solarwindsapmsettingsextension/go.mod index 0194a4170479..fef5eaae54f6 100644 --- a/extension/solarwindsapmsettingsextension/go.mod +++ b/extension/solarwindsapmsettingsextension/go.mod @@ -4,9 +4,9 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -21,6 +21,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // 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.1.0 // indirect @@ -31,8 +32,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/solarwindsapmsettingsextension/go.sum b/extension/solarwindsapmsettingsextension/go.sum index a0cbe9a2d3bc..1e6c11191bd2 100644 --- a/extension/solarwindsapmsettingsextension/go.sum +++ b/extension/solarwindsapmsettingsextension/go.sum @@ -19,6 +19,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= @@ -51,16 +53,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/storage/dbstorage/go.mod b/extension/storage/dbstorage/go.mod index 0865b6e87be6..ffe915398b5d 100644 --- a/extension/storage/dbstorage/go.mod +++ b/extension/storage/dbstorage/go.mod @@ -6,9 +6,9 @@ require ( github.com/jackc/pgx/v4 v4.18.3 github.com/mattn/go-sqlite3 v1.14.22 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgconn v1.14.3 // indirect github.com/jackc/pgio v1.0.0 // indirect @@ -42,8 +43,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/storage/dbstorage/go.sum b/extension/storage/dbstorage/go.sum index 48bc2d32ecde..a53849e34432 100644 --- a/extension/storage/dbstorage/go.sum +++ b/extension/storage/dbstorage/go.sum @@ -34,6 +34,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -153,16 +155,16 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/storage/filestorage/go.mod b/extension/storage/filestorage/go.mod index 0a8b5785bee7..87a33a5623a7 100644 --- a/extension/storage/filestorage/go.mod +++ b/extension/storage/filestorage/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 go.etcd.io/bbolt v1.3.9 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -25,6 +25,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -36,8 +37,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/storage/filestorage/go.sum b/extension/storage/filestorage/go.sum index 63831233fd54..b4fd7ebc2dbc 100644 --- a/extension/storage/filestorage/go.sum +++ b/extension/storage/filestorage/go.sum @@ -19,6 +19,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -55,18 +57,18 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/storage/go.mod b/extension/storage/go.mod index 77a0f22f8080..a3107c9af7f7 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -28,9 +28,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect diff --git a/extension/storage/go.sum b/extension/storage/go.sum index a0cbe9a2d3bc..c6a541f7679a 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -51,16 +51,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/extension/sumologicextension/README.md b/extension/sumologicextension/README.md index 225437747609..3d4b169541e0 100644 --- a/extension/sumologicextension/README.md +++ b/extension/sumologicextension/README.md @@ -2,12 +2,12 @@ | Status | | | ------------- |-----------| -| Stability | [development] | +| Stability | [alpha] | | Distributions | [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aextension%2Fsumologic%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aextension%2Fsumologic) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aextension%2Fsumologic%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aextension%2Fsumologic) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@astencel-sumo](https://www.github.com/astencel-sumo), [@sumo-drosiek](https://www.github.com/sumo-drosiek), [@swiatekm-sumo](https://www.github.com/swiatekm-sumo) | -[development]: https://github.com/open-telemetry/opentelemetry-collector#development +[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha [sumo]: https://github.com/SumoLogic/sumologic-otel-collector diff --git a/extension/sumologicextension/go.mod b/extension/sumologicextension/go.mod index bcef4e4d58ba..eee62959130e 100644 --- a/extension/sumologicextension/go.mod +++ b/extension/sumologicextension/go.mod @@ -8,12 +8,12 @@ require ( github.com/mitchellh/go-ps v1.0.0 github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -52,14 +52,14 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/extension/sumologicextension/go.sum b/extension/sumologicextension/go.sum index c889b77adec7..dd4d9b5fdff0 100644 --- a/extension/sumologicextension/go.sum +++ b/extension/sumologicextension/go.sum @@ -102,36 +102,36 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/extension/sumologicextension/internal/metadata/generated_status.go b/extension/sumologicextension/internal/metadata/generated_status.go index 6a5f54d7cff1..d74258369567 100644 --- a/extension/sumologicextension/internal/metadata/generated_status.go +++ b/extension/sumologicextension/internal/metadata/generated_status.go @@ -13,7 +13,7 @@ var ( ) const ( - ExtensionStability = component.StabilityLevelDevelopment + ExtensionStability = component.StabilityLevelAlpha ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/extension/sumologicextension/metadata.yaml b/extension/sumologicextension/metadata.yaml index b538baea69af..0954bdbf67d4 100644 --- a/extension/sumologicextension/metadata.yaml +++ b/extension/sumologicextension/metadata.yaml @@ -4,7 +4,7 @@ scope_name: otelcol/sumologic status: class: extension stability: - development: [extension] + alpha: [extension] distributions: [sumo] codeowners: active: [astencel-sumo, sumo-drosiek, swiatekm-sumo] diff --git a/go.mod b/go.mod index d44bb4626986..38746a8df357 100644 --- a/go.mod +++ b/go.mod @@ -166,22 +166,22 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.96.0 - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 ) require ( @@ -194,7 +194,7 @@ require ( cloud.google.com/go/longrunning v0.5.5 // indirect cloud.google.com/go/monitoring v1.18.0 // indirect cloud.google.com/go/pubsub v1.36.2 // indirect - cloud.google.com/go/spanner v1.58.0 // indirect + cloud.google.com/go/spanner v1.60.0 // indirect cloud.google.com/go/trace v1.10.5 // indirect code.cloudfoundry.org/clock v1.0.0 // indirect code.cloudfoundry.org/go-diodes v0.0.0-20211115184647-b584dd5df32c // indirect @@ -230,7 +230,7 @@ require ( github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect github.com/ClickHouse/ch-go v0.61.5 // indirect - github.com/ClickHouse/clickhouse-go/v2 v2.21.1 // indirect + github.com/ClickHouse/clickhouse-go/v2 v2.22.2 // indirect github.com/DataDog/agent-payload/v5 v5.0.104 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.51.1-0.20240301173728-334e775e420a // indirect github.com/DataDog/datadog-agent/pkg/proto v0.52.0-devel // indirect @@ -316,7 +316,7 @@ require ( github.com/containerd/cgroups/v3 v3.0.2 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/ttrpc v1.2.2 // indirect - github.com/coreos/go-oidc/v3 v3.9.0 // indirect + github.com/coreos/go-oidc/v3 v3.10.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cskr/pubsub v1.0.2 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect @@ -352,7 +352,7 @@ require ( github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-faster/city v1.0.1 // indirect github.com/go-faster/errors v0.7.1 // indirect - github.com/go-jose/go-jose/v3 v3.0.3 // indirect + github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-kit/kit v0.13.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -580,7 +580,7 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect github.com/signalfx/sapm-proto v0.14.0 // indirect - github.com/sijms/go-ora/v2 v2.8.9 // indirect + github.com/sijms/go-ora/v2 v2.8.10 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/snowflakedb/gosnowflake v1.8.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -624,31 +624,31 @@ require ( go.mongodb.org/atlas v0.36.0 // indirect go.mongodb.org/mongo-driver v1.14.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect @@ -684,12 +684,12 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/api v0.167.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect + google.golang.org/api v0.170.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect @@ -699,12 +699,12 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect gotest.tools/v3 v3.5.0 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect - k8s.io/client-go v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect + k8s.io/client-go v0.29.3 // indirect k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/kubelet v0.29.2 // indirect + k8s.io/kubelet v0.29.3 // indirect k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect sigs.k8s.io/controller-runtime v0.17.2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect @@ -1152,3 +1152,7 @@ replace ( ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ./internal/sqlquery + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding => ./extension/encoding + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension => ./extension/encoding/otlpencodingextension diff --git a/go.sum b/go.sum index 2423f31f1fed..a8bad0301d48 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/pubsub v1.36.2 h1:nAUD4aiWHZFYyINhRag1qOnHUk0/7QiWEa04XWnqACA= cloud.google.com/go/pubsub v1.36.2/go.mod h1:mHCFLNG8abCrPzhuOnpBcr9DUy+l3/LWWn0qoJdbh1w= -cloud.google.com/go/spanner v1.58.0 h1:W0SAtTz50XIZlTCJtHJ7x4Yxux6ZsorBBxjdXfjZ7UQ= -cloud.google.com/go/spanner v1.58.0/go.mod h1:eSpP+aaT38sdwFs0ovo7Z1VsG9RyM9n7EHpM5DhDEsE= +cloud.google.com/go/spanner v1.60.0 h1:O9kf49dfaDRzPpKJNChHUJ+Bao02WPedZb8ZPyi02lI= +cloud.google.com/go/spanner v1.60.0/go.mod h1:D2bOAeT/dC6zsZhXRIxbdYa5nQEYU3wYM/1KN3eg7Fs= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -161,8 +161,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeEI4= github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= -github.com/ClickHouse/clickhouse-go/v2 v2.21.1 h1:x8wZEMOHDh4K8kLQBtGMeIIguejiaj8/bUiF2VzG6n4= -github.com/ClickHouse/clickhouse-go/v2 v2.21.1/go.mod h1:hTWNkV9mkQwiQ/df0rbN17VXF05UTResY4krnjbzVZA= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2 h1:T1BljsIjj+3aQog80jKMTeF4EqAUG4P6TVcCvmakYAc= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2/go.mod h1:tBhdF3f3RdP7sS59+oBAtTyhWpy0024ZxDMhgxra0QE= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/DataDog/agent-payload/v5 v5.0.104 h1:uxTIaLthyKB4CxBKe+2FeMgL6ca3KVxpeYxlJGNcoJg= @@ -489,8 +489,8 @@ github.com/containerd/ttrpc v1.2.2 h1:9vqZr0pxwOF5koz6N0N3kJ0zDHokrcPxIR/ZR2YFtO github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak= github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/coreos/go-oidc/v3 v3.9.0 h1:0J/ogVOd4y8P0f0xUh8l9t07xRP/d8tccvjHl2dcsSo= -github.com/coreos/go-oidc/v3 v3.9.0/go.mod h1:rTKz2PYwftcrtoCzV5g5kvfJoWcm0Mk8AF8y1iAQro4= +github.com/coreos/go-oidc/v3 v3.10.0 h1:tDnXHnLyiTVyT/2zLDGj09pFPkhND8Gl8lnTRhoEaJU= +github.com/coreos/go-oidc/v3 v3.10.0/go.mod h1:5j11xcw0D3+SGxn6Z/WFADsgcWVMyNAlSQupk0KK3ac= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -634,8 +634,8 @@ github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7F github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= -github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= +github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U= +github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -1470,8 +1470,8 @@ github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 h1:32k2QLgsKhcEs55q4REP github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3/go.mod h1:gJrXWi7wSGXfiC7+VheQaz+ypdCt5SmZNL+BRxUe7y4= github.com/signalfx/sapm-proto v0.14.0 h1:KWh3I5E4EkelB19aP1/54Ik8khSioC/RVRW/riOfRGg= github.com/signalfx/sapm-proto v0.14.0/go.mod h1:Km6PskZh966cqNoUn3AmRyGRix5VfwnxVBvn2vjRC9U= -github.com/sijms/go-ora/v2 v2.8.9 h1:XIghcG8hjtYu+G9H235VEe5JXPLJtdzzj7pQm7JucVo= -github.com/sijms/go-ora/v2 v2.8.9/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.10 h1:Ekhx0I+A9qVBy1eOLa2eIhHWWYwVTa0MM78KS6h+5fg= +github.com/sijms/go-ora/v2 v2.8.10/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -1653,88 +1653,88 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240306115632-b2693620eff6 h1:owXKTclbDojb3bKuwvyheSl92ygNVF+aaS9UnIEErmk= -go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:XcDNDNqNBP0G6eQVU7E78tw5HHTzkejZkcjweYbr6cM= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 h1:xUKjw/BUUY+MMo2FR5ibKGq2uAZS72qgOotaj9WdpRA= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TjMxdMv90TzH6HjMJUg/uF2G+jrUOG1rkLZZqpiA3P0= -go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240306115632-b2693620eff6 h1:neBTpGYVF+UwceAaFGY0nrRW8mWwmy0lf1KQI1KNUEE= -go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oTNCYkDmZZu9M0keq6PkdIQDWQn6f7QKwUZqUnAIW5w= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 h1:wF6wlGx+CXujq8Lvtnbd03uHO5e3QT2RzownXPTnnnI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:swQIq8hlnQYRr7tiEc4z72PE573mnkiEFGMCdlK+Z2A= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6 h1:IlmU3X0cpnzc0DASb+rwRt5/FS94ZsRCVPsoUd2+zJQ= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:mMwdzs/CaxJJCYn3rqSZw4/Ckqh9tNfyIAW96TN3emo= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6 h1:1KKcYDYgf6xncUtccbEkCGSHjWLRkllB+N6hwZmpW7Q= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:g1X2187dRPxXcYsQYe6N7SYlxXSljGPjG8r8o5y3wmo= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6 h1:EdtaFPWHl7JD/KCJ/aNmWgc2pNC1zHDtjs4Fnas+cUk= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pQrKR/Aq1TNqNJOlVsGqIsqr7tNOsJl/VLnqnN+D8Z4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:kl4/vAgdVOycOCF1jDPbUXdZ8EkIDEgmFU2/Akgg39I= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TM0iDw+TINYMLYclaoAgtGKudMoun0zirQili7KZass= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:xBJ42Nn4e6QuaflVWgLINTESCRRZnOfX0taiuoDsgjw= +go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vDiwu5V3Gsqp19NtWfixZyXnT/V++Nko/xQmJz8mvJc= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:GgPvWGYWmY4+LPKRxz6q7UPRbcRscQQNXJZQ8GryY6s= +go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PHw6sVRsSCdGBRs032Mf8PxNqZgNJ0fVBBLtpWCdx0A= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:lFag1QoqEANT3KhVfKaT3J2RFFHwH6urC+ED7uI7vmE= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vltQMVWBhsB+5oChLlE77BqlHs54RS7oq4va4Gw8vzM= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:doCbNTc6uGPoH1azKROqg21Pq71IcJM1KvvVTPfM0uE= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/GGESGmyy/r2zTB2ogFuxwPGNRJjbiuPY6J02QiXf2Q= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ar/lke632VUrLX6/t9mjKE6QLnt4glhCKCkQvzN5SwY= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:mz2NEu4Dba2/t6MTPOjOOTgFXrmiqPQeShmQmwxrm30= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= @@ -1827,7 +1827,6 @@ golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2070,7 +2069,6 @@ golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2175,8 +2173,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -2200,8 +2198,8 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.167.0 h1:CKHrQD1BLRii6xdkatBDXyKzM0mkawt2QP+H3LtPmSE= -google.golang.org/api v0.167.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= +google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2257,10 +2255,10 @@ google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxH google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= -google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78 h1:SzXBGiWM1LNVYLCRP3e0/Gsze804l4jGoJ5lYysEO5I= -google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 h1:Xs9lu+tLXxLIfuci70nG4cpwaRC+mRQPUL7LoIeDJC4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -2362,14 +2360,14 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -2381,8 +2379,8 @@ k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubelet v0.29.2 h1:bQ2StqkUqPCFNLtGLsb3v3O2LKQHXNMju537zOGboRg= -k8s.io/kubelet v0.29.2/go.mod h1:i5orNPqW/fAMrqptbCXFW/vLBBP12TZZc41IrrvF7SY= +k8s.io/kubelet v0.29.3 h1:X9h0ZHzc+eUeNTaksbN0ItHyvGhQ7Z0HPjnQD2oHdwU= +k8s.io/kubelet v0.29.3/go.mod h1:jDiGuTkFOUynyBKzOoC1xRSWlgAZ9UPcTYeFyjr6vas= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= diff --git a/internal/aws/containerinsight/go.mod b/internal/aws/containerinsight/go.mod index e2acb4103734..a24b687736e9 100644 --- a/internal/aws/containerinsight/go.mod +++ b/internal/aws/containerinsight/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/internal/aws/containerinsight/go.sum b/internal/aws/containerinsight/go.sum index 8e499c2424ba..30346de5889e 100644 --- a/internal/aws/containerinsight/go.sum +++ b/internal/aws/containerinsight/go.sum @@ -33,8 +33,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index efdf835a12ed..aad66d23a2a4 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/aws/aws-sdk-go v1.50.27 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -23,9 +23,9 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index 49c6ee9fd9dd..3aae1cbd76a8 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -48,14 +48,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index bc087fb36d25..5ef7ace84d5a 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -5,8 +5,8 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -36,18 +36,18 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index 34fd2b5906de..c5fb0462dcb8 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -69,36 +69,36 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/internal/aws/k8s/go.mod b/internal/aws/k8s/go.mod index a1eb7d2c37ca..46e205833e05 100644 --- a/internal/aws/k8s/go.mod +++ b/internal/aws/k8s/go.mod @@ -7,9 +7,9 @@ require ( github.com/stretchr/testify v1.9.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -21,7 +21,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect diff --git a/internal/aws/k8s/go.sum b/internal/aws/k8s/go.sum index ab362100ee5b..da27570713a8 100644 --- a/internal/aws/k8s/go.sum +++ b/internal/aws/k8s/go.sum @@ -21,12 +21,10 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= -github.com/google/go-cmp v0.5.5/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= @@ -137,8 +135,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -152,12 +148,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= 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= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= diff --git a/internal/aws/proxy/cfg.go b/internal/aws/proxy/cfg.go index 4a20b817b4a9..2d352d58f742 100644 --- a/internal/aws/proxy/cfg.go +++ b/internal/aws/proxy/cfg.go @@ -23,7 +23,7 @@ type Config struct { // TLSSetting struct exposes TLS client configuration when forwarding // calls to the AWS X-Ray backend. - TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + TLSSetting configtls.ClientConfig `mapstructure:"tls,omitempty"` // Region is the AWS region the local TCP server forwards requests to. Region string `mapstructure:"region"` @@ -52,7 +52,7 @@ func DefaultConfig() *Config { Endpoint: localhostgate.EndpointForPort(2000), }, ProxyAddress: "", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, ServerName: "", }, diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index 465f76dff24c..4980ed59b56b 100644 --- a/internal/aws/proxy/go.mod +++ b/internal/aws/proxy/go.mod @@ -6,8 +6,8 @@ require ( github.com/aws/aws-sdk-go v1.50.27 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/zap v1.27.0 ) @@ -17,8 +17,8 @@ require ( github.com/hashicorp/go-version v1.6.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/sys v0.14.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index 9ba84575e907..5a35be9905cf 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -34,16 +34,16 @@ github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncj github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= go.opentelemetry.io/collector/confmap v0.96.0 h1:415ELCfC8S3xjiNFLneDWJi6h7j7SUw8A8pZtINEQdI= go.opentelemetry.io/collector/confmap v0.96.0/go.mod h1:q/dWHLvkk1vgvAF0l5dbgQSiPOmGwpv0FwcNaGpqsfM= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= 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= diff --git a/internal/aws/xray/go.mod b/internal/aws/xray/go.mod index 228a94d23866..24a187a01ed5 100644 --- a/internal/aws/xray/go.mod +++ b/internal/aws/xray/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.50.27 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -24,9 +24,9 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect diff --git a/internal/aws/xray/go.sum b/internal/aws/xray/go.sum index 554b91839ca6..6c3ef4f719d5 100644 --- a/internal/aws/xray/go.sum +++ b/internal/aws/xray/go.sum @@ -48,14 +48,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= diff --git a/internal/common/go.mod b/internal/common/go.mod index 89067b089801..3ec119d0fec6 100644 --- a/internal/common/go.mod +++ b/internal/common/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/internal/common/go.sum b/internal/common/go.sum index 9f92253de1b9..75fa19492f4a 100644 --- a/internal/common/go.sum +++ b/internal/common/go.sum @@ -12,8 +12,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= 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= diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index 87c09cd9f232..d1565e80c088 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -9,13 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -72,14 +72,14 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index 2a55cf923f2e..df5e76aca757 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -116,8 +116,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -142,26 +142,26 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -209,7 +209,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index 25e2bbba8c07..85c139e3b1dd 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -9,8 +9,8 @@ require ( github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.4 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.4 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk/metric v1.24.0 @@ -73,9 +73,9 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index bc964448c0a4..100778a952bb 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -184,16 +184,16 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/internal/exp/metrics/go.mod b/internal/exp/metrics/go.mod index 91803cc4b4f2..9d47dba50855 100644 --- a/internal/exp/metrics/go.mod +++ b/internal/exp/metrics/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 ) require ( diff --git a/internal/exp/metrics/go.sum b/internal/exp/metrics/go.sum index f0d37241ba07..4abd423cfe53 100644 --- a/internal/exp/metrics/go.sum +++ b/internal/exp/metrics/go.sum @@ -35,8 +35,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= diff --git a/internal/filter/go.mod b/internal/filter/go.mod index 1c236d3430fe..eeb657dc2de1 100644 --- a/internal/filter/go.mod +++ b/internal/filter/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -45,7 +45,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect diff --git a/internal/filter/go.sum b/internal/filter/go.sum index f83481084da2..0f63cb064ac9 100644 --- a/internal/filter/go.sum +++ b/internal/filter/go.sum @@ -82,18 +82,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/internal/k8sconfig/go.mod b/internal/k8sconfig/go.mod index fed3e947a811..92e07cde0705 100644 --- a/internal/k8sconfig/go.mod +++ b/internal/k8sconfig/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -16,7 +16,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.4.0 // indirect @@ -40,7 +40,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/internal/k8sconfig/go.sum b/internal/k8sconfig/go.sum index 3dc96498d420..05975d6f106c 100644 --- a/internal/k8sconfig/go.sum +++ b/internal/k8sconfig/go.sum @@ -101,9 +101,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -114,7 +113,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/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.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= @@ -450,8 +448,6 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -482,14 +478,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/internal/k8stest/go.mod b/internal/k8stest/go.mod index 6d8bd72778cb..200696a6da3a 100644 --- a/internal/k8stest/go.mod +++ b/internal/k8stest/go.mod @@ -5,9 +5,9 @@ go 1.21 require ( github.com/docker/docker v24.0.9+incompatible github.com/stretchr/testify v1.9.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -22,7 +22,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.3.0 // indirect diff --git a/internal/k8stest/go.sum b/internal/k8stest/go.sum index 7d3ea36f8a78..39d545b0519d 100644 --- a/internal/k8stest/go.sum +++ b/internal/k8stest/go.sum @@ -31,9 +31,8 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -153,8 +152,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -170,12 +167,12 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= diff --git a/internal/kafka/authentication.go b/internal/kafka/authentication.go index 835244fc10dc..a05edc6486c5 100644 --- a/internal/kafka/authentication.go +++ b/internal/kafka/authentication.go @@ -16,10 +16,10 @@ import ( // Authentication defines authentication. type Authentication struct { - PlainText *PlainTextConfig `mapstructure:"plain_text"` - SASL *SASLConfig `mapstructure:"sasl"` - TLS *configtls.TLSClientSetting `mapstructure:"tls"` - Kerberos *KerberosConfig `mapstructure:"kerberos"` + PlainText *PlainTextConfig `mapstructure:"plain_text"` + SASL *SASLConfig `mapstructure:"sasl"` + TLS *configtls.ClientConfig `mapstructure:"tls"` + Kerberos *KerberosConfig `mapstructure:"kerberos"` } // PlainTextConfig defines plaintext authentication. @@ -134,7 +134,7 @@ func configureSASL(config SASLConfig, saramaConfig *sarama.Config) error { return nil } -func configureTLS(config configtls.TLSClientSetting, saramaConfig *sarama.Config) error { +func configureTLS(config configtls.ClientConfig, saramaConfig *sarama.Config) error { tlsConfig, err := config.LoadTLSConfig() if err != nil { return fmt.Errorf("error loading tls config: %w", err) diff --git a/internal/kafka/authentication_test.go b/internal/kafka/authentication_test.go index 071a7ec8bf18..3fa52c62ea33 100644 --- a/internal/kafka/authentication_test.go +++ b/internal/kafka/authentication_test.go @@ -46,7 +46,7 @@ func TestAuthentication(t *testing.T) { saramaTLSCfg := &sarama.Config{} saramaTLSCfg.Net.TLS.Enable = true - tlsClient := configtls.TLSClientSetting{} + tlsClient := configtls.ClientConfig{} tlscfg, err := tlsClient.LoadTLSConfig() require.NoError(t, err) saramaTLSCfg.Net.TLS.Config = tlscfg @@ -73,12 +73,12 @@ func TestAuthentication(t *testing.T) { saramaConfig: saramaPlaintext, }, { - auth: Authentication{TLS: &configtls.TLSClientSetting{}}, + auth: Authentication{TLS: &configtls.ClientConfig{}}, saramaConfig: saramaTLSCfg, }, { - auth: Authentication{TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{CAFile: "/doesnotexists"}, + auth: Authentication{TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{CAFile: "/doesnotexists"}, }}, saramaConfig: saramaTLSCfg, err: "failed to load TLS config", diff --git a/internal/kafka/go.mod b/internal/kafka/go.mod index 84b267eec00b..0795ed4dd4c5 100644 --- a/internal/kafka/go.mod +++ b/internal/kafka/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go v1.50.27 github.com/stretchr/testify v1.9.0 github.com/xdg-go/scram v1.1.2 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -34,7 +34,7 @@ require ( github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect golang.org/x/crypto v0.19.0 // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.17.0 // indirect diff --git a/internal/kafka/go.sum b/internal/kafka/go.sum index f9bed6b5608a..5d221e5ab673 100644 --- a/internal/kafka/go.sum +++ b/internal/kafka/go.sum @@ -87,10 +87,10 @@ github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3k github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= go.opentelemetry.io/collector/confmap v0.96.0 h1:415ELCfC8S3xjiNFLneDWJi6h7j7SUw8A8pZtINEQdI= go.opentelemetry.io/collector/confmap v0.96.0/go.mod h1:q/dWHLvkk1vgvAF0l5dbgQSiPOmGwpv0FwcNaGpqsfM= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/internal/kubelet/client_config.go b/internal/kubelet/client_config.go index ff8c86f2c8cb..91eb85267d68 100644 --- a/internal/kubelet/client_config.go +++ b/internal/kubelet/client_config.go @@ -11,8 +11,8 @@ import ( // ClientConfig for a kubelet client for talking to a kubelet HTTP endpoint. type ClientConfig struct { - k8sconfig.APIConfig `mapstructure:",squash"` - configtls.TLSSetting `mapstructure:",squash"` + k8sconfig.APIConfig `mapstructure:",squash"` + configtls.Config `mapstructure:",squash"` // InsecureSkipVerify controls whether the client verifies the server's // certificate chain and host name. InsecureSkipVerify bool `mapstructure:"insecure_skip_verify"` diff --git a/internal/kubelet/client_test.go b/internal/kubelet/client_test.go index cdc0c10ed457..c0a3b86fec7c 100644 --- a/internal/kubelet/client_test.go +++ b/internal/kubelet/client_test.go @@ -55,7 +55,7 @@ func TestNewTLSClientProvider(t *testing.T) { APIConfig: k8sconfig.APIConfig{ AuthType: k8sconfig.AuthTypeTLS, }, - TLSSetting: configtls.TLSSetting{ + Config: configtls.Config{ CAFile: certPath, CertFile: certPath, KeyFile: keyFile, @@ -278,7 +278,7 @@ func TestTLSMissingCertFile(t *testing.T) { p := tlsClientProvider{ endpoint: "", cfg: &ClientConfig{ - TLSSetting: configtls.TLSSetting{ + Config: configtls.Config{ CAFile: certPath, }, }, diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 1757f7af8b49..aa67e56866f1 100644 --- a/internal/kubelet/go.mod +++ b/internal/kubelet/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - k8s.io/client-go v0.29.2 + k8s.io/client-go v0.29.3 ) require ( @@ -21,7 +21,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.4.0 // indirect @@ -36,7 +36,7 @@ require ( github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.19.0 // indirect golang.org/x/oauth2 v0.14.0 // indirect @@ -49,8 +49,8 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index 8ad877b80a33..7eb88d5432c2 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -105,9 +105,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -118,7 +117,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/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.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= @@ -246,10 +244,10 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= go.opentelemetry.io/collector/confmap v0.96.0 h1:415ELCfC8S3xjiNFLneDWJi6h7j7SUw8A8pZtINEQdI= go.opentelemetry.io/collector/confmap v0.96.0/go.mod h1:q/dWHLvkk1vgvAF0l5dbgQSiPOmGwpv0FwcNaGpqsfM= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -476,8 +474,6 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -508,14 +504,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/internal/metadataproviders/go.mod b/internal/metadataproviders/go.mod index 86d5f4f7a837..1c65dd7bcc85 100644 --- a/internal/metadataproviders/go.mod +++ b/internal/metadataproviders/go.mod @@ -9,13 +9,13 @@ require ( github.com/hashicorp/consul/api v1.28.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/sdk v1.24.0 go.uber.org/goleak v1.3.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -34,7 +34,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.4.0 // indirect diff --git a/internal/metadataproviders/go.sum b/internal/metadataproviders/go.sum index 4ba1c5f8a9bb..f18bca1d9580 100644 --- a/internal/metadataproviders/go.sum +++ b/internal/metadataproviders/go.sum @@ -154,9 +154,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= @@ -406,8 +405,8 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= @@ -665,8 +664,6 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -702,14 +699,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index 2fd07bbf64f9..2727ce99b1ba 100644 --- a/internal/sharedcomponent/go.mod +++ b/internal/sharedcomponent/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -27,9 +27,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index c5c4258998b0..e5fda03c6ca2 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -51,14 +51,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 3439760c8c23..70592651d7b2 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,10 +4,10 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -27,12 +27,12 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index efe39bdd2a3e..5f0f65c06e7b 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -22,6 +22,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -63,28 +65,28 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/collector/receiver v0.96.0 h1:OrlcuyFCBQpbWNb2klzTdz1ZXMk0acRDh7fbaQtP4eo= go.opentelemetry.io/collector/receiver v0.96.0/go.mod h1:fb5Vr2+tAkzB4qE6+lNaMsZwaeE8qZvG3IBdzK5hCRY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/internal/sqlquery/config.go b/internal/sqlquery/config.go index ceb2b4556cfd..c679d81db4d7 100644 --- a/internal/sqlquery/config.go +++ b/internal/sqlquery/config.go @@ -12,12 +12,12 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - Driver string `mapstructure:"driver"` - DataSource string `mapstructure:"datasource"` - Queries []Query `mapstructure:"queries"` - StorageID *component.ID `mapstructure:"storage"` - Telemetry TelemetryConfig `mapstructure:"telemetry"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + Driver string `mapstructure:"driver"` + DataSource string `mapstructure:"datasource"` + Queries []Query `mapstructure:"queries"` + StorageID *component.ID `mapstructure:"storage"` + Telemetry TelemetryConfig `mapstructure:"telemetry"` } func (c Config) Validate() error { diff --git a/internal/sqlquery/go.mod b/internal/sqlquery/go.mod index 42147c058133..e5749ed094fe 100644 --- a/internal/sqlquery/go.mod +++ b/internal/sqlquery/go.mod @@ -7,12 +7,12 @@ require ( github.com/go-sql-driver/mysql v1.8.0 github.com/lib/pq v1.10.9 github.com/microsoft/go-mssqldb v1.7.0 - github.com/sijms/go-ora/v2 v2.8.9 + github.com/sijms/go-ora/v2 v2.8.10 github.com/snowflakedb/gosnowflake v1.8.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 ) @@ -85,10 +85,10 @@ require ( github.com/prometheus/procfs v0.13.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect diff --git a/internal/sqlquery/go.sum b/internal/sqlquery/go.sum index fd44885916c4..45ebc2827144 100644 --- a/internal/sqlquery/go.sum +++ b/internal/sqlquery/go.sum @@ -192,8 +192,8 @@ github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGK github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/sijms/go-ora/v2 v2.8.9 h1:XIghcG8hjtYu+G9H235VEe5JXPLJtdzzj7pQm7JucVo= -github.com/sijms/go-ora/v2 v2.8.9/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.10 h1:Ekhx0I+A9qVBy1eOLa2eIhHWWYwVTa0MM78KS6h+5fg= +github.com/sijms/go-ora/v2 v2.8.10/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/snowflakedb/gosnowflake v1.8.0 h1:4bQj8eAYGMkou/nICiIEb9jSbBLDDp5cB6JaKx9WwiA= @@ -218,20 +218,20 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/internal/sqlquery/metrics.go b/internal/sqlquery/metrics.go index 4a00e3b6269d..01cb8dbae856 100644 --- a/internal/sqlquery/metrics.go +++ b/internal/sqlquery/metrics.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/receiver/scraperhelper" ) -func rowToMetric(row StringMap, cfg MetricCfg, dest pmetric.Metric, startTime pcommon.Timestamp, ts pcommon.Timestamp, scrapeCfg scraperhelper.ScraperControllerSettings) error { +func rowToMetric(row StringMap, cfg MetricCfg, dest pmetric.Metric, startTime pcommon.Timestamp, ts pcommon.Timestamp, scrapeCfg scraperhelper.ControllerConfig) error { dest.SetName(cfg.MetricName) dest.SetDescription(cfg.Description) dest.SetUnit(cfg.Unit) @@ -63,7 +63,7 @@ func rowToMetric(row StringMap, cfg MetricCfg, dest pmetric.Metric, startTime pc return nil } -func setTimestamp(cfg MetricCfg, dp pmetric.NumberDataPoint, startTime pcommon.Timestamp, ts pcommon.Timestamp, scrapeCfg scraperhelper.ScraperControllerSettings) { +func setTimestamp(cfg MetricCfg, dp pmetric.NumberDataPoint, startTime pcommon.Timestamp, ts pcommon.Timestamp, scrapeCfg scraperhelper.ControllerConfig) { dp.SetTimestamp(ts) // Cumulative sum should have a start time set to the beginning of the data points cumulation diff --git a/internal/sqlquery/scraper.go b/internal/sqlquery/scraper.go index 84be8370911e..9db99d6ea198 100644 --- a/internal/sqlquery/scraper.go +++ b/internal/sqlquery/scraper.go @@ -27,7 +27,7 @@ type ClientProviderFunc func(Db, string, *zap.Logger, TelemetryConfig) DbClient type Scraper struct { id component.ID Query Query - ScrapeCfg scraperhelper.ScraperControllerSettings + ScrapeCfg scraperhelper.ControllerConfig StartTime pcommon.Timestamp ClientProviderFunc ClientProviderFunc DbProviderFunc DbProviderFunc @@ -39,7 +39,7 @@ type Scraper struct { var _ scraperhelper.Scraper = (*Scraper)(nil) -func NewScraper(id component.ID, query Query, scrapeCfg scraperhelper.ScraperControllerSettings, logger *zap.Logger, telemetry TelemetryConfig, dbProviderFunc DbProviderFunc, clientProviderFunc ClientProviderFunc) *Scraper { +func NewScraper(id component.ID, query Query, scrapeCfg scraperhelper.ControllerConfig, logger *zap.Logger, telemetry TelemetryConfig, dbProviderFunc DbProviderFunc, clientProviderFunc ClientProviderFunc) *Scraper { return &Scraper{ id: id, Query: query, diff --git a/internal/tools/go.mod b/internal/tools/go.mod index d2ffb71c71b2..ab5e5db35bc8 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/Khan/genqlient v0.7.0 github.com/client9/misspell v0.3.4 - github.com/daixiang0/gci v0.12.3 + github.com/daixiang0/gci v0.13.1 github.com/golangci/golangci-lint v1.55.2 github.com/google/addlicense v1.1.1 github.com/jcchavezs/porto v0.6.0 @@ -15,8 +15,8 @@ require ( go.opentelemetry.io/build-tools/crosslink v0.13.0 go.opentelemetry.io/build-tools/issuegenerator v0.13.0 go.opentelemetry.io/build-tools/multimod v0.13.0 - go.opentelemetry.io/collector/cmd/builder v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/cmd/mdatagen v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/cmd/builder v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/cmd/mdatagen v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 golang.org/x/tools v0.19.0 golang.org/x/vuln v1.0.4 @@ -226,11 +226,11 @@ require ( gitlab.com/bosi/decorder v0.4.1 // indirect go-simpler.org/sloglint v0.1.2 // indirect go.opentelemetry.io/build-tools v0.13.0 // indirect - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 579d6b050fd5..bc9ed6991020 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -153,8 +153,8 @@ github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDU github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/daixiang0/gci v0.12.3 h1:yOZI7VAxAGPQmkb1eqt5g/11SUlwoat1fSblGLmdiQc= -github.com/daixiang0/gci v0.12.3/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI= +github.com/daixiang0/gci v0.13.1 h1:jkQWCPu7JZhNoO+OMHFxs1KGonWPhXw9txySE8qwAb0= +github.com/daixiang0/gci v0.13.1/go.mod h1:JyUVY/ZKzBjrzLOm2UQDZohEZ2HlfX72jONBV0REVb4= 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= @@ -704,20 +704,20 @@ go.opentelemetry.io/build-tools/issuegenerator v0.13.0 h1:hAzDPWh/oyBVoYRB5Xb8Y6 go.opentelemetry.io/build-tools/issuegenerator v0.13.0/go.mod h1:hHPQ5lv0apJv0QM8mz/k5nAwacDEEDD+fJ8xYhrKjBM= go.opentelemetry.io/build-tools/multimod v0.13.0 h1:HGAP3zCM8vOTNJSQbjQ5VbKZSctIZxppPBxRTzye7ic= go.opentelemetry.io/build-tools/multimod v0.13.0/go.mod h1:CxZp68c4PIN+bYlVOGB2FvE5zZMBuGz7cGSHv2L7pSc= -go.opentelemetry.io/collector/cmd/builder v0.96.1-0.20240306115632-b2693620eff6 h1:p+1m9BqEfSZ4OyLtmLoW/fqx1PhcJRsBScZxhfjSHxU= -go.opentelemetry.io/collector/cmd/builder v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:1Odbp7rTiPEXoJEcVMdw2Q1a3pmOTATlip3+kgFL02k= -go.opentelemetry.io/collector/cmd/mdatagen v0.96.1-0.20240306115632-b2693620eff6 h1:BzwU3pw8NQ/f4VR9H2wgwMKA+k5MkVj0Jc59EFqrJ/Q= -go.opentelemetry.io/collector/cmd/mdatagen v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pFtwNH84Msti1j6FolqcbP+2PnapECKObMiq2ZPRMwc= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/cmd/builder v0.96.1-0.20240315172937-3b5aee0c7a16 h1:BBiMQhOWLgJ1NeNA3uimw1ofeSsIq+BJl5E94Zd7RqE= +go.opentelemetry.io/collector/cmd/builder v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:1Odbp7rTiPEXoJEcVMdw2Q1a3pmOTATlip3+kgFL02k= +go.opentelemetry.io/collector/cmd/mdatagen v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KAqXgwr0dtrh4FUyWFZH6dUaQxWadDtUuvQiI6013t4= +go.opentelemetry.io/collector/cmd/mdatagen v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:byF/nAju2wTCfj6cq+GDDV4LnewujFWBhWKnOT3aeYg= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 3a84b43e8afd..f24c684fe9a5 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index b886ef5704da..ef39d0843aeb 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -35,10 +35,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.96.0 h1:qXA3biNps8LPYYCTJwepGu58sW0XInmwnQbkkWZchIg= go.opentelemetry.io/collector v0.96.0/go.mod h1:/i3zyRg23r7vloTLzKG/mRI2VkEt1Q4ARXbe3vKnAaE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index bcb4b5e63eb9..aa7e2564bd3b 100644 --- a/pkg/batchpersignal/go.mod +++ b/pkg/batchpersignal/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index e5e9a734f166..0c2b0ef9df1d 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -34,8 +34,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= diff --git a/pkg/experimentalmetricmetadata/go.mod b/pkg/experimentalmetricmetadata/go.mod index 88e80fdbdb3e..e4ba6d56d7b0 100644 --- a/pkg/experimentalmetricmetadata/go.mod +++ b/pkg/experimentalmetricmetadata/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) diff --git a/pkg/experimentalmetricmetadata/go.sum b/pkg/experimentalmetricmetadata/go.sum index e5e9a734f166..0c2b0ef9df1d 100644 --- a/pkg/experimentalmetricmetadata/go.sum +++ b/pkg/experimentalmetricmetadata/go.sum @@ -34,8 +34,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= diff --git a/pkg/golden/go.mod b/pkg/golden/go.mod index daff3ebc74ad..d437773f1092 100644 --- a/pkg/golden/go.mod +++ b/pkg/golden/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/pkg/golden/go.sum b/pkg/golden/go.sum index f0d37241ba07..4abd423cfe53 100644 --- a/pkg/golden/go.sum +++ b/pkg/golden/go.sum @@ -35,8 +35,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= diff --git a/pkg/ottl/go.mod b/pkg/ottl/go.mod index 31b3bbfb92ba..37c25e5216bd 100644 --- a/pkg/ottl/go.mod +++ b/pkg/ottl/go.mod @@ -11,8 +11,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect diff --git a/pkg/ottl/go.sum b/pkg/ottl/go.sum index 377630085400..18c7b45552ef 100644 --- a/pkg/ottl/go.sum +++ b/pkg/ottl/go.sum @@ -76,14 +76,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/pkg/ottl/ottlfuncs/func_truncate_time_test.go b/pkg/ottl/ottlfuncs/func_truncate_time_test.go index 33781d3b478e..626fdd831ea0 100644 --- a/pkg/ottl/ottlfuncs/func_truncate_time_test.go +++ b/pkg/ottl/ottlfuncs/func_truncate_time_test.go @@ -25,7 +25,7 @@ func Test_TruncateTime(t *testing.T) { name: "truncate to 1s", time: &ottl.StandardTimeGetter[any]{ Getter: func(ctx context.Context, tCtx any) (any, error) { - return time.Date(2022, 1, 1, 1, 1, 1, 999999999, time.Local), nil + return time.Date(2022, 1, 1, 1, 1, 1, 999999999, time.UTC), nil }, }, duration: &ottl.StandardDurationGetter[any]{ @@ -34,13 +34,13 @@ func Test_TruncateTime(t *testing.T) { return d, nil }, }, - expected: time.Date(2022, 1, 1, 1, 1, 1, 0, time.Local), + expected: time.Date(2022, 1, 1, 1, 1, 1, 0, time.UTC), }, { name: "truncate to 1ms", time: &ottl.StandardTimeGetter[any]{ Getter: func(ctx context.Context, tCtx any) (any, error) { - return time.Date(2022, 1, 1, 1, 1, 1, 999999999, time.Local), nil + return time.Date(2022, 1, 1, 1, 1, 1, 999999999, time.UTC), nil }, }, duration: &ottl.StandardDurationGetter[any]{ @@ -49,13 +49,13 @@ func Test_TruncateTime(t *testing.T) { return d, nil }, }, - expected: time.Date(2022, 1, 1, 1, 1, 1, 999000000, time.Local), + expected: time.Date(2022, 1, 1, 1, 1, 1, 999000000, time.UTC), }, { name: "truncate old time", time: &ottl.StandardTimeGetter[any]{ Getter: func(ctx context.Context, tCtx any) (any, error) { - return time.Date(1980, 9, 9, 9, 59, 59, 999999999, time.Local), nil + return time.Date(1980, 9, 9, 9, 59, 59, 999999999, time.UTC), nil }, }, duration: &ottl.StandardDurationGetter[any]{ @@ -64,7 +64,7 @@ func Test_TruncateTime(t *testing.T) { return d, nil }, }, - expected: time.Date(1980, 9, 9, 9, 0, 0, 0, time.Local), + expected: time.Date(1980, 9, 9, 9, 0, 0, 0, time.UTC), }, } for _, tt := range tests { diff --git a/pkg/pdatatest/go.mod b/pkg/pdatatest/go.mod index 2a5e4fda093f..59adcb5a33d7 100644 --- a/pkg/pdatatest/go.mod +++ b/pkg/pdatatest/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) diff --git a/pkg/pdatatest/go.sum b/pkg/pdatatest/go.sum index f0d37241ba07..4abd423cfe53 100644 --- a/pkg/pdatatest/go.sum +++ b/pkg/pdatatest/go.sum @@ -35,8 +35,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= diff --git a/pkg/pdatautil/go.mod b/pkg/pdatautil/go.mod index 05d334f1e7fb..63715cc9aaac 100644 --- a/pkg/pdatautil/go.mod +++ b/pkg/pdatautil/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/cespare/xxhash/v2 v2.2.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) diff --git a/pkg/pdatautil/go.sum b/pkg/pdatautil/go.sum index f20d2af4fbd5..9fbffa5d95b6 100644 --- a/pkg/pdatautil/go.sum +++ b/pkg/pdatautil/go.sum @@ -25,8 +25,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index 80fee3267d1f..6a13812b32c9 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,9 +5,9 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -25,9 +25,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index b7141a1e6879..d5a5eb42ea72 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -61,18 +61,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/pkg/sampling/go.mod b/pkg/sampling/go.mod index 30a3e3ee3dbb..ef5103a82408 100644 --- a/pkg/sampling/go.mod +++ b/pkg/sampling/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/multierr v1.11.0 ) diff --git a/pkg/sampling/go.sum b/pkg/sampling/go.sum index e05c55d4ee75..abc7a57f3050 100644 --- a/pkg/sampling/go.sum +++ b/pkg/sampling/go.sum @@ -23,8 +23,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index 40a214d6cdc0..edd68d73b47a 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -14,21 +14,21 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 github.com/valyala/fastjson v1.6.4 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 + golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa golang.org/x/sys v0.18.0 golang.org/x/text v0.14.0 - gonum.org/v1/gonum v0.14.0 + gonum.org/v1/gonum v0.15.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -41,6 +41,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -56,9 +57,9 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect diff --git a/pkg/stanza/go.sum b/pkg/stanza/go.sum index a393ca89f771..247d7b219afb 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -30,6 +30,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -85,28 +87,28 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -129,8 +131,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -172,8 +174,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/pkg/stanza/operator/input/syslog/config_test.go b/pkg/stanza/operator/input/syslog/config_test.go index fc8354440db0..3285fb793ca2 100644 --- a/pkg/stanza/operator/input/syslog/config_test.go +++ b/pkg/stanza/operator/input/syslog/config_test.go @@ -39,8 +39,8 @@ func TestUnmarshal(t *testing.T) { cfg.TCP.Encoding = "utf-16" cfg.TCP.SplitConfig.LineStartPattern = "ABC" cfg.TCP.SplitConfig.LineEndPattern = "" - cfg.TCP.TLS = &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + cfg.TCP.TLS = &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "foo", KeyFile: "foo2", CAFile: "foo3", diff --git a/pkg/stanza/operator/input/tcp/config_test.go b/pkg/stanza/operator/input/tcp/config_test.go index 07e7f9305bf6..e760df6018ca 100644 --- a/pkg/stanza/operator/input/tcp/config_test.go +++ b/pkg/stanza/operator/input/tcp/config_test.go @@ -32,8 +32,8 @@ func TestUnmarshal(t *testing.T) { cfg.AddAttributes = true cfg.Encoding = "utf-8" cfg.SplitConfig.LineStartPattern = "ABC" - cfg.TLS = &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + cfg.TLS = &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "foo", KeyFile: "foo2", CAFile: "foo3", diff --git a/pkg/stanza/operator/input/tcp/tcp.go b/pkg/stanza/operator/input/tcp/tcp.go index 2dd553e77512..e28853cbd287 100644 --- a/pkg/stanza/operator/input/tcp/tcp.go +++ b/pkg/stanza/operator/input/tcp/tcp.go @@ -68,14 +68,14 @@ type Config struct { // BaseConfig is the detailed configuration of a tcp input operator. type BaseConfig struct { - MaxLogSize helper.ByteSize `mapstructure:"max_log_size,omitempty"` - ListenAddress string `mapstructure:"listen_address,omitempty"` - TLS *configtls.TLSServerSetting `mapstructure:"tls,omitempty"` - AddAttributes bool `mapstructure:"add_attributes,omitempty"` - OneLogPerPacket bool `mapstructure:"one_log_per_packet,omitempty"` - Encoding string `mapstructure:"encoding,omitempty"` - SplitConfig split.Config `mapstructure:"multiline,omitempty"` - TrimConfig trim.Config `mapstructure:",squash"` + MaxLogSize helper.ByteSize `mapstructure:"max_log_size,omitempty"` + ListenAddress string `mapstructure:"listen_address,omitempty"` + TLS *configtls.ServerConfig `mapstructure:"tls,omitempty"` + AddAttributes bool `mapstructure:"add_attributes,omitempty"` + OneLogPerPacket bool `mapstructure:"one_log_per_packet,omitempty"` + Encoding string `mapstructure:"encoding,omitempty"` + SplitConfig split.Config `mapstructure:"multiline,omitempty"` + TrimConfig trim.Config `mapstructure:",squash"` SplitFuncBuilder SplitFuncBuilder } diff --git a/pkg/stanza/operator/input/tcp/tcp_test.go b/pkg/stanza/operator/input/tcp/tcp_test.go index 3bb3c0cbe4be..c08eb4545cfc 100644 --- a/pkg/stanza/operator/input/tcp/tcp_test.go +++ b/pkg/stanza/operator/input/tcp/tcp_test.go @@ -206,8 +206,8 @@ func tlsInputTest(input []byte, expected []string) func(t *testing.T) { cfg := NewConfigWithID("test_id") cfg.ListenAddress = ":0" - cfg.TLS = &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + cfg.TLS = &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "test.crt", KeyFile: "test.key", }, @@ -325,8 +325,8 @@ func TestBuild(t *testing.T) { BaseConfig: BaseConfig{ MaxLogSize: 65536, ListenAddress: "10.0.0.1:9000", - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "/tmp/cert/missing", KeyFile: "/tmp/key/missing", }, diff --git a/pkg/translator/azure/go.mod b/pkg/translator/azure/go.mod index 171095903e2d..515a34fb8dd5 100644 --- a/pkg/translator/azure/go.mod +++ b/pkg/translator/azure/go.mod @@ -7,9 +7,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/relvacode/iso8601 v1.4.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc @@ -30,8 +30,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect diff --git a/pkg/translator/azure/go.sum b/pkg/translator/azure/go.sum index 5a8908bcd191..9290c0fe9705 100644 --- a/pkg/translator/azure/go.sum +++ b/pkg/translator/azure/go.sum @@ -53,16 +53,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index 22a7feae055d..444d917b89aa 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -6,8 +6,8 @@ require ( github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index c537fb728619..a558cdc36791 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -39,10 +39,10 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= diff --git a/pkg/translator/loki/go.mod b/pkg/translator/loki/go.mod index b7bed0870115..c7bb0760d642 100644 --- a/pkg/translator/loki/go.mod +++ b/pkg/translator/loki/go.mod @@ -11,8 +11,8 @@ require ( github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -35,7 +35,7 @@ require ( github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect diff --git a/pkg/translator/loki/go.sum b/pkg/translator/loki/go.sum index c4fd45052aa0..9b5fdb2bc2c1 100644 --- a/pkg/translator/loki/go.sum +++ b/pkg/translator/loki/go.sum @@ -97,12 +97,12 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index 0da96649ed6f..7dacb24a164b 100644 --- a/pkg/translator/opencensus/go.mod +++ b/pkg/translator/opencensus/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 google.golang.org/protobuf v1.33.0 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index f3a71c35a469..3e0d1edc5ead 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -75,10 +75,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= 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= diff --git a/pkg/translator/prometheus/go.mod b/pkg/translator/prometheus/go.mod index 357baa2f47dd..8251da7e878c 100644 --- a/pkg/translator/prometheus/go.mod +++ b/pkg/translator/prometheus/go.mod @@ -5,8 +5,8 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) diff --git a/pkg/translator/prometheus/go.sum b/pkg/translator/prometheus/go.sum index 3db32a9bba15..b868bf5cdbd2 100644 --- a/pkg/translator/prometheus/go.sum +++ b/pkg/translator/prometheus/go.sum @@ -36,10 +36,10 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= diff --git a/pkg/translator/prometheusremotewrite/go.mod b/pkg/translator/prometheusremotewrite/go.mod index 05426bd39b8f..2ef934e9cdbb 100644 --- a/pkg/translator/prometheusremotewrite/go.mod +++ b/pkg/translator/prometheusremotewrite/go.mod @@ -8,8 +8,8 @@ require ( github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -24,7 +24,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.0 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect golang.org/x/net v0.22.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index cb8050bc9786..23f515046564 100644 --- a/pkg/translator/prometheusremotewrite/go.sum +++ b/pkg/translator/prometheusremotewrite/go.sum @@ -43,12 +43,12 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= 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= diff --git a/pkg/translator/signalfx/go.mod b/pkg/translator/signalfx/go.mod index f700b3239051..ae59ea58d3ab 100644 --- a/pkg/translator/signalfx/go.mod +++ b/pkg/translator/signalfx/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum index 63e1a87b9561..8c0ff83d0672 100644 --- a/pkg/translator/signalfx/go.sum +++ b/pkg/translator/signalfx/go.sum @@ -47,8 +47,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= diff --git a/pkg/translator/skywalking/go.mod b/pkg/translator/skywalking/go.mod index 131a89b53d15..dd47394585ae 100644 --- a/pkg/translator/skywalking/go.mod +++ b/pkg/translator/skywalking/go.mod @@ -5,8 +5,8 @@ go 1.21 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 skywalking.apache.org/repo/goapi v0.0.0-20240104145220-ba7202308dd4 ) diff --git a/pkg/translator/skywalking/go.sum b/pkg/translator/skywalking/go.sum index d845337c8a04..c73351642f3d 100644 --- a/pkg/translator/skywalking/go.sum +++ b/pkg/translator/skywalking/go.sum @@ -83,10 +83,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod index f04b3faf84b0..8025d3916f6a 100644 --- a/pkg/translator/zipkin/go.mod +++ b/pkg/translator/zipkin/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index c3b720724cff..d114277c2684 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -41,10 +41,10 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= diff --git a/processor/attributesprocessor/generated_component_test.go b/processor/attributesprocessor/generated_component_test.go index 1bc1c863c777..c387486d4c13 100644 --- a/processor/attributesprocessor/generated_component_test.go +++ b/processor/attributesprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index 8907996ffcdb..4c779384be87 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -8,12 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -50,9 +50,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 6a53fdb7ed30..f84d7d490595 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -82,24 +82,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/cumulativetodeltaprocessor/generated_component_test.go b/processor/cumulativetodeltaprocessor/generated_component_test.go index b96b0fb5bc2c..2aeec505d542 100644 --- a/processor/cumulativetodeltaprocessor/generated_component_test.go +++ b/processor/cumulativetodeltaprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index 403186bc6cd1..b18aff428d6b 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -40,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index d665a63fc0ed..15f6b669c212 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -64,20 +66,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/deltatocumulativeprocessor/generated_component_test.go b/processor/deltatocumulativeprocessor/generated_component_test.go index a71882b6d0ca..b231fe3cb975 100644 --- a/processor/deltatocumulativeprocessor/generated_component_test.go +++ b/processor/deltatocumulativeprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/deltatocumulativeprocessor/go.mod b/processor/deltatocumulativeprocessor/go.mod index cbb70293ad50..4525a9cbca2e 100644 --- a/processor/deltatocumulativeprocessor/go.mod +++ b/processor/deltatocumulativeprocessor/go.mod @@ -5,11 +5,11 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -38,8 +39,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/deltatocumulativeprocessor/go.sum b/processor/deltatocumulativeprocessor/go.sum index 4c10d67d5cfd..4619275d827a 100644 --- a/processor/deltatocumulativeprocessor/go.sum +++ b/processor/deltatocumulativeprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/deltatorateprocessor/generated_component_test.go b/processor/deltatorateprocessor/generated_component_test.go index 7ff3da5a92e9..903565be5c75 100644 --- a/processor/deltatorateprocessor/generated_component_test.go +++ b/processor/deltatorateprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index aa0e46429281..a2ff13b40d1b 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index 4c10d67d5cfd..4619275d827a 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/filterprocessor/generated_component_test.go b/processor/filterprocessor/generated_component_test.go index 3ac5aab6b0cb..855f7e947b12 100644 --- a/processor/filterprocessor/generated_component_test.go +++ b/processor/filterprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index 8a71745cef8b..8c476930dff7 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk/metric v1.24.0 @@ -51,10 +51,10 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index 6a53fdb7ed30..f84d7d490595 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -82,24 +82,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/groupbyattrsprocessor/generated_component_test.go b/processor/groupbyattrsprocessor/generated_component_test.go index 075254f73c76..8c3deeabaf78 100644 --- a/processor/groupbyattrsprocessor/generated_component_test.go +++ b/processor/groupbyattrsprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index db4cec3d44f1..2656c92eafef 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -5,11 +5,11 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk/metric v1.24.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -40,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index 4c10d67d5cfd..4619275d827a 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/groupbytraceprocessor/generated_component_test.go b/processor/groupbytraceprocessor/generated_component_test.go index a0503864b72d..08a8b70f0bf2 100644 --- a/processor/groupbytraceprocessor/generated_component_test.go +++ b/processor/groupbytraceprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index 5e5be95cb080..71230b1c6316 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -39,8 +40,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 44c55c0e2ac6..adcaaae9a56a 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -50,6 +50,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -99,20 +101,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/intervalprocessor/generated_component_test.go b/processor/intervalprocessor/generated_component_test.go index 1bef7864d369..6e4b8a8e33cb 100644 --- a/processor/intervalprocessor/generated_component_test.go +++ b/processor/intervalprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/intervalprocessor/go.mod b/processor/intervalprocessor/go.mod index d7d8697ee859..bee388b3458e 100644 --- a/processor/intervalprocessor/go.mod +++ b/processor/intervalprocessor/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -23,6 +23,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -36,8 +37,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/intervalprocessor/go.sum b/processor/intervalprocessor/go.sum index 4c10d67d5cfd..4619275d827a 100644 --- a/processor/intervalprocessor/go.sum +++ b/processor/intervalprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/k8sattributesprocessor/generated_component_test.go b/processor/k8sattributesprocessor/generated_component_test.go index 90bb8bf0b771..9aa28c6101cf 100644 --- a/processor/k8sattributesprocessor/generated_component_test.go +++ b/processor/k8sattributesprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index ab902bc81900..27dc6a6f665c 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -9,24 +9,24 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -51,7 +51,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.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/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -83,18 +83,18 @@ require ( github.com/rs/cors v1.10.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index eed69a913181..c90656520d93 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -38,7 +38,6 @@ cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMz cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw= cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= -cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o= cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic= cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4= @@ -211,14 +210,10 @@ cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IK cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI= cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU= cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -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= cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY= cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck= cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w= @@ -821,8 +816,6 @@ github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230428030218-4003588d1b74/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -863,8 +856,6 @@ github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6Ni github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs= github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -954,8 +945,9 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -1237,52 +1229,52 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -2076,14 +2068,14 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/processor/logstransformprocessor/generated_component_test.go b/processor/logstransformprocessor/generated_component_test.go index af4b38e3f40e..cfa49c4d827e 100644 --- a/processor/logstransformprocessor/generated_component_test.go +++ b/processor/logstransformprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index 5c34c70f4041..5443fff0df51 100644 --- a/processor/logstransformprocessor/go.mod +++ b/processor/logstransformprocessor/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -30,6 +30,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -48,10 +49,10 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -60,7 +61,7 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum index 0e6da8293557..41ad92bc4e6e 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -26,6 +26,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -79,26 +81,26 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -121,8 +123,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -164,8 +166,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/processor/metricsgenerationprocessor/generated_component_test.go b/processor/metricsgenerationprocessor/generated_component_test.go index bfea4e7ea1e5..39b2fc951be0 100644 --- a/processor/metricsgenerationprocessor/generated_component_test.go +++ b/processor/metricsgenerationprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index 99460ca69725..0a2144f7b856 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index 4c10d67d5cfd..4619275d827a 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/metricstransformprocessor/generated_component_test.go b/processor/metricstransformprocessor/generated_component_test.go index 71fabc61ad2d..534d0c11d2c5 100644 --- a/processor/metricstransformprocessor/generated_component_test.go +++ b/processor/metricstransformprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 53f6a04891e1..9a0312a6453c 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -40,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index 4c10d67d5cfd..4619275d827a 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/probabilisticsamplerprocessor/generated_component_test.go b/processor/probabilisticsamplerprocessor/generated_component_test.go index fe172fcee1c5..3000a9b11cee 100644 --- a/processor/probabilisticsamplerprocessor/generated_component_test.go +++ b/processor/probabilisticsamplerprocessor/generated_component_test.go @@ -64,20 +64,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index d3890beb5053..1e744d247bb9 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -6,14 +6,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -51,26 +51,26 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // 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/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index a3fab1fdc920..6e0a2a346c83 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -107,8 +107,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -133,58 +133,58 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -263,7 +263,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/processor/redactionprocessor/generated_component_test.go b/processor/redactionprocessor/generated_component_test.go index 11fd2369352c..627d42328c05 100644 --- a/processor/redactionprocessor/generated_component_test.go +++ b/processor/redactionprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index 83c040518e2f..32b49abe04ff 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/redactionprocessor/go.sum b/processor/redactionprocessor/go.sum index 4c10d67d5cfd..4619275d827a 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/remotetapprocessor/generated_component_test.go b/processor/remotetapprocessor/generated_component_test.go index bc3c329746b7..513272854940 100644 --- a/processor/remotetapprocessor/generated_component_test.go +++ b/processor/remotetapprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/remotetapprocessor/go.mod b/processor/remotetapprocessor/go.mod index 3ccd2a30c7cd..b05a0a25af66 100644 --- a/processor/remotetapprocessor/go.mod +++ b/processor/remotetapprocessor/go.mod @@ -6,12 +6,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -31,6 +31,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -47,16 +48,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/processor/remotetapprocessor/go.sum b/processor/remotetapprocessor/go.sum index dad370cdeca1..acfc404fea95 100644 --- a/processor/remotetapprocessor/go.sum +++ b/processor/remotetapprocessor/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -74,38 +76,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/processor/resourcedetectionprocessor/config_test.go b/processor/resourcedetectionprocessor/config_test.go index 829e3f6accf9..20ba6b7e7c6d 100644 --- a/processor/resourcedetectionprocessor/config_test.go +++ b/processor/resourcedetectionprocessor/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { openshiftConfig.OpenShiftConfig = openshift.Config{ Address: "127.0.0.1:4444", Token: "some_token", - TLSSettings: configtls.TLSClientSetting{ + TLSSettings: configtls.ClientConfig{ Insecure: true, }, ResourceAttributes: openshift.CreateDefaultConfig().ResourceAttributes, diff --git a/processor/resourcedetectionprocessor/generated_component_test.go b/processor/resourcedetectionprocessor/generated_component_test.go index 197358575f43..915630ecbfb9 100644 --- a/processor/resourcedetectionprocessor/generated_component_test.go +++ b/processor/resourcedetectionprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 278ec6191326..37e8693eaece 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -14,23 +14,23 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.96.0 github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -57,7 +57,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -110,13 +110,13 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -138,7 +138,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index 8b1aa119b0a2..6a238b1e3108 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -172,8 +172,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -466,40 +466,40 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -825,14 +825,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/processor/resourcedetectionprocessor/internal/openshift/config.go b/processor/resourcedetectionprocessor/internal/openshift/config.go index 57e9a0c56b53..408bcc760984 100644 --- a/processor/resourcedetectionprocessor/internal/openshift/config.go +++ b/processor/resourcedetectionprocessor/internal/openshift/config.go @@ -48,7 +48,7 @@ type Config struct { // TLSSettings contains TLS configurations that are specific to client // connection used to communicate with the Openshift API. - TLSSettings configtls.TLSClientSetting `mapstructure:"tls"` + TLSSettings configtls.ClientConfig `mapstructure:"tls"` ResourceAttributes metadata.ResourceAttributesConfig `mapstructure:"resource_attributes"` } diff --git a/processor/resourceprocessor/generated_component_test.go b/processor/resourceprocessor/generated_component_test.go index 8f6f2aa60949..5c851b559f99 100644 --- a/processor/resourceprocessor/generated_component_test.go +++ b/processor/resourceprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 35b220e0ddf2..37d8cdf52c37 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -41,9 +42,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index 2a7dbdf255f6..8d35949eb5e5 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -64,22 +66,22 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/routingprocessor/generated_component_test.go b/processor/routingprocessor/generated_component_test.go index 88328c94844d..6b0a469d4a2d 100644 --- a/processor/routingprocessor/generated_component_test.go +++ b/processor/routingprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index a2df8f162a3f..3fce2f3b5874 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -5,15 +5,15 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 @@ -56,19 +56,19 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 0c0c6c620d65..1185d15de0d9 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -1,7 +1,3 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/alecthomas/assert/v2 v2.3.0 h1:mAsH2wmvjsuvyBvAmCtm7zFsBlb8mIHx5ySLVdDZXL0= github.com/alecthomas/assert/v2 v2.3.0/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6icjJvbsmV8= @@ -14,13 +10,9 @@ github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqy github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= 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/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= 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-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -98,52 +90,52 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 h1:wF6wlGx+CXujq8Lvtnbd03uHO5e3QT2RzownXPTnnnI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:swQIq8hlnQYRr7tiEc4z72PE573mnkiEFGMCdlK+Z2A= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8= @@ -185,8 +177,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -207,8 +197,6 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= diff --git a/processor/schemaprocessor/generated_component_test.go b/processor/schemaprocessor/generated_component_test.go index fe8b6cbf66af..0b78d571418c 100644 --- a/processor/schemaprocessor/generated_component_test.go +++ b/processor/schemaprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index e4f612535595..6d0f221b76d0 100644 --- a/processor/schemaprocessor/go.mod +++ b/processor/schemaprocessor/go.mod @@ -4,12 +4,12 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/schema v0.0.7 go.opentelemetry.io/otel/trace v1.24.0 @@ -30,6 +30,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -46,16 +47,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/processor/schemaprocessor/go.sum b/processor/schemaprocessor/go.sum index 6a36ef06088e..2218336e714b 100644 --- a/processor/schemaprocessor/go.sum +++ b/processor/schemaprocessor/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -74,38 +76,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/processor/spanprocessor/generated_component_test.go b/processor/spanprocessor/generated_component_test.go index 9da09da9c53d..beaf819ccef9 100644 --- a/processor/spanprocessor/generated_component_test.go +++ b/processor/spanprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index fdce3051ca9c..9f2e823714e9 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -8,12 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -48,9 +48,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index b51003851f21..d043ec18b7a3 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -80,24 +80,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/sumologicprocessor/generated_component_test.go b/processor/sumologicprocessor/generated_component_test.go index b5c597d28d04..71ffdc0d85f4 100644 --- a/processor/sumologicprocessor/generated_component_test.go +++ b/processor/sumologicprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/sumologicprocessor/go.mod b/processor/sumologicprocessor/go.mod index e0c9a751be6a..3631ff9bd90f 100644 --- a/processor/sumologicprocessor/go.mod +++ b/processor/sumologicprocessor/go.mod @@ -4,13 +4,13 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -48,28 +48,28 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // 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/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect diff --git a/processor/sumologicprocessor/go.sum b/processor/sumologicprocessor/go.sum index 64e58f46fbe7..5bfc6c9a841d 100644 --- a/processor/sumologicprocessor/go.sum +++ b/processor/sumologicprocessor/go.sum @@ -109,8 +109,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -135,58 +135,58 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -265,7 +265,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/processor/tailsamplingprocessor/generated_component_test.go b/processor/tailsamplingprocessor/generated_component_test.go index 6381259b3ffd..fb5f89f0b1ea 100644 --- a/processor/tailsamplingprocessor/generated_component_test.go +++ b/processor/tailsamplingprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index b7929cc126db..5e5860a9663b 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -50,7 +50,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index 64868b47c416..03d33ece9061 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -118,22 +118,22 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/processor/tailsamplingprocessor/processor.go b/processor/tailsamplingprocessor/processor.go index 9ffcb13846e0..979c790839e3 100644 --- a/processor/tailsamplingprocessor/processor.go +++ b/processor/tailsamplingprocessor/processor.go @@ -77,10 +77,6 @@ const ( // newTracesProcessor returns a processor.TracesProcessor that will perform tail sampling according to the given // configuration. func newTracesProcessor(ctx context.Context, settings component.TelemetrySettings, nextConsumer consumer.Traces, cfg Config) (processor.Traces, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - policyNames := map[string]bool{} policies := make([]*policy, len(cfg.PolicyCfgs)) for i := range cfg.PolicyCfgs { diff --git a/processor/transformprocessor/generated_component_test.go b/processor/transformprocessor/generated_component_test.go index 3a39289897ef..368d432fbd87 100644 --- a/processor/transformprocessor/generated_component_test.go +++ b/processor/transformprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index c1b79f551478..a7431c7e4ae2 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -49,8 +49,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index 676329a65e3d..bb16869a4417 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -78,22 +78,22 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/activedirectorydsreceiver/config.go b/receiver/activedirectorydsreceiver/config.go index 3dd4a6f586bb..929d2168ff88 100644 --- a/receiver/activedirectorydsreceiver/config.go +++ b/receiver/activedirectorydsreceiver/config.go @@ -10,6 +10,6 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/activedirectorydsreceiver/config_test.go b/receiver/activedirectorydsreceiver/config_test.go index 3f615a41cd2a..64d89d264c72 100644 --- a/receiver/activedirectorydsreceiver/config_test.go +++ b/receiver/activedirectorydsreceiver/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, ""), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 2 * time.Minute, InitialDelay: time.Second, }, diff --git a/receiver/activedirectorydsreceiver/factory.go b/receiver/activedirectorydsreceiver/factory.go index eb339448b677..7bcaa740b11e 100644 --- a/receiver/activedirectorydsreceiver/factory.go +++ b/receiver/activedirectorydsreceiver/factory.go @@ -26,10 +26,10 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultCollectionInterval return &Config{ - ScraperControllerSettings: cfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: cfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } diff --git a/receiver/activedirectorydsreceiver/factory_windows.go b/receiver/activedirectorydsreceiver/factory_windows.go index a5e482a9b5e4..bc9f77f9622d 100644 --- a/receiver/activedirectorydsreceiver/factory_windows.go +++ b/receiver/activedirectorydsreceiver/factory_windows.go @@ -43,7 +43,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &c.ScraperControllerSettings, + &c.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index 450071bbab96..f5a3d1eeb9f4 100644 --- a/receiver/activedirectorydsreceiver/go.mod +++ b/receiver/activedirectorydsreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -29,6 +29,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -43,8 +44,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/activedirectorydsreceiver/go.sum b/receiver/activedirectorydsreceiver/go.sum index 7fc3ead3a635..ae323ea7283f 100644 --- a/receiver/activedirectorydsreceiver/go.sum +++ b/receiver/activedirectorydsreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/aerospikereceiver/config.go b/receiver/aerospikereceiver/config.go index 1e8040226f2b..3ebed5363b84 100644 --- a/receiver/aerospikereceiver/config.go +++ b/receiver/aerospikereceiver/config.go @@ -31,15 +31,15 @@ var ( // Config is the receiver configuration type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - Endpoint string `mapstructure:"endpoint"` - TLSName string `mapstructure:"tlsname"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` - CollectClusterMetrics bool `mapstructure:"collect_cluster_metrics"` - Timeout time.Duration `mapstructure:"timeout"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` - TLS *configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + Endpoint string `mapstructure:"endpoint"` + TLSName string `mapstructure:"tlsname"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` + CollectClusterMetrics bool `mapstructure:"collect_cluster_metrics"` + Timeout time.Duration `mapstructure:"timeout"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` + TLS *configtls.ClientConfig `mapstructure:"tls,omitempty"` } // Validate validates the values of the given Config, and returns an error if validation fails diff --git a/receiver/aerospikereceiver/config_test.go b/receiver/aerospikereceiver/config_test.go index 9df9bdb4262b..1a3e3c0e434d 100644 --- a/receiver/aerospikereceiver/config_test.go +++ b/receiver/aerospikereceiver/config_test.go @@ -26,76 +26,76 @@ func TestValidate(t *testing.T) { { name: "blank endpoint", config: &Config{ - Endpoint: "", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyEndpoint, }, { name: "missing port", config: &Config{ - Endpoint: "localhost", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadEndpoint, }, { name: "bad endpoint", config: &Config{ - Endpoint: "x;;ef;s;d:::ss:23423423423423423", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "x;;ef;s;d:::ss:23423423423423423", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadEndpoint, }, { name: "missing host", config: &Config{ - Endpoint: ":3001", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: ":3001", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadEndpoint, }, { name: "negative port", config: &Config{ - Endpoint: "localhost:-2", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:-2", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadPort, }, { name: "bad port", config: &Config{ - Endpoint: "localhost:9999999999999999999", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:9999999999999999999", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadPort, }, { name: "negative timeout", config: &Config{ - Endpoint: "localhost:3000", - Timeout: -1 * time.Second, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:3000", + Timeout: -1 * time.Second, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errNegativeTimeout, }, { name: "password but no username", config: &Config{ - Endpoint: "localhost:3000", - Username: "", - Password: "secret", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:3000", + Username: "", + Password: "secret", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyUsername, }, { name: "username but no password", config: &Config{ - Endpoint: "localhost:3000", - Username: "ro_user", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:3000", + Username: "ro_user", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyPassword, }, @@ -104,13 +104,13 @@ func TestValidate(t *testing.T) { config: &Config{ Endpoint: "localhost:3000", TLSName: "tls1", - TLS: &configtls.TLSClientSetting{ + TLS: &configtls.ClientConfig{ Insecure: false, - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.Config{ CAFile: "BADCAFILE", }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errFailedTLSLoad, }, @@ -119,11 +119,11 @@ func TestValidate(t *testing.T) { config: &Config{ Endpoint: "localhost:3000", TLSName: "", - TLS: &configtls.TLSClientSetting{ + TLS: &configtls.ClientConfig{ Insecure: false, - TLSSetting: configtls.TLSSetting{}, + TLSSetting: configtls.Config{}, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyEndpointTLSName, }, diff --git a/receiver/aerospikereceiver/factory.go b/receiver/aerospikereceiver/factory.go index 63f15633f252..775ee2f8ad18 100644 --- a/receiver/aerospikereceiver/factory.go +++ b/receiver/aerospikereceiver/factory.go @@ -54,17 +54,17 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Endpoint: defaultEndpoint, - Timeout: defaultTimeout, - CollectClusterMetrics: defaultCollectClusterMetrics, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Endpoint: defaultEndpoint, + Timeout: defaultTimeout, + CollectClusterMetrics: defaultCollectClusterMetrics, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index eec4b1d06572..905f7a185170 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -74,16 +74,16 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/aerospikereceiver/go.sum b/receiver/aerospikereceiver/go.sum index c2d5cbbfaa48..f68b0eed891c 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -126,8 +126,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -156,26 +156,26 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRFc9q3yYbBkB6tsm4aCwwQV/j1JQAQ= github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -223,7 +223,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/aerospikereceiver/integration_test.go b/receiver/aerospikereceiver/integration_test.go index bbdce7ed4138..40e5f2013888 100644 --- a/receiver/aerospikereceiver/integration_test.go +++ b/receiver/aerospikereceiver/integration_test.go @@ -57,7 +57,7 @@ func integrationTest(cfgMod func(*Config)) func(*testing.T) { func(t *testing.T, cfg component.Config, ci *scraperinttest.ContainerInfo) { rCfg := cfg.(*Config) rCfg.Endpoint = fmt.Sprintf("%s:%s", ci.Host(t), ci.MappedPort(t, aerospikePort)) - rCfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + rCfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond cfgMod(rCfg) }), scraperinttest.WithCompareOptions( diff --git a/receiver/apachereceiver/config.go b/receiver/apachereceiver/config.go index b78ca79afdce..98c507513fd2 100644 --- a/receiver/apachereceiver/config.go +++ b/receiver/apachereceiver/config.go @@ -14,9 +14,9 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` } var ( diff --git a/receiver/apachereceiver/factory.go b/receiver/apachereceiver/factory.go index ab17714fd2b1..f043a66c0c20 100644 --- a/receiver/apachereceiver/factory.go +++ b/receiver/apachereceiver/factory.go @@ -31,11 +31,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, @@ -80,7 +80,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/apachereceiver/factory_test.go b/receiver/apachereceiver/factory_test.go index 05437004d6f4..9998bfb9e072 100644 --- a/receiver/apachereceiver/factory_test.go +++ b/receiver/apachereceiver/factory_test.go @@ -34,7 +34,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, }, }, diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index 8e2e67c7056d..6d5633517282 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -76,21 +76,21 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index 5063d8da04f2..4f86baf4e026 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -124,8 +124,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -150,40 +150,40 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -233,7 +233,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/apachereceiver/integration_test.go b/receiver/apachereceiver/integration_test.go index c4384776e393..ff7666ebbc3d 100644 --- a/receiver/apachereceiver/integration_test.go +++ b/receiver/apachereceiver/integration_test.go @@ -42,7 +42,7 @@ func TestIntegration(t *testing.T) { scraperinttest.WithCustomConfig( func(t *testing.T, cfg component.Config, ci *scraperinttest.ContainerInfo) { rCfg := cfg.(*Config) - rCfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + rCfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond rCfg.Endpoint = fmt.Sprintf("http://%s:%s/server-status?auto", ci.Host(t), ci.MappedPort(t, apachePort)) }), scraperinttest.WithCompareOptions( diff --git a/receiver/apachereceiver/scraper_test.go b/receiver/apachereceiver/scraper_test.go index ab17716b64f5..0a021c473c02 100644 --- a/receiver/apachereceiver/scraper_test.go +++ b/receiver/apachereceiver/scraper_test.go @@ -58,8 +58,8 @@ func TestScraperFailedStart(t *testing.T) { sc := newApacheScraper(receivertest.NewNopCreateSettings(), &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:8080", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/receiver/apachesparkreceiver/config.go b/receiver/apachesparkreceiver/config.go index d9a44689237c..7b89ef0724c8 100644 --- a/receiver/apachesparkreceiver/config.go +++ b/receiver/apachesparkreceiver/config.go @@ -25,10 +25,10 @@ var ( // Config defines the configuration for the various elements of the receiver agent. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - ApplicationNames []string `mapstructure:"application_names"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + ApplicationNames []string `mapstructure:"application_names"` } // Validate validates missing and invalid configuration fields. diff --git a/receiver/apachesparkreceiver/config_test.go b/receiver/apachesparkreceiver/config_test.go index 2e43e5a5c551..ec4af2033d67 100644 --- a/receiver/apachesparkreceiver/config_test.go +++ b/receiver/apachesparkreceiver/config_test.go @@ -9,8 +9,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/receiver/scraperhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachesparkreceiver/internal/metadata" ) func TestValidate(t *testing.T) { @@ -22,7 +20,7 @@ func TestValidate(t *testing.T) { { desc: "default config", cfg: &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: nil, }, @@ -32,7 +30,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errInvalidEndpoint, }, diff --git a/receiver/apachesparkreceiver/factory.go b/receiver/apachesparkreceiver/factory.go index 1568c270993b..da8aa14e13b3 100644 --- a/receiver/apachesparkreceiver/factory.go +++ b/receiver/apachesparkreceiver/factory.go @@ -28,11 +28,11 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates a config for Spark with as many default values as possible func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultCollectionInterval return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, @@ -59,6 +59,6 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&sparkConfig.ScraperControllerSettings, params, + return scraperhelper.NewScraperControllerReceiver(&sparkConfig.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/apachesparkreceiver/factory_test.go b/receiver/apachesparkreceiver/factory_test.go index 82e89ec4b639..11f9b775c6c7 100644 --- a/receiver/apachesparkreceiver/factory_test.go +++ b/receiver/apachesparkreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: defaultCollectionInterval, InitialDelay: time.Second, }, diff --git a/receiver/apachesparkreceiver/go.mod b/receiver/apachesparkreceiver/go.mod index 286a9ee1ad8a..29c7fbf3d289 100644 --- a/receiver/apachesparkreceiver/go.mod +++ b/receiver/apachesparkreceiver/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -75,23 +75,23 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/apachesparkreceiver/go.sum b/receiver/apachesparkreceiver/go.sum index 651deb8d4590..8670b95423e1 100644 --- a/receiver/apachesparkreceiver/go.sum +++ b/receiver/apachesparkreceiver/go.sum @@ -124,8 +124,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -152,40 +152,40 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -235,7 +235,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/apachesparkreceiver/integration_test.go b/receiver/apachesparkreceiver/integration_test.go index b7eb7d19c771..eb567b2dc769 100644 --- a/receiver/apachesparkreceiver/integration_test.go +++ b/receiver/apachesparkreceiver/integration_test.go @@ -36,7 +36,7 @@ func TestIntegration(t *testing.T) { scraperinttest.WithCustomConfig( func(t *testing.T, cfg component.Config, ci *scraperinttest.ContainerInfo) { rCfg := cfg.(*Config) - rCfg.ScraperControllerSettings.CollectionInterval = 3 * time.Second + rCfg.ControllerConfig.CollectionInterval = 3 * time.Second rCfg.Endpoint = fmt.Sprintf("http://%s:%s", ci.Host(t), ci.MappedPort(t, sparkPort)) }), scraperinttest.WithCompareOptions( diff --git a/receiver/apachesparkreceiver/scraper_test.go b/receiver/apachesparkreceiver/scraper_test.go index 45cc574bb5b7..c01b93bfb4f5 100644 --- a/receiver/apachesparkreceiver/scraper_test.go +++ b/receiver/apachesparkreceiver/scraper_test.go @@ -65,7 +65,7 @@ func TestScraper(t *testing.T) { expectedMetricGen: func(*testing.T) pmetric.Metrics { return pmetric.NewMetrics() }, - config: &Config{ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + config: &Config{ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: defaultCollectionInterval, }, ApplicationNames: []string{"local-123", "local-987"}, @@ -212,7 +212,7 @@ func TestScraper(t *testing.T) { require.NoError(t, err) return expectedMetrics }, - config: &Config{ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + config: &Config{ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: defaultCollectionInterval, }, ApplicationNames: []string{"streaming-example"}, diff --git a/receiver/awscloudwatchmetricsreceiver/go.mod b/receiver/awscloudwatchmetricsreceiver/go.mod index 0e9c99d6f9be..3f9d1ce16902 100644 --- a/receiver/awscloudwatchmetricsreceiver/go.mod +++ b/receiver/awscloudwatchmetricsreceiver/go.mod @@ -4,10 +4,10 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -23,6 +23,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -36,8 +37,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/awscloudwatchmetricsreceiver/go.sum b/receiver/awscloudwatchmetricsreceiver/go.sum index 1c687501ccad..56cb9569b01c 100644 --- a/receiver/awscloudwatchmetricsreceiver/go.sum +++ b/receiver/awscloudwatchmetricsreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -64,18 +66,18 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.96.0 h1:qXA3biNps8LPYYCTJwepGu58sW0XInmwnQbkkWZchIg= go.opentelemetry.io/collector v0.96.0/go.mod h1:/i3zyRg23r7vloTLzKG/mRI2VkEt1Q4ARXbe3vKnAaE= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/awscloudwatchreceiver/go.mod b/receiver/awscloudwatchreceiver/go.mod index e26f0d6e6bd5..746974520f60 100644 --- a/receiver/awscloudwatchreceiver/go.mod +++ b/receiver/awscloudwatchreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -43,7 +44,7 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/awscloudwatchreceiver/go.sum b/receiver/awscloudwatchreceiver/go.sum index 22853a1fa102..495be1090e51 100644 --- a/receiver/awscloudwatchreceiver/go.sum +++ b/receiver/awscloudwatchreceiver/go.sum @@ -23,6 +23,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= @@ -72,18 +74,18 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.96.0 h1:qXA3biNps8LPYYCTJwepGu58sW0XInmwnQbkkWZchIg= go.opentelemetry.io/collector v0.96.0/go.mod h1:/i3zyRg23r7vloTLzKG/mRI2VkEt1Q4ARXbe3vKnAaE= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index 0f140cc1e829..a1cb10591bf4 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -13,19 +13,19 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.96.0 github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 k8s.io/klog/v2 v2.120.1 ) @@ -62,7 +62,7 @@ require ( github.com/godbus/dbus/v5 v5.0.6 // 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/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -115,16 +115,16 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 // indirect github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 741d53df958d..5dc7a3af0ad8 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -160,8 +160,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -384,38 +384,38 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -719,14 +719,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/receiver/awscontainerinsightreceiver/receiver.go b/receiver/awscontainerinsightreceiver/receiver.go index d192977a1341..518214fb1c62 100644 --- a/receiver/awscontainerinsightreceiver/receiver.go +++ b/receiver/awscontainerinsightreceiver/receiver.go @@ -44,9 +44,6 @@ func newAWSContainerInsightReceiver( settings component.TelemetrySettings, config *Config, nextConsumer consumer.Metrics) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } r := &awsContainerInsightReceiver{ settings: settings, diff --git a/receiver/awscontainerinsightreceiver/receiver_test.go b/receiver/awscontainerinsightreceiver/receiver_test.go index abe070785c74..f6b8ee900330 100644 --- a/receiver/awscontainerinsightreceiver/receiver_test.go +++ b/receiver/awscontainerinsightreceiver/receiver_test.go @@ -63,18 +63,6 @@ func TestReceiver(t *testing.T) { require.NoError(t, err) } -func TestReceiverForNilConsumer(t *testing.T) { - cfg := createDefaultConfig().(*Config) - metricsReceiver, err := newAWSContainerInsightReceiver( - componenttest.NewNopTelemetrySettings(), - cfg, - nil, - ) - - require.Error(t, err) - require.Nil(t, metricsReceiver) -} - func TestCollectData(t *testing.T) { cfg := createDefaultConfig().(*Config) metricsReceiver, err := newAWSContainerInsightReceiver( diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index 2216a1587933..98a3710a6c48 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -32,6 +32,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -48,16 +49,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index 2a8b4dd93aae..35a2a58013ee 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -29,6 +29,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -78,40 +80,40 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/awsecscontainermetricsreceiver/receiver.go b/receiver/awsecscontainermetricsreceiver/receiver.go index 3004c7cda24a..d4972aac39f0 100644 --- a/receiver/awsecscontainermetricsreceiver/receiver.go +++ b/receiver/awsecscontainermetricsreceiver/receiver.go @@ -34,10 +34,6 @@ func newAWSECSContainermetrics( config *Config, nextConsumer consumer.Metrics, rest ecsutil.RestClient) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - r := &awsEcsContainerMetricsReceiver{ logger: logger, nextConsumer: nextConsumer, diff --git a/receiver/awsecscontainermetricsreceiver/receiver_test.go b/receiver/awsecscontainermetricsreceiver/receiver_test.go index 88bc97f13a3b..ecfcf88cd218 100644 --- a/receiver/awsecscontainermetricsreceiver/receiver_test.go +++ b/receiver/awsecscontainermetricsreceiver/receiver_test.go @@ -53,19 +53,6 @@ func TestReceiver(t *testing.T) { require.NoError(t, err) } -func TestReceiverForNilConsumer(t *testing.T) { - cfg := createDefaultConfig().(*Config) - metricsReceiver, err := newAWSECSContainermetrics( - zap.NewNop(), - cfg, - nil, - &fakeRestClient{}, - ) - - require.Error(t, err) - require.Nil(t, metricsReceiver) -} - func TestCollectDataFromEndpoint(t *testing.T) { cfg := createDefaultConfig().(*Config) metricsReceiver, err := newAWSECSContainermetrics( diff --git a/receiver/awsfirehosereceiver/config_test.go b/receiver/awsfirehosereceiver/config_test.go index 2963f517bc16..951330deb349 100644 --- a/receiver/awsfirehosereceiver/config_test.go +++ b/receiver/awsfirehosereceiver/config_test.go @@ -35,8 +35,8 @@ func TestLoadConfig(t *testing.T) { AccessKey: "some_access_key", ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:4433", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "server.crt", KeyFile: "server.key", }, diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index bed9728a0c04..2977130348ae 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -5,15 +5,15 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -32,6 +32,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -48,14 +49,14 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index 06ef8dcc4ec8..db13425c7c66 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -74,40 +76,40 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/awsfirehosereceiver/metrics_receiver.go b/receiver/awsfirehosereceiver/metrics_receiver.go index ccbe318014b6..dc3b6cca2fa1 100644 --- a/receiver/awsfirehosereceiver/metrics_receiver.go +++ b/receiver/awsfirehosereceiver/metrics_receiver.go @@ -7,7 +7,6 @@ import ( "context" "net/http" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" @@ -35,9 +34,6 @@ func newMetricsReceiver( unmarshalers map[string]unmarshaler.MetricsUnmarshaler, nextConsumer consumer.Metrics, ) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } configuredUnmarshaler := unmarshalers[config.RecordType] if configuredUnmarshaler == nil { diff --git a/receiver/awsxrayreceiver/config_test.go b/receiver/awsxrayreceiver/config_test.go index d1de6d0672c0..caef308eef43 100644 --- a/receiver/awsxrayreceiver/config_test.go +++ b/receiver/awsxrayreceiver/config_test.go @@ -37,14 +37,14 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "0.0.0.0:5678", - Transport: "udp", + Transport: confignet.TransportTypeUDP, }, ProxyServer: &proxy.Config{ TCPAddrConfig: confignet.TCPAddrConfig{ Endpoint: "0.0.0.0:2000", }, ProxyAddress: "", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, ServerName: "", }, @@ -60,14 +60,14 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "0.0.0.0:2000", - Transport: "udp", + Transport: confignet.TransportTypeUDP, }, ProxyServer: &proxy.Config{ TCPAddrConfig: confignet.TCPAddrConfig{ Endpoint: "0.0.0.0:1234", }, ProxyAddress: "https://proxy.proxy.com", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, ServerName: "something", }, diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 3a269aa9168b..980584a6863e 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -12,14 +12,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -53,10 +53,10 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index 067eb496fb4e..ad944728c70a 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -76,30 +76,30 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/awsxrayreceiver/receiver.go b/receiver/awsxrayreceiver/receiver.go index 887ba542adbe..6b29dc2b6846 100644 --- a/receiver/awsxrayreceiver/receiver.go +++ b/receiver/awsxrayreceiver/receiver.go @@ -42,14 +42,10 @@ func newReceiver(config *Config, consumer consumer.Traces, set receiver.CreateSettings) (receiver.Traces, error) { - if consumer == nil { - return nil, component.ErrNilNextConsumer - } - set.Logger.Info("Going to listen on endpoint for X-Ray segments", zap.String(udppoller.Transport, config.Endpoint)) poller, err := udppoller.New(&udppoller.Config{ - Transport: config.Transport, + Transport: string(config.Transport), Endpoint: config.Endpoint, NumOfPollerToStart: maxPollerCount, }, set) diff --git a/receiver/awsxrayreceiver/receiver_test.go b/receiver/awsxrayreceiver/receiver_test.go index afa31c112092..1cd5a8a38d16 100644 --- a/receiver/awsxrayreceiver/receiver_test.go +++ b/receiver/awsxrayreceiver/receiver_test.go @@ -67,7 +67,7 @@ func TestPollerCreationFailed(t *testing.T) { &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "dontCare", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, sink, diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index 78c5def79358..6103c6c470af 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -67,7 +67,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.6.0 // indirect github.com/spf13/cobra v1.8.0 // indirect @@ -75,23 +75,23 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect diff --git a/receiver/azureblobreceiver/go.sum b/receiver/azureblobreceiver/go.sum index 4fbc7ebeecc5..448f424602f9 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -179,8 +179,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -210,58 +210,58 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -350,7 +350,7 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index 7005fde5006d..b65a911f6ad4 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -11,14 +11,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.96.0 github.com/relvacode/iso8601 v1.4.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -72,28 +72,28 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // 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 + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -115,7 +115,7 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index 7b320b19f4a0..520d5a86cb58 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -165,8 +165,8 @@ github.com/relvacode/iso8601 v1.4.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -199,58 +199,58 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr 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= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -343,7 +343,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -368,8 +368,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= 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/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/receiver/azuremonitorreceiver/config.go b/receiver/azuremonitorreceiver/config.go index 5037a08d9b29..743fa94f5bb7 100644 --- a/receiver/azuremonitorreceiver/config.go +++ b/receiver/azuremonitorreceiver/config.go @@ -229,21 +229,21 @@ var ( // Config defines the configuration for the various elements of the receiver agent. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` - Cloud string `mapstructure:"cloud"` - SubscriptionID string `mapstructure:"subscription_id"` - Authentication string `mapstructure:"auth"` - TenantID string `mapstructure:"tenant_id"` - ClientID string `mapstructure:"client_id"` - ClientSecret string `mapstructure:"client_secret"` - FederatedTokenFile string `mapstructure:"federated_token_file"` - ResourceGroups []string `mapstructure:"resource_groups"` - Services []string `mapstructure:"services"` - CacheResources float64 `mapstructure:"cache_resources"` - CacheResourcesDefinitions float64 `mapstructure:"cache_resources_definitions"` - MaximumNumberOfMetricsInACall int `mapstructure:"maximum_number_of_metrics_in_a_call"` - AppendTagsAsAttributes bool `mapstructure:"append_tags_as_attributes"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` + Cloud string `mapstructure:"cloud"` + SubscriptionID string `mapstructure:"subscription_id"` + Authentication string `mapstructure:"auth"` + TenantID string `mapstructure:"tenant_id"` + ClientID string `mapstructure:"client_id"` + ClientSecret string `mapstructure:"client_secret"` + FederatedTokenFile string `mapstructure:"federated_token_file"` + ResourceGroups []string `mapstructure:"resource_groups"` + Services []string `mapstructure:"services"` + CacheResources float64 `mapstructure:"cache_resources"` + CacheResourcesDefinitions float64 `mapstructure:"cache_resources_definitions"` + MaximumNumberOfMetricsInACall int `mapstructure:"maximum_number_of_metrics_in_a_call"` + AppendTagsAsAttributes bool `mapstructure:"append_tags_as_attributes"` } const ( diff --git a/receiver/azuremonitorreceiver/factory.go b/receiver/azuremonitorreceiver/factory.go index 96800cbea13c..d4da332dba8f 100644 --- a/receiver/azuremonitorreceiver/factory.go +++ b/receiver/azuremonitorreceiver/factory.go @@ -32,11 +32,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultCollectionInterval return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), CacheResources: 24 * 60 * 60, CacheResourcesDefinitions: 24 * 60 * 60, @@ -59,5 +59,5 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/azuremonitorreceiver/factory_test.go b/receiver/azuremonitorreceiver/factory_test.go index 6210a428c8bc..80a4134f0a65 100644 --- a/receiver/azuremonitorreceiver/factory_test.go +++ b/receiver/azuremonitorreceiver/factory_test.go @@ -35,7 +35,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/azuremonitorreceiver/go.mod b/receiver/azuremonitorreceiver/go.mod index 903cc5145501..8e8105ecb2fd 100644 --- a/receiver/azuremonitorreceiver/go.mod +++ b/receiver/azuremonitorreceiver/go.mod @@ -11,11 +11,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -52,8 +52,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/azuremonitorreceiver/go.sum b/receiver/azuremonitorreceiver/go.sum index 77141c59b5cf..e43f07a6d21f 100644 --- a/receiver/azuremonitorreceiver/go.sum +++ b/receiver/azuremonitorreceiver/go.sum @@ -88,20 +88,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/azuremonitorreceiver/scraper_test.go b/receiver/azuremonitorreceiver/scraper_test.go index 200f3001e6b5..794a4d5e1fc2 100644 --- a/receiver/azuremonitorreceiver/scraper_test.go +++ b/receiver/azuremonitorreceiver/scraper_test.go @@ -85,7 +85,7 @@ func TestAzureScraperStart(t *testing.T) { name: "service_principal", testFunc: func(t *testing.T) { customCfg := &Config{ - ScraperControllerSettings: cfg.ScraperControllerSettings, + ControllerConfig: cfg.ControllerConfig, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), CacheResources: 24 * 60 * 60, CacheResourcesDefinitions: 24 * 60 * 60, @@ -113,7 +113,7 @@ func TestAzureScraperStart(t *testing.T) { name: "workload_identity", testFunc: func(t *testing.T) { customCfg := &Config{ - ScraperControllerSettings: cfg.ScraperControllerSettings, + ControllerConfig: cfg.ControllerConfig, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), CacheResources: 24 * 60 * 60, CacheResourcesDefinitions: 24 * 60 * 60, diff --git a/receiver/bigipreceiver/client_test.go b/receiver/bigipreceiver/client_test.go index 21a117de939a..74ddbe971dfd 100644 --- a/receiver/bigipreceiver/client_test.go +++ b/receiver/bigipreceiver/client_test.go @@ -50,8 +50,8 @@ func TestNewClient(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -66,7 +66,7 @@ func TestNewClient(t *testing.T) { desc: "Valid Configuration", cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/bigipreceiver/config.go b/receiver/bigipreceiver/config.go index 5e66b666b5e7..8b3617c9d5c2 100644 --- a/receiver/bigipreceiver/config.go +++ b/receiver/bigipreceiver/config.go @@ -27,11 +27,11 @@ const defaultEndpoint = "https://localhost:443" // Config defines the configuration for the various elements of the receiver agent. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } // Validate validates the configuration by checking for missing or invalid fields diff --git a/receiver/bigipreceiver/config_test.go b/receiver/bigipreceiver/config_test.go index 83f35267e831..7b175fb67d2b 100644 --- a/receiver/bigipreceiver/config_test.go +++ b/receiver/bigipreceiver/config_test.go @@ -34,7 +34,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingUsername, @@ -48,7 +48,7 @@ func TestValidate(t *testing.T) { Username: "otelu", ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", - }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + }, ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingPassword, @@ -62,7 +62,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingUsername, @@ -77,7 +77,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`), @@ -91,7 +91,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: nil, }, diff --git a/receiver/bigipreceiver/factory.go b/receiver/bigipreceiver/factory.go index 5ab5837425bf..3beeba20de2d 100644 --- a/receiver/bigipreceiver/factory.go +++ b/receiver/bigipreceiver/factory.go @@ -30,7 +30,7 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates a config for Big-IP with as many default values as possible func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, }, ClientConfig: confighttp.ClientConfig{ @@ -54,5 +54,5 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/bigipreceiver/factory_test.go b/receiver/bigipreceiver/factory_test.go index 6286f39232e3..5c338b077a53 100644 --- a/receiver/bigipreceiver/factory_test.go +++ b/receiver/bigipreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, }, ClientConfig: confighttp.ClientConfig{ diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index 295e5dc0c203..187330b4bbb0 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -8,14 +8,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -77,22 +77,22 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/testcontainers/testcontainers-go v0.27.0 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/bigipreceiver/go.sum b/receiver/bigipreceiver/go.sum index 651deb8d4590..8670b95423e1 100644 --- a/receiver/bigipreceiver/go.sum +++ b/receiver/bigipreceiver/go.sum @@ -124,8 +124,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -152,40 +152,40 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -235,7 +235,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/bigipreceiver/scraper_test.go b/receiver/bigipreceiver/scraper_test.go index 066a289c19be..37f3c3f171d7 100644 --- a/receiver/bigipreceiver/scraper_test.go +++ b/receiver/bigipreceiver/scraper_test.go @@ -38,8 +38,8 @@ func TestScraperStart(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -54,7 +54,7 @@ func TestScraperStart(t *testing.T) { scraper: &bigipScraper{ cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/carbonreceiver/config_test.go b/receiver/carbonreceiver/config_test.go index f0d02afa21aa..0bad1d073655 100644 --- a/receiver/carbonreceiver/config_test.go +++ b/receiver/carbonreceiver/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:8080", - Transport: "udp", + Transport: confignet.TransportTypeUDP, }, TCPIdleTimeout: 5 * time.Second, Parser: &protocol.Config{ @@ -51,7 +51,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:2003", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, TCPIdleTimeout: 30 * time.Second, Parser: &protocol.Config{ @@ -97,7 +97,7 @@ func TestConfigValidate(t *testing.T) { cfg := &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:2003", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, TCPIdleTimeout: -1 * time.Second, Parser: &protocol.Config{ diff --git a/receiver/carbonreceiver/factory.go b/receiver/carbonreceiver/factory.go index f50d438b296b..45bab1161df5 100644 --- a/receiver/carbonreceiver/factory.go +++ b/receiver/carbonreceiver/factory.go @@ -35,7 +35,7 @@ func createDefaultConfig() component.Config { return &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:2003", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, TCPIdleTimeout: tcpIdleTimeoutDefault, Parser: &protocol.Config{ diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index 4337c644cf16..9cf33ebe0df7 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -5,12 +5,12 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -41,9 +42,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index ff82d113c07b..bc1b949d29a5 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -64,24 +66,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/carbonreceiver/receiver.go b/receiver/carbonreceiver/receiver.go index a75153d351f3..f9b4ade581e2 100644 --- a/receiver/carbonreceiver/receiver.go +++ b/receiver/carbonreceiver/receiver.go @@ -42,10 +42,6 @@ func newMetricsReceiver( nextConsumer consumer.Metrics, ) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - if config.Endpoint == "" { return nil, errEmptyEndpoint } @@ -80,14 +76,14 @@ func newMetricsReceiver( } func buildTransportServer(config Config) (transport.Server, error) { - switch strings.ToLower(config.Transport) { + switch strings.ToLower(string(config.Transport)) { case "", "tcp": return transport.NewTCPServer(config.Endpoint, config.TCPIdleTimeout) case "udp": return transport.NewUDPServer(config.Endpoint) } - return nil, fmt.Errorf("unsupported transport %q", config.Transport) + return nil, fmt.Errorf("unsupported transport %q", string(config.Transport)) } // Start tells the receiver to start its processing. diff --git a/receiver/carbonreceiver/receiver_test.go b/receiver/carbonreceiver/receiver_test.go index 8697b4f5c109..0a4ccf5cbfac 100644 --- a/receiver/carbonreceiver/receiver_test.go +++ b/receiver/carbonreceiver/receiver_test.go @@ -70,7 +70,7 @@ func Test_carbonreceiver_New(t *testing.T) { config: Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:2003", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, Parser: &protocol.Config{ Type: "regex", @@ -173,7 +173,7 @@ func Test_carbonreceiver_EndToEnd(t *testing.T) { name: "default_config_udp", configFn: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.Transport = "udp" + cfg.Transport = confignet.TransportTypeUDP return cfg }, clientFn: func(t *testing.T) func(client.Metric) error { diff --git a/receiver/chronyreceiver/config.go b/receiver/chronyreceiver/config.go index e1d27c799f2a..0782c55526c3 100644 --- a/receiver/chronyreceiver/config.go +++ b/receiver/chronyreceiver/config.go @@ -16,8 +16,8 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` // Endpoint is the published address or unix socket // that allows clients to connect to: // The allowed format is: @@ -35,11 +35,11 @@ var ( ) func newDefaultCongfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.Timeout = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: cfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), Endpoint: "unix:///var/run/chrony/chronyd.sock", } diff --git a/receiver/chronyreceiver/config_test.go b/receiver/chronyreceiver/config_test.go index 0a8a476af87e..65e5d91b3438 100644 --- a/receiver/chronyreceiver/config_test.go +++ b/receiver/chronyreceiver/config_test.go @@ -33,13 +33,13 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - scs := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scs := scraperhelper.NewDefaultControllerConfig() scs.Timeout = 10 * time.Second assert.Equal(t, &Config{ - ScraperControllerSettings: scs, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - Endpoint: "udp://localhost:3030", + ControllerConfig: scs, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + Endpoint: "udp://localhost:3030", }, cfg) } @@ -55,7 +55,7 @@ func TestValidate(t *testing.T) { scenario: "Valid udp configuration", conf: Config{ Endpoint: "udp://localhost:323", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: time.Minute, InitialDelay: time.Second, Timeout: 10 * time.Second, @@ -67,7 +67,7 @@ func TestValidate(t *testing.T) { scenario: "Invalid udp hostname", conf: Config{ Endpoint: "udp://:323", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: time.Minute, InitialDelay: time.Second, Timeout: 10 * time.Second, @@ -79,7 +79,7 @@ func TestValidate(t *testing.T) { scenario: "Invalid udp port", conf: Config{ Endpoint: "udp://localhost", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: time.Minute, InitialDelay: time.Second, Timeout: 10 * time.Second, @@ -91,7 +91,7 @@ func TestValidate(t *testing.T) { scenario: "Valid unix path", conf: Config{ Endpoint: fmt.Sprintf("unix://%s", t.TempDir()), - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: time.Minute, InitialDelay: time.Second, Timeout: 10 * time.Second, @@ -103,7 +103,7 @@ func TestValidate(t *testing.T) { scenario: "Invalid unix path", conf: Config{ Endpoint: "unix:///no/dir/to/socket", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: time.Minute, InitialDelay: time.Second, Timeout: 10 * time.Second, @@ -115,7 +115,7 @@ func TestValidate(t *testing.T) { scenario: "Invalid timeout set", conf: Config{ Endpoint: "unix://no/dir/to/socket", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: time.Minute, InitialDelay: time.Second, Timeout: 0, diff --git a/receiver/chronyreceiver/factory.go b/receiver/chronyreceiver/factory.go index 3ca0008dab82..fda31095d64a 100644 --- a/receiver/chronyreceiver/factory.go +++ b/receiver/chronyreceiver/factory.go @@ -49,7 +49,7 @@ func newMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, + &cfg.ControllerConfig, set, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/chronyreceiver/factory_test.go b/receiver/chronyreceiver/factory_test.go index 50e7dc4b82c8..9c95a21d0b4f 100644 --- a/receiver/chronyreceiver/factory_test.go +++ b/receiver/chronyreceiver/factory_test.go @@ -48,7 +48,7 @@ func TestCreatingMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 30 * time.Second, Timeout: 10 * time.Second, }, diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index 2a94bb86e373..6f9fcba09255 100644 --- a/receiver/chronyreceiver/go.mod +++ b/receiver/chronyreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.9.0 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,6 +28,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -43,8 +44,8 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/chronyreceiver/go.sum b/receiver/chronyreceiver/go.sum index a43ea1e405d1..54efe436eecb 100644 --- a/receiver/chronyreceiver/go.sum +++ b/receiver/chronyreceiver/go.sum @@ -23,6 +23,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -71,20 +73,20 @@ github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/cloudflarereceiver/config.go b/receiver/cloudflarereceiver/config.go index a532da47419c..59ef966c0d75 100644 --- a/receiver/cloudflarereceiver/config.go +++ b/receiver/cloudflarereceiver/config.go @@ -18,11 +18,11 @@ type Config struct { } type LogsConfig struct { - Secret string `mapstructure:"secret"` - Endpoint string `mapstructure:"endpoint"` - TLS *configtls.TLSServerSetting `mapstructure:"tls"` - Attributes map[string]string `mapstructure:"attributes"` - TimestampField string `mapstructure:"timestamp_field"` + Secret string `mapstructure:"secret"` + Endpoint string `mapstructure:"endpoint"` + TLS *configtls.ServerConfig `mapstructure:"tls"` + Attributes map[string]string `mapstructure:"attributes"` + TimestampField string `mapstructure:"timestamp_field"` } var ( diff --git a/receiver/cloudflarereceiver/config_test.go b/receiver/cloudflarereceiver/config_test.go index b5335f7181fa..e541cf92db01 100644 --- a/receiver/cloudflarereceiver/config_test.go +++ b/receiver/cloudflarereceiver/config_test.go @@ -34,8 +34,8 @@ func TestValidate(t *testing.T) { config: Config{ Logs: LogsConfig{ Endpoint: "0.0.0.0:9999", - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "some_cert_file", KeyFile: "some_key_file", }, @@ -64,8 +64,8 @@ func TestValidate(t *testing.T) { config: Config{ Logs: LogsConfig{ Endpoint: "0.0.0.0:9999", - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "some_cert_file", }, }, @@ -78,8 +78,8 @@ func TestValidate(t *testing.T) { config: Config{ Logs: LogsConfig{ Endpoint: "0.0.0.0:9999", - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ KeyFile: "some_key_file", }, }, @@ -114,8 +114,8 @@ func TestLoadConfig(t *testing.T) { expectedConfig: &Config{ Logs: LogsConfig{ Endpoint: "0.0.0.0:12345", - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "some_cert_file", KeyFile: "some_key_file", }, diff --git a/receiver/cloudflarereceiver/go.mod b/receiver/cloudflarereceiver/go.mod index e166f875c047..2aeb2098d753 100644 --- a/receiver/cloudflarereceiver/go.mod +++ b/receiver/cloudflarereceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -30,6 +30,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -45,9 +46,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/cloudflarereceiver/go.sum b/receiver/cloudflarereceiver/go.sum index 8a366fe39ae5..d1a14d9f6e51 100644 --- a/receiver/cloudflarereceiver/go.sum +++ b/receiver/cloudflarereceiver/go.sum @@ -23,6 +23,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -68,24 +70,24 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.96.0 h1:qXA3biNps8LPYYCTJwepGu58sW0XInmwnQbkkWZchIg= go.opentelemetry.io/collector v0.96.0/go.mod h1:/i3zyRg23r7vloTLzKG/mRI2VkEt1Q4ARXbe3vKnAaE= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/cloudflarereceiver/logs_integration_test.go b/receiver/cloudflarereceiver/logs_integration_test.go index bf95f031f4fd..6a16bf2b3afd 100644 --- a/receiver/cloudflarereceiver/logs_integration_test.go +++ b/receiver/cloudflarereceiver/logs_integration_test.go @@ -56,8 +56,8 @@ func TestReceiverTLS(t *testing.T) { Logs: LogsConfig{ Secret: testSecret, Endpoint: testAddr, - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: filepath.Join("testdata", "cert", "server.crt"), KeyFile: filepath.Join("testdata", "cert", "server.key"), }, diff --git a/receiver/cloudflarereceiver/logs_test.go b/receiver/cloudflarereceiver/logs_test.go index 6a0ac738da63..9df7c91376bd 100644 --- a/receiver/cloudflarereceiver/logs_test.go +++ b/receiver/cloudflarereceiver/logs_test.go @@ -115,7 +115,7 @@ func TestPayloadToLogRecord(t *testing.T) { recv := newReceiver(t, &Config{ Logs: LogsConfig{ Endpoint: "localhost:0", - TLS: &configtls.TLSServerSetting{}, + TLS: &configtls.ServerConfig{}, TimestampField: "EdgeStartTimestamp", Attributes: map[string]string{ "ClientIP": "http_request.client_ip", @@ -310,7 +310,7 @@ func TestHandleRequest(t *testing.T) { Attributes: map[string]string{ "ClientIP": "http_request.client_ip", }, - TLS: &configtls.TLSServerSetting{}, + TLS: &configtls.ServerConfig{}, }, }, consumer, diff --git a/receiver/cloudfoundryreceiver/config_test.go b/receiver/cloudfoundryreceiver/config_test.go index b8083f1da023..110d0d95a6b3 100644 --- a/receiver/cloudfoundryreceiver/config_test.go +++ b/receiver/cloudfoundryreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { RLPGateway: RLPGatewayConfig{ ClientConfig: confighttp.ClientConfig{ Endpoint: "https://log-stream.sys.example.internal", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ InsecureSkipVerify: true, }, Timeout: time.Second * 20, @@ -106,7 +106,7 @@ func TestHTTPConfigurationStructConsistency(t *testing.T) { // library does not support. checkTypeFieldMatch(t, "Endpoint", reflect.TypeOf(LimitedClientConfig{}), reflect.TypeOf(confighttp.ClientConfig{})) checkTypeFieldMatch(t, "TLSSetting", reflect.TypeOf(LimitedClientConfig{}), reflect.TypeOf(confighttp.ClientConfig{})) - checkTypeFieldMatch(t, "InsecureSkipVerify", reflect.TypeOf(LimitedTLSClientSetting{}), reflect.TypeOf(configtls.TLSClientSetting{})) + checkTypeFieldMatch(t, "InsecureSkipVerify", reflect.TypeOf(LimitedTLSClientSetting{}), reflect.TypeOf(configtls.ClientConfig{})) } func loadSuccessfulConfig(t *testing.T) *Config { @@ -115,7 +115,7 @@ func loadSuccessfulConfig(t *testing.T) *Config { ClientConfig: confighttp.ClientConfig{ Endpoint: "https://log-stream.sys.example.internal", Timeout: time.Second * 20, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ InsecureSkipVerify: true, }, }, diff --git a/receiver/cloudfoundryreceiver/factory.go b/receiver/cloudfoundryreceiver/factory.go index 38ae50a0c76f..9ce95b4495f5 100644 --- a/receiver/cloudfoundryreceiver/factory.go +++ b/receiver/cloudfoundryreceiver/factory.go @@ -36,7 +36,7 @@ func createDefaultConfig() component.Config { RLPGateway: RLPGatewayConfig{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultURL, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ InsecureSkipVerify: false, }, }, diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index 3045da228406..3e2976d7482c 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -6,14 +6,14 @@ require ( code.cloudfoundry.org/go-loggregator v7.4.0+incompatible github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -34,6 +34,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,14 +53,14 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index e652fdf0d9f7..3d8883d9793c 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -49,6 +49,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -112,38 +114,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/cloudfoundryreceiver/receiver.go b/receiver/cloudfoundryreceiver/receiver.go index 702fd87e1058..45d0a18ec159 100644 --- a/receiver/cloudfoundryreceiver/receiver.go +++ b/receiver/cloudfoundryreceiver/receiver.go @@ -43,10 +43,6 @@ func newCloudFoundryReceiver( config Config, nextConsumer consumer.Metrics) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ ReceiverID: settings.ID, Transport: transport, diff --git a/receiver/cloudfoundryreceiver/receiver_test.go b/receiver/cloudfoundryreceiver/receiver_test.go index 794afb0ef93d..e404a71aacfb 100644 --- a/receiver/cloudfoundryreceiver/receiver_test.go +++ b/receiver/cloudfoundryreceiver/receiver_test.go @@ -37,19 +37,3 @@ func TestDefaultValidReceiver(t *testing.T) { err = receiver.Shutdown(ctx) require.NoError(t, err) } - -// Test to make sure start fails with invalid consumer -func TestInvalidConsumer(t *testing.T) { - factory := NewFactory() - cfg := factory.CreateDefaultConfig().(*Config) - params := receivertest.NewNopCreateSettings() - - receiver, err := newCloudFoundryReceiver( - params, - *cfg, - nil, - ) - - require.EqualError(t, err, "nil next Consumer") - require.Nil(t, receiver, "receiver creation failed") -} diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 37aeae016ce9..b9ef97406123 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -8,12 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -32,6 +32,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -49,16 +50,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index ce221d1a2a71..765decb76527 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -74,38 +76,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/collectdreceiver/receiver.go b/receiver/collectdreceiver/receiver.go index 49ce8e27e1d6..0cb8a352c177 100644 --- a/receiver/collectdreceiver/receiver.go +++ b/receiver/collectdreceiver/receiver.go @@ -41,9 +41,6 @@ func newCollectdReceiver( defaultAttrsPrefix string, nextConsumer consumer.Metrics, createSettings receiver.CreateSettings) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } r := &collectdReceiver{ logger: logger, diff --git a/receiver/couchdbreceiver/client_test.go b/receiver/couchdbreceiver/client_test.go index 803eec0603ef..15b351102d5d 100644 --- a/receiver/couchdbreceiver/client_test.go +++ b/receiver/couchdbreceiver/client_test.go @@ -35,8 +35,8 @@ func TestNewCouchDBClient(t *testing.T) { &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/receiver/couchdbreceiver/config.go b/receiver/couchdbreceiver/config.go index 5a47ca552ec2..cebd78f403ef 100644 --- a/receiver/couchdbreceiver/config.go +++ b/receiver/couchdbreceiver/config.go @@ -29,11 +29,11 @@ var ( // Config defines the configuration for the various elements of the receiver agent. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` } // Validate validates missing and invalid configuration fields. diff --git a/receiver/couchdbreceiver/config_test.go b/receiver/couchdbreceiver/config_test.go index b7a19667d8c9..0efeb01635aa 100644 --- a/receiver/couchdbreceiver/config_test.go +++ b/receiver/couchdbreceiver/config_test.go @@ -31,7 +31,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingUsername, @@ -45,8 +45,8 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Username: "otelu", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Username: "otelu", }, expectedErr: multierr.Combine( errMissingPassword, @@ -59,8 +59,8 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Password: "otelp", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Password: "otelp", }, expectedErr: multierr.Combine( errMissingUsername, @@ -75,7 +75,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: fmt.Errorf(errInvalidEndpoint.Error(), "parse \"http://localhost :5984\": invalid character \" \" in host name"), }, @@ -87,7 +87,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:5984", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: nil, }, diff --git a/receiver/couchdbreceiver/factory.go b/receiver/couchdbreceiver/factory.go index baeebf8359d0..d6fd2bab515c 100644 --- a/receiver/couchdbreceiver/factory.go +++ b/receiver/couchdbreceiver/factory.go @@ -27,10 +27,10 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, Timeout: 1 * time.Minute, }, @@ -51,7 +51,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index 626716a6518b..4497cb8ee1c9 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -34,6 +34,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,14 +53,14 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index 1edec012db99..9697de4b59e2 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -76,38 +78,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/datadogreceiver/go.mod b/receiver/datadogreceiver/go.mod index d55754864889..2bef11776465 100644 --- a/receiver/datadogreceiver/go.mod +++ b/receiver/datadogreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.96.0 github.com/stretchr/testify v1.9.0 github.com/vmihailenco/msgpack/v4 v4.3.13 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -33,6 +33,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,16 +53,16 @@ require ( github.com/rs/cors v1.10.1 // indirect github.com/tinylib/msgp v1.1.9 // indirect github.com/vmihailenco/tagparser v0.1.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/datadogreceiver/go.sum b/receiver/datadogreceiver/go.sum index 8856aed8210a..0019bb1610cf 100644 --- a/receiver/datadogreceiver/go.sum +++ b/receiver/datadogreceiver/go.sum @@ -34,6 +34,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -94,40 +96,40 @@ github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgq 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/datadogreceiver/receiver.go b/receiver/datadogreceiver/receiver.go index bf4286c9b4e2..f0a40f46560f 100644 --- a/receiver/datadogreceiver/receiver.go +++ b/receiver/datadogreceiver/receiver.go @@ -26,9 +26,6 @@ type datadogReceiver struct { } func newDataDogReceiver(config *Config, nextConsumer consumer.Traces, params receiver.CreateSettings) (receiver.Traces, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } instance, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{LongLivedCtx: false, ReceiverID: params.ID, Transport: "http", ReceiverCreateSettings: params}) if err != nil { diff --git a/receiver/dockerstatsreceiver/config.go b/receiver/dockerstatsreceiver/config.go index d7d18f5172c6..86825de8c65e 100644 --- a/receiver/dockerstatsreceiver/config.go +++ b/receiver/dockerstatsreceiver/config.go @@ -16,7 +16,7 @@ import ( var _ component.Config = (*Config)(nil) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` // The URL of the docker server. Default is "unix:///var/run/docker.sock" Endpoint string `mapstructure:"endpoint"` diff --git a/receiver/dockerstatsreceiver/config_test.go b/receiver/dockerstatsreceiver/config_test.go index 6713673d388f..d9a7db9f450d 100644 --- a/receiver/dockerstatsreceiver/config_test.go +++ b/receiver/dockerstatsreceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "allsettings"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 2 * time.Second, InitialDelay: time.Second, Timeout: 20 * time.Second, @@ -91,20 +91,20 @@ func TestLoadConfig(t *testing.T) { } func TestValidateErrors(t *testing.T) { - cfg := &Config{ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type)} + cfg := &Config{ControllerConfig: scraperhelper.NewDefaultControllerConfig()} assert.Equal(t, "endpoint must be specified", component.ValidateConfig(cfg).Error()) cfg = &Config{ - DockerAPIVersion: "1.21", - Endpoint: "someEndpoint", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: 1 * time.Second}, + DockerAPIVersion: "1.21", + Endpoint: "someEndpoint", + ControllerConfig: scraperhelper.ControllerConfig{CollectionInterval: 1 * time.Second}, } assert.Equal(t, `"api_version" 1.21 must be at least 1.25`, component.ValidateConfig(cfg).Error()) cfg = &Config{ - Endpoint: "someEndpoint", - DockerAPIVersion: "1.25", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{}, + Endpoint: "someEndpoint", + DockerAPIVersion: "1.25", + ControllerConfig: scraperhelper.ControllerConfig{}, } assert.Equal(t, `"collection_interval": requires positive value`, component.ValidateConfig(cfg).Error()) } diff --git a/receiver/dockerstatsreceiver/factory.go b/receiver/dockerstatsreceiver/factory.go index 773a8b36ec90..9a643160af97 100644 --- a/receiver/dockerstatsreceiver/factory.go +++ b/receiver/dockerstatsreceiver/factory.go @@ -32,14 +32,14 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - scs := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scs := scraperhelper.NewDefaultControllerConfig() scs.CollectionInterval = 10 * time.Second scs.Timeout = 5 * time.Second return &Config{ - ScraperControllerSettings: scs, - Endpoint: "unix:///var/run/docker.sock", - DockerAPIVersion: defaultDockerAPIVersion, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scs, + Endpoint: "unix:///var/run/docker.sock", + DockerAPIVersion: defaultDockerAPIVersion, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -57,5 +57,5 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&dsr.config.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scrp)) + return scraperhelper.NewScraperControllerReceiver(&dsr.config.ControllerConfig, params, consumer, scraperhelper.AddScraper(scrp)) } diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index e1110926457b..754bfed50b40 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -74,14 +74,14 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index 538536f74c8d..c7073cc0585a 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -118,8 +118,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -144,26 +144,26 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -211,7 +211,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/dockerstatsreceiver/receiver_test.go b/receiver/dockerstatsreceiver/receiver_test.go index 31202fc2f53e..c5b2844a407a 100644 --- a/receiver/dockerstatsreceiver/receiver_test.go +++ b/receiver/dockerstatsreceiver/receiver_test.go @@ -119,7 +119,7 @@ var ( func TestNewReceiver(t *testing.T) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 1 * time.Second, }, Endpoint: "unix:///run/some.sock", @@ -132,7 +132,7 @@ func TestNewReceiver(t *testing.T) { func TestErrorsInStart(t *testing.T) { unreachable := "unix:///not/a/thing.sock" cfg := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 1 * time.Second, }, Endpoint: unreachable, diff --git a/receiver/elasticsearchreceiver/config.go b/receiver/elasticsearchreceiver/config.go index 711cd4aed6d7..06c71ea112cf 100644 --- a/receiver/elasticsearchreceiver/config.go +++ b/receiver/elasticsearchreceiver/config.go @@ -29,8 +29,8 @@ var ( // Config is the configuration for the elasticsearch receiver type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // MetricsBuilderConfig defines which metrics/attributes to enable for the scraper metadata.MetricsBuilderConfig `mapstructure:",squash"` // Nodes defines the nodes to scrape. diff --git a/receiver/elasticsearchreceiver/config_test.go b/receiver/elasticsearchreceiver/config_test.go index 42c9bc1d215e..d28be30fcad5 100644 --- a/receiver/elasticsearchreceiver/config_test.go +++ b/receiver/elasticsearchreceiver/config_test.go @@ -160,7 +160,7 @@ func TestLoadConfig(t *testing.T) { SkipClusterMetrics: true, Nodes: []string{"_local"}, Indices: []string{".geoip_databases"}, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 2 * time.Minute, InitialDelay: time.Second, }, diff --git a/receiver/elasticsearchreceiver/factory.go b/receiver/elasticsearchreceiver/factory.go index 413a30da4e6d..2a432d0756b0 100644 --- a/receiver/elasticsearchreceiver/factory.go +++ b/receiver/elasticsearchreceiver/factory.go @@ -32,11 +32,11 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates the default elasticsearchreceiver config. func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultCollectionInterval return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: defaultHTTPClientTimeout, @@ -68,7 +68,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &c.ScraperControllerSettings, + &c.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index b2c5bddfa8e6..ceccf75f9756 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -10,14 +10,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -78,21 +78,21 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index 651deb8d4590..8670b95423e1 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -124,8 +124,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -152,40 +152,40 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -235,7 +235,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/elasticsearchreceiver/scraper_test.go b/receiver/elasticsearchreceiver/scraper_test.go index 74cad46a4440..6fc74abc73f5 100644 --- a/receiver/elasticsearchreceiver/scraper_test.go +++ b/receiver/elasticsearchreceiver/scraper_test.go @@ -211,8 +211,8 @@ func TestScraperFailedStart(t *testing.T) { conf.ClientConfig = confighttp.ClientConfig{ Endpoint: "localhost:9200", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/receiver/expvarreceiver/config.go b/receiver/expvarreceiver/config.go index 81ad5ba1a0bd..0718a5aa49f1 100644 --- a/receiver/expvarreceiver/config.go +++ b/receiver/expvarreceiver/config.go @@ -15,9 +15,9 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } var _ component.Config = (*Config)(nil) diff --git a/receiver/expvarreceiver/config_test.go b/receiver/expvarreceiver/config_test.go index 098e59b0606f..8f47e81be257 100644 --- a/receiver/expvarreceiver/config_test.go +++ b/receiver/expvarreceiver/config_test.go @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "custom"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 30 * time.Second, InitialDelay: time.Second, Timeout: time.Second * 5, diff --git a/receiver/expvarreceiver/factory.go b/receiver/expvarreceiver/factory.go index 1334ad0d1dc8..0568d1c3dbd7 100644 --- a/receiver/expvarreceiver/factory.go +++ b/receiver/expvarreceiver/factory.go @@ -48,7 +48,7 @@ func newMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, + &cfg.ControllerConfig, set, consumer, scraperhelper.AddScraper(scraper), @@ -57,7 +57,7 @@ func newMetricsReceiver( func newDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: defaultTimeout, diff --git a/receiver/expvarreceiver/factory_test.go b/receiver/expvarreceiver/factory_test.go index 4a12afc07b8d..d4ffcb9be2fb 100644 --- a/receiver/expvarreceiver/factory_test.go +++ b/receiver/expvarreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, }, ClientConfig: confighttp.ClientConfig{ diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index 8602d8cd1ce2..caf0210d1230 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -31,6 +31,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -48,16 +49,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/expvarreceiver/go.sum b/receiver/expvarreceiver/go.sum index ce221d1a2a71..765decb76527 100644 --- a/receiver/expvarreceiver/go.sum +++ b/receiver/expvarreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -74,38 +76,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 08d8c06f9f98..8c9ec61d688b 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -30,6 +30,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -47,20 +48,20 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 // indirect + golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index c7209453b58a..18570d8593b1 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -28,6 +28,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -81,24 +83,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -121,8 +123,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -164,8 +166,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/receiver/filestatsreceiver/config.go b/receiver/filestatsreceiver/config.go index a8feb423cf7e..2eb6ae7decf7 100644 --- a/receiver/filestatsreceiver/config.go +++ b/receiver/filestatsreceiver/config.go @@ -12,9 +12,9 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - Include string `mapstructure:"include"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + Include string `mapstructure:"include"` } func (c Config) Validate() error { diff --git a/receiver/filestatsreceiver/config_test.go b/receiver/filestatsreceiver/config_test.go index 5ced691b87bf..03b0771c3c8c 100644 --- a/receiver/filestatsreceiver/config_test.go +++ b/receiver/filestatsreceiver/config_test.go @@ -9,8 +9,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/receiver/scraperhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver/internal/metadata" ) func Test_Config_Validate(t *testing.T) { @@ -22,16 +20,16 @@ func Test_Config_Validate(t *testing.T) { { name: "valid", cfg: &Config{ - Include: "/var/log/*.log", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Include: "/var/log/*.log", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, wantErr: nil, }, { name: "missing include pattern", cfg: &Config{ - Include: "", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Include: "", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, wantErr: errors.New("include must not be empty"), }, diff --git a/receiver/filestatsreceiver/factory.go b/receiver/filestatsreceiver/factory.go index db397268fa9b..5c4293b1bc8e 100644 --- a/receiver/filestatsreceiver/factory.go +++ b/receiver/filestatsreceiver/factory.go @@ -24,8 +24,8 @@ func NewFactory() receiver.Factory { func newDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -45,7 +45,7 @@ func newReceiver( opt := scraperhelper.AddScraper(s) return scraperhelper.NewScraperControllerReceiver( - &fileStatsConfig.ScraperControllerSettings, + &fileStatsConfig.ControllerConfig, settings, consumer, opt, diff --git a/receiver/filestatsreceiver/go.mod b/receiver/filestatsreceiver/go.mod index 10b42e45c48d..380adeca7468 100644 --- a/receiver/filestatsreceiver/go.mod +++ b/receiver/filestatsreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -70,15 +70,15 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/testcontainers/testcontainers-go v0.27.0 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/filestatsreceiver/go.sum b/receiver/filestatsreceiver/go.sum index c9f6fa457081..7b2d194a3997 100644 --- a/receiver/filestatsreceiver/go.sum +++ b/receiver/filestatsreceiver/go.sum @@ -116,8 +116,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -142,22 +142,22 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -205,7 +205,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/flinkmetricsreceiver/client_test.go b/receiver/flinkmetricsreceiver/client_test.go index 8cb23c2c4c1f..86fcfcbc4b35 100644 --- a/receiver/flinkmetricsreceiver/client_test.go +++ b/receiver/flinkmetricsreceiver/client_test.go @@ -60,8 +60,8 @@ func TestNewClient(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -76,7 +76,7 @@ func TestNewClient(t *testing.T) { desc: "Valid Configuration", cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/flinkmetricsreceiver/config.go b/receiver/flinkmetricsreceiver/config.go index d53245e1a70f..721214338064 100644 --- a/receiver/flinkmetricsreceiver/config.go +++ b/receiver/flinkmetricsreceiver/config.go @@ -17,9 +17,9 @@ const defaultEndpoint = "http://localhost:8081" // Config defines the configuration for the various elements of the receiver agent. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } // Validate validates the configuration by checking for missing or invalid fields diff --git a/receiver/flinkmetricsreceiver/config_test.go b/receiver/flinkmetricsreceiver/config_test.go index 706acf2f6e56..c7b271630edb 100644 --- a/receiver/flinkmetricsreceiver/config_test.go +++ b/receiver/flinkmetricsreceiver/config_test.go @@ -31,7 +31,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: fmt.Errorf("\"endpoint\" must be in the form of ://:: %w", errors.New(`parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`)), }, @@ -41,7 +41,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: nil, }, diff --git a/receiver/flinkmetricsreceiver/factory.go b/receiver/flinkmetricsreceiver/factory.go index e5d3a8de66fb..b49ec0c71ae5 100644 --- a/receiver/flinkmetricsreceiver/factory.go +++ b/receiver/flinkmetricsreceiver/factory.go @@ -29,11 +29,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, @@ -59,7 +59,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/flinkmetricsreceiver/factory_test.go b/receiver/flinkmetricsreceiver/factory_test.go index 69fa78b8becc..eaadc8312291 100644 --- a/receiver/flinkmetricsreceiver/factory_test.go +++ b/receiver/flinkmetricsreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index fdc28fdb6b50..2717fdc219b2 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -32,6 +32,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -50,15 +51,15 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/flinkmetricsreceiver/go.sum b/receiver/flinkmetricsreceiver/go.sum index 1edec012db99..9697de4b59e2 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -76,38 +78,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/flinkmetricsreceiver/scraper_test.go b/receiver/flinkmetricsreceiver/scraper_test.go index ab02aa118d98..fb45281a8a48 100644 --- a/receiver/flinkmetricsreceiver/scraper_test.go +++ b/receiver/flinkmetricsreceiver/scraper_test.go @@ -44,8 +44,8 @@ func TestScraperStart(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -60,7 +60,7 @@ func TestScraperStart(t *testing.T) { scraper: &flinkmetricsScraper{ cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index c9d705707603..da543427e143 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/stretchr/testify v1.9.0 github.com/tinylib/msgp v1.1.9 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,6 +28,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -43,8 +44,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index be3fac4b55de..0024e927398f 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -51,6 +51,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -104,20 +106,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/gitproviderreceiver/config.go b/receiver/gitproviderreceiver/config.go index 32bfda5ace0f..af62305613ca 100644 --- a/receiver/gitproviderreceiver/config.go +++ b/receiver/gitproviderreceiver/config.go @@ -21,9 +21,9 @@ const ( // Config that is exposed to this github receiver through the OTEL config.yaml type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - Scrapers map[string]internal.Config `mapstructure:"scrapers"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + Scrapers map[string]internal.Config `mapstructure:"scrapers"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } var _ component.Config = (*Config)(nil) diff --git a/receiver/gitproviderreceiver/config_test.go b/receiver/gitproviderreceiver/config_test.go index 09bed60e9551..748f783feb9f 100644 --- a/receiver/gitproviderreceiver/config_test.go +++ b/receiver/gitproviderreceiver/config_test.go @@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Receivers[component.NewIDWithName(metadata.Type, "customname")].(*Config) expectedConfig := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 30 * time.Second, InitialDelay: 1 * time.Second, }, @@ -79,9 +79,9 @@ func TestLoadInvalidConfig_InvalidScraperKey(t *testing.T) { func TestConfig_Unmarshal(t *testing.T) { type fields struct { - ScraperControllerSettings scraperhelper.ScraperControllerSettings - Scrapers map[string]internal.Config - MetricsBuilderConfig metadata.MetricsBuilderConfig + ControllerConfig scraperhelper.ControllerConfig + Scrapers map[string]internal.Config + MetricsBuilderConfig metadata.MetricsBuilderConfig } type args struct { @@ -104,9 +104,9 @@ func TestConfig_Unmarshal(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { cfg := &Config{ - ScraperControllerSettings: test.fields.ScraperControllerSettings, - Scrapers: test.fields.Scrapers, - MetricsBuilderConfig: test.fields.MetricsBuilderConfig, + ControllerConfig: test.fields.ControllerConfig, + Scrapers: test.fields.Scrapers, + MetricsBuilderConfig: test.fields.MetricsBuilderConfig, } if err := cfg.Unmarshal(test.args.componentParser); (err != nil) != test.wantErr { t.Errorf("Config.Unmarshal() error = %v, wantErr %v", err, test.wantErr) diff --git a/receiver/gitproviderreceiver/factory.go b/receiver/gitproviderreceiver/factory.go index 33d849131286..0abf15c6115a 100644 --- a/receiver/gitproviderreceiver/factory.go +++ b/receiver/gitproviderreceiver/factory.go @@ -49,7 +49,7 @@ func getScraperFactory(key string) (internal.ScraperFactory, bool) { // Create the default config based on the const(s) defined above. func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), // TODO: metrics builder configuration may need to be in each sub scraper, // TODO: for right now setting here because the metrics in this receiver will apply to all // TODO: scrapers defined as a common set of gitprovider @@ -80,7 +80,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &conf.ScraperControllerSettings, + &conf.ControllerConfig, params, consumer, addScraperOpts..., diff --git a/receiver/gitproviderreceiver/go.mod b/receiver/gitproviderreceiver/go.mod index d69dd7a88d74..9f31ac7f61ab 100644 --- a/receiver/gitproviderreceiver/go.mod +++ b/receiver/gitproviderreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/google/go-cmp v0.6.0 github.com/google/go-github/v59 v59.0.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -58,35 +58,35 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // 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/vektah/gqlparser/v2 v2.5.11 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect diff --git a/receiver/gitproviderreceiver/go.sum b/receiver/gitproviderreceiver/go.sum index 743f2700f921..57426f8f08fd 100644 --- a/receiver/gitproviderreceiver/go.sum +++ b/receiver/gitproviderreceiver/go.sum @@ -128,8 +128,8 @@ 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/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -156,72 +156,72 @@ github.com/vektah/gqlparser/v2 v2.5.11 h1:JJxLtXIoN7+3x6MBdtIP59TP1RANnY7pXOaDnA github.com/vektah/gqlparser/v2 v2.5.11/go.mod h1:1rCcfwB2ekJofmluGWXMSEnPMZgbxzwj6FaZ/4OT8Cc= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= @@ -302,7 +302,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/googlecloudpubsubreceiver/factory.go b/receiver/googlecloudpubsubreceiver/factory.go index 2c005a94e206..c2e4d024d7d6 100644 --- a/receiver/googlecloudpubsubreceiver/factory.go +++ b/receiver/googlecloudpubsubreceiver/factory.go @@ -71,9 +71,6 @@ func (factory *pubsubReceiverFactory) CreateTracesReceiver( cfg component.Config, consumer consumer.Traces) (receiver.Traces, error) { - if consumer == nil { - return nil, component.ErrNilNextConsumer - } err := cfg.(*Config).validateForTrace() if err != nil { return nil, err @@ -92,9 +89,6 @@ func (factory *pubsubReceiverFactory) CreateMetricsReceiver( cfg component.Config, consumer consumer.Metrics) (receiver.Metrics, error) { - if consumer == nil { - return nil, component.ErrNilNextConsumer - } err := cfg.(*Config).validateForMetric() if err != nil { return nil, err @@ -113,9 +107,6 @@ func (factory *pubsubReceiverFactory) CreateLogsReceiver( cfg component.Config, consumer consumer.Logs) (receiver.Logs, error) { - if consumer == nil { - return nil, component.ErrNilNextConsumer - } err := cfg.(*Config).validateForLog() if err != nil { return nil, err diff --git a/receiver/googlecloudpubsubreceiver/factory_test.go b/receiver/googlecloudpubsubreceiver/factory_test.go index 88838e0b145e..1d942b159ef6 100644 --- a/receiver/googlecloudpubsubreceiver/factory_test.go +++ b/receiver/googlecloudpubsubreceiver/factory_test.go @@ -36,8 +36,6 @@ func TestCreateTracesReceiver(t *testing.T) { tReceiver, err := factory.CreateTracesReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "traces receiver creation failed") - _, err = factory.CreateTracesReceiver(context.Background(), params, cfg, nil) - assert.Error(t, err) } func TestCreateMetricsReceiver(t *testing.T) { @@ -49,8 +47,6 @@ func TestCreateMetricsReceiver(t *testing.T) { tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "metrics receiver creation failed") - _, err = factory.CreateMetricsReceiver(context.Background(), params, cfg, nil) - assert.Error(t, err) } func TestCreateLogsReceiver(t *testing.T) { @@ -62,8 +58,6 @@ func TestCreateLogsReceiver(t *testing.T) { tReceiver, err := factory.CreateLogsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "logs receiver creation failed") - _, err = factory.CreateLogsReceiver(context.Background(), params, cfg, nil) - assert.Error(t, err) } func TestEnsureReceiver(t *testing.T) { diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index b7981a55301d..8284d5c94b65 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -9,17 +9,17 @@ require ( github.com/iancoleman/strcase v0.3.0 github.com/json-iterator/go v1.1.12 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - google.golang.org/api v0.166.0 + google.golang.org/api v0.170.0 google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c google.golang.org/grpc v1.62.1 @@ -44,8 +44,9 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.1 // indirect + github.com/googleapis/gax-go/v2 v2.12.2 // 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.1.0 // indirect @@ -60,25 +61,25 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect go.einride.tech/aip v0.66.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index fc01a2d1c023..d41e9a71e517 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -23,8 +23,6 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj 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-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -32,8 +30,6 @@ 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.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -80,8 +76,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.12.1 h1:9F8GV9r9ztXyAi00gsMQHNoF51xPZm8uj1dpYt2ZETM= -github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= +github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= +github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -136,30 +132,30 @@ go.einride.tech/aip v0.66.0 h1:XfV+NQX6L7EOYK11yoHHFtndeaWh3KbD9/cN/6iWEt8= go.einride.tech/aip v0.66.0/go.mod h1:qAhMsfT7plxBX+Oy7Huol6YUvZ0ZzdUz26yZsQwfl1M= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 h1:doUP+ExOpH3spVTLS0FcWGLnQrPct/hD/bCPbDRUEAU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -182,8 +178,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= 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= @@ -202,11 +198,11 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= -golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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= @@ -248,8 +244,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.166.0 h1:6m4NUwrZYhAaVIHZWxaKjw1L1vNAjtMwORmKRyEEo24= -google.golang.org/api v0.166.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= +google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= 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= @@ -261,8 +257,8 @@ google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJ google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c h1:9g7erC9qu44ks7UK4gDNlnk4kOxZG707xKm4jVniy6o= google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/receiver/googlecloudspannerreceiver/config.go b/receiver/googlecloudspannerreceiver/config.go index c80d0b849e76..ae88f0b00c9c 100644 --- a/receiver/googlecloudspannerreceiver/config.go +++ b/receiver/googlecloudspannerreceiver/config.go @@ -16,7 +16,7 @@ const ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` TopMetricsQueryMaxRows int `mapstructure:"top_metrics_query_max_rows"` BackfillEnabled bool `mapstructure:"backfill_enabled"` diff --git a/receiver/googlecloudspannerreceiver/config_test.go b/receiver/googlecloudspannerreceiver/config_test.go index 95478964bfc3..0dd720f8f8cd 100644 --- a/receiver/googlecloudspannerreceiver/config_test.go +++ b/receiver/googlecloudspannerreceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 120 * time.Second, InitialDelay: time.Second, }, @@ -177,7 +177,7 @@ func TestValidateConfig(t *testing.T) { for name, testCase := range testCases { t.Run(name, func(t *testing.T) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: testCase.collectionInterval, }, TopMetricsQueryMaxRows: testCase.topMetricsQueryMaxRows, diff --git a/receiver/googlecloudspannerreceiver/factory.go b/receiver/googlecloudspannerreceiver/factory.go index 76ad73ffcb70..a2674d47eb19 100644 --- a/receiver/googlecloudspannerreceiver/factory.go +++ b/receiver/googlecloudspannerreceiver/factory.go @@ -32,7 +32,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), TopMetricsQueryMaxRows: defaultTopMetricsQueryMaxRows, BackfillEnabled: defaultBackfillEnabled, HideTopnLockstatsRowrangestartkey: defaultHideTopnLockstatsRowrangestartkey, @@ -56,6 +56,6 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&rCfg.ScraperControllerSettings, settings, consumer, + return scraperhelper.NewScraperControllerReceiver(&rCfg.ControllerConfig, settings, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index acdb4022ae6a..e1e2e923715d 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -3,21 +3,21 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/google go 1.21 require ( - cloud.google.com/go/spanner v1.58.0 + cloud.google.com/go/spanner v1.60.0 github.com/ReneKroon/ttlcache/v2 v2.11.0 github.com/mitchellh/hashstructure v1.1.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - google.golang.org/api v0.167.0 + google.golang.org/api v0.170.0 google.golang.org/grpc v1.62.1 gopkg.in/yaml.v3 v3.0.1 ) @@ -42,8 +42,9 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.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/protobuf v1.5.4 // indirect github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.2 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -61,26 +62,26 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index 87cad0a36b66..5fe2efeb8ec0 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -9,8 +9,8 @@ cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc= cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI= cloud.google.com/go/longrunning v0.5.5 h1:GOE6pZFdSrTb4KAiKnXsJBtlE6mEyaW44oKyMILWnOg= cloud.google.com/go/longrunning v0.5.5/go.mod h1:WV2LAxD8/rg5Z1cNW6FJ/ZpX4E4VnDnoTk0yawPBB7s= -cloud.google.com/go/spanner v1.58.0 h1:W0SAtTz50XIZlTCJtHJ7x4Yxux6ZsorBBxjdXfjZ7UQ= -cloud.google.com/go/spanner v1.58.0/go.mod h1:eSpP+aaT38sdwFs0ovo7Z1VsG9RyM9n7EHpM5DhDEsE= +cloud.google.com/go/spanner v1.60.0 h1:O9kf49dfaDRzPpKJNChHUJ+Bao02WPedZb8ZPyi02lI= +cloud.google.com/go/spanner v1.60.0/go.mod h1:D2bOAeT/dC6zsZhXRIxbdYa5nQEYU3wYM/1KN3eg7Fs= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ReneKroon/ttlcache/v2 v2.11.0 h1:OvlcYFYi941SBN3v9dsDcC2N8vRxyHcCmJb3Vl4QMoM= github.com/ReneKroon/ttlcache/v2 v2.11.0/go.mod h1:mBxvsNY+BT8qLLd6CuAJubbKo6r0jh3nb5et22bbfGY= @@ -66,8 +66,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -146,24 +146,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 h1:doUP+ExOpH3spVTLS0FcWGLnQrPct/hD/bCPbDRUEAU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -187,8 +187,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= 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= @@ -210,11 +210,11 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= -golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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= @@ -232,8 +232,8 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w 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.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.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= @@ -262,8 +262,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -google.golang.org/api v0.167.0 h1:CKHrQD1BLRii6xdkatBDXyKzM0mkawt2QP+H3LtPmSE= -google.golang.org/api v0.167.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= +google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= 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= @@ -273,10 +273,10 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= -google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78 h1:SzXBGiWM1LNVYLCRP3e0/Gsze804l4jGoJ5lYysEO5I= -google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 h1:Xs9lu+tLXxLIfuci70nG4cpwaRC+mRQPUL7LoIeDJC4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/receiver/haproxyreceiver/config.go b/receiver/haproxyreceiver/config.go index b141ed3ea2f0..ec1636686e3c 100644 --- a/receiver/haproxyreceiver/config.go +++ b/receiver/haproxyreceiver/config.go @@ -13,9 +13,9 @@ import ( ) type Config struct { - confighttp.ClientConfig `mapstructure:",squash"` - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } func (c Config) Validate() error { diff --git a/receiver/haproxyreceiver/factory.go b/receiver/haproxyreceiver/factory.go index fdabd7e2ef5a..46409d4198a1 100644 --- a/receiver/haproxyreceiver/factory.go +++ b/receiver/haproxyreceiver/factory.go @@ -24,8 +24,8 @@ func NewFactory() receiver.Factory { func newDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -43,7 +43,7 @@ func newReceiver( } return scraperhelper.NewScraperControllerReceiver( - &haProxyCfg.ScraperControllerSettings, + &haProxyCfg.ControllerConfig, settings, consumer, scraperhelper.AddScraper(s), diff --git a/receiver/haproxyreceiver/go.mod b/receiver/haproxyreceiver/go.mod index bc5299d32c8d..7b6ae9073fb6 100644 --- a/receiver/haproxyreceiver/go.mod +++ b/receiver/haproxyreceiver/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -76,22 +76,22 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/haproxyreceiver/go.sum b/receiver/haproxyreceiver/go.sum index 5063d8da04f2..4f86baf4e026 100644 --- a/receiver/haproxyreceiver/go.sum +++ b/receiver/haproxyreceiver/go.sum @@ -124,8 +124,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -150,40 +150,40 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -233,7 +233,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/haproxyreceiver/integration_test.go b/receiver/haproxyreceiver/integration_test.go index 3bafa4cb8d5c..e0fdb081579c 100644 --- a/receiver/haproxyreceiver/integration_test.go +++ b/receiver/haproxyreceiver/integration_test.go @@ -38,7 +38,7 @@ func TestIntegration(t *testing.T) { scraperinttest.WithCustomConfig( func(t *testing.T, cfg component.Config, ci *scraperinttest.ContainerInfo) { rCfg := cfg.(*Config) - rCfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + rCfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond rCfg.Endpoint = fmt.Sprintf("http://%s:%s/stats", ci.Host(t), ci.MappedPort(t, haproxyPort)) }), scraperinttest.WithCompareOptions( diff --git a/receiver/hostmetricsreceiver/config.go b/receiver/hostmetricsreceiver/config.go index a9615f19ef78..cc20564cd0e9 100644 --- a/receiver/hostmetricsreceiver/config.go +++ b/receiver/hostmetricsreceiver/config.go @@ -21,8 +21,8 @@ const ( // Config defines configuration for HostMetrics receiver. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - Scrapers map[string]internal.Config `mapstructure:"-"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + Scrapers map[string]internal.Config `mapstructure:"-"` // RootPath is the host's root directory (linux only). RootPath string `mapstructure:"root_path"` } diff --git a/receiver/hostmetricsreceiver/config_test.go b/receiver/hostmetricsreceiver/config_test.go index c88fc7fd2262..e5b1f969eaa4 100644 --- a/receiver/hostmetricsreceiver/config_test.go +++ b/receiver/hostmetricsreceiver/config_test.go @@ -56,7 +56,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Receivers[component.NewIDWithName(metadata.Type, "customname")].(*Config) expectedConfig := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 30 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/hostmetricsreceiver/factory.go b/receiver/hostmetricsreceiver/factory.go index e0df87763485..84d4dfe61cb3 100644 --- a/receiver/hostmetricsreceiver/factory.go +++ b/receiver/hostmetricsreceiver/factory.go @@ -59,7 +59,7 @@ func getScraperFactory(key string) (internal.ScraperFactory, bool) { // createDefaultConfig creates the default configuration for receiver. func createDefaultConfig() component.Config { - return &Config{ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type)} + return &Config{ControllerConfig: scraperhelper.NewDefaultControllerConfig()} } // createMetricsReceiver creates a metrics receiver based on provided config. @@ -77,7 +77,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &oCfg.ScraperControllerSettings, + &oCfg.ControllerConfig, set, consumer, addScraperOptions..., diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 929f126e73f2..80db058f7638 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -12,14 +12,14 @@ require ( github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 github.com/yusufpapurcu/wmi v1.2.4 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -91,19 +91,19 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index 87a9b7cf6f37..9c180ada1a64 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -332,54 +332,54 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= diff --git a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go index fa39ed74aadb..1c4e1620aaef 100644 --- a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go +++ b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go @@ -25,7 +25,6 @@ import ( conventions "go.opentelemetry.io/collector/semconv/v1.9.0" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/diskscraper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper" @@ -107,7 +106,7 @@ func TestGatherMetrics_EndToEnd(t *testing.T) { sink := new(consumertest.MetricsSink) cfg := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 100 * time.Millisecond, }, Scrapers: map[string]internal.Config{ @@ -285,7 +284,7 @@ func benchmarkScrapeMetrics(b *testing.B, cfg *Config) { require.NoError(b, err) options = append(options, scraperhelper.WithTickerChannel(tickerCh)) - receiver, err := scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, receivertest.NewNopCreateSettings(), sink, options...) + receiver, err := scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, receivertest.NewNopCreateSettings(), sink, options...) require.NoError(b, err) require.NoError(b, receiver.Start(context.Background(), componenttest.NewNopHost())) @@ -303,8 +302,8 @@ func benchmarkScrapeMetrics(b *testing.B, cfg *Config) { func Benchmark_ScrapeCpuMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{cpuscraper.TypeStr: (&cpuscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{cpuscraper.TypeStr: (&cpuscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -312,8 +311,8 @@ func Benchmark_ScrapeCpuMetrics(b *testing.B) { func Benchmark_ScrapeDiskMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{diskscraper.TypeStr: (&diskscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{diskscraper.TypeStr: (&diskscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -321,8 +320,8 @@ func Benchmark_ScrapeDiskMetrics(b *testing.B) { func Benchmark_ScrapeFileSystemMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{filesystemscraper.TypeStr: (&filesystemscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{filesystemscraper.TypeStr: (&filesystemscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -330,8 +329,8 @@ func Benchmark_ScrapeFileSystemMetrics(b *testing.B) { func Benchmark_ScrapeLoadMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{loadscraper.TypeStr: (&loadscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{loadscraper.TypeStr: (&loadscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -339,8 +338,8 @@ func Benchmark_ScrapeLoadMetrics(b *testing.B) { func Benchmark_ScrapeMemoryMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{memoryscraper.TypeStr: (&memoryscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{memoryscraper.TypeStr: (&memoryscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -348,8 +347,8 @@ func Benchmark_ScrapeMemoryMetrics(b *testing.B) { func Benchmark_ScrapeNetworkMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{networkscraper.TypeStr: (&networkscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{networkscraper.TypeStr: (&networkscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -357,8 +356,8 @@ func Benchmark_ScrapeNetworkMetrics(b *testing.B) { func Benchmark_ScrapeProcessesMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{processesscraper.TypeStr: (&processesscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{processesscraper.TypeStr: (&processesscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -366,8 +365,8 @@ func Benchmark_ScrapeProcessesMetrics(b *testing.B) { func Benchmark_ScrapePagingMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{pagingscraper.TypeStr: (&pagingscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{pagingscraper.TypeStr: (&pagingscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -379,8 +378,8 @@ func Benchmark_ScrapeProcessMetrics(b *testing.B) { } cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{processscraper.TypeStr: (&processscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{processscraper.TypeStr: (&processscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -388,7 +387,7 @@ func Benchmark_ScrapeProcessMetrics(b *testing.B) { func Benchmark_ScrapeSystemMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), Scrapers: map[string]internal.Config{ cpuscraper.TypeStr: (&cpuscraper.Factory{}).CreateDefaultConfig(), diskscraper.TypeStr: (&diskscraper.Factory{}).CreateDefaultConfig(), @@ -410,7 +409,7 @@ func Benchmark_ScrapeSystemAndProcessMetrics(b *testing.B) { } cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), Scrapers: map[string]internal.Config{ cpuscraper.TypeStr: &cpuscraper.Config{}, diskscraper.TypeStr: &diskscraper.Config{}, diff --git a/receiver/httpcheckreceiver/config.go b/receiver/httpcheckreceiver/config.go index 1da306717bb4..61019aca3515 100644 --- a/receiver/httpcheckreceiver/config.go +++ b/receiver/httpcheckreceiver/config.go @@ -23,9 +23,9 @@ var ( // Config defines the configuration for the various elements of the receiver agent. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - Targets []*targetConfig `mapstructure:"targets"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + Targets []*targetConfig `mapstructure:"targets"` } type targetConfig struct { diff --git a/receiver/httpcheckreceiver/config_test.go b/receiver/httpcheckreceiver/config_test.go index 3758afa31ca4..905de862e827 100644 --- a/receiver/httpcheckreceiver/config_test.go +++ b/receiver/httpcheckreceiver/config_test.go @@ -11,8 +11,6 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/multierr" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver/internal/metadata" ) func TestValidate(t *testing.T) { @@ -29,7 +27,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{}, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingEndpoint, @@ -45,7 +43,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`), @@ -66,7 +64,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`), @@ -82,7 +80,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "www.opentelemetry.io/docs": invalid URI for request`), @@ -103,7 +101,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: nil, }, diff --git a/receiver/httpcheckreceiver/factory.go b/receiver/httpcheckreceiver/factory.go index fae8cbb22655..7f026900bb1a 100644 --- a/receiver/httpcheckreceiver/factory.go +++ b/receiver/httpcheckreceiver/factory.go @@ -27,13 +27,13 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 60 * time.Second return &Config{ - ScraperControllerSettings: cfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - Targets: []*targetConfig{}, + ControllerConfig: cfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + Targets: []*targetConfig{}, } } @@ -49,5 +49,5 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/httpcheckreceiver/factory_test.go b/receiver/httpcheckreceiver/factory_test.go index 149d43dd2733..c34ececd6935 100644 --- a/receiver/httpcheckreceiver/factory_test.go +++ b/receiver/httpcheckreceiver/factory_test.go @@ -35,7 +35,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 60 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/httpcheckreceiver/go.mod b/receiver/httpcheckreceiver/go.mod index f082fcd2cf5e..b85aa6a8d5de 100644 --- a/receiver/httpcheckreceiver/go.mod +++ b/receiver/httpcheckreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -33,6 +33,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -50,15 +51,15 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/httpcheckreceiver/go.sum b/receiver/httpcheckreceiver/go.sum index ce221d1a2a71..765decb76527 100644 --- a/receiver/httpcheckreceiver/go.sum +++ b/receiver/httpcheckreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -74,38 +76,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/httpcheckreceiver/scraper_test.go b/receiver/httpcheckreceiver/scraper_test.go index ef0244b98c55..0ceb0df9440e 100644 --- a/receiver/httpcheckreceiver/scraper_test.go +++ b/receiver/httpcheckreceiver/scraper_test.go @@ -45,8 +45,8 @@ func TestScraperStart(t *testing.T) { { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.com", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -65,7 +65,7 @@ func TestScraperStart(t *testing.T) { Targets: []*targetConfig{ { ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: "http://example.com", }, }, diff --git a/receiver/iisreceiver/config.go b/receiver/iisreceiver/config.go index 0783d76408ba..1fda19f16040 100644 --- a/receiver/iisreceiver/config.go +++ b/receiver/iisreceiver/config.go @@ -11,6 +11,6 @@ import ( // Config defines configuration for simple prometheus receiver. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/iisreceiver/factory.go b/receiver/iisreceiver/factory.go index 8d1221dcf309..8f2c033a90a5 100644 --- a/receiver/iisreceiver/factory.go +++ b/receiver/iisreceiver/factory.go @@ -21,7 +21,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } diff --git a/receiver/iisreceiver/factory_test.go b/receiver/iisreceiver/factory_test.go index df9e9eea6b97..2adc27573076 100644 --- a/receiver/iisreceiver/factory_test.go +++ b/receiver/iisreceiver/factory_test.go @@ -24,7 +24,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 60 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/iisreceiver/factory_windows.go b/receiver/iisreceiver/factory_windows.go index 3b730611d722..225a03344cda 100644 --- a/receiver/iisreceiver/factory_windows.go +++ b/receiver/iisreceiver/factory_windows.go @@ -33,7 +33,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, nextConsumer, + &cfg.ControllerConfig, params, nextConsumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index 1eeb850c4259..5ecfaa4b51d6 100644 --- a/receiver/iisreceiver/go.mod +++ b/receiver/iisreceiver/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -70,15 +70,15 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/testcontainers/testcontainers-go v0.27.0 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/iisreceiver/go.sum b/receiver/iisreceiver/go.sum index 67c869e0c65e..901bcc3fa296 100644 --- a/receiver/iisreceiver/go.sum +++ b/receiver/iisreceiver/go.sum @@ -114,8 +114,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -140,22 +140,22 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -203,7 +203,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index 2cb99de2793b..c9b7f51a6ae4 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -10,12 +10,12 @@ require ( github.com/influxdata/line-protocol/v2 v2.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -56,17 +56,17 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index 8a9f913186ef..edc44df348fd 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -118,40 +118,40 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go index c2c019559ef0..97999b6812b1 100644 --- a/receiver/jaegerreceiver/config_test.go +++ b/receiver/jaegerreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:9876", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, ThriftHTTP: &confighttp.ServerConfig{ @@ -70,7 +70,7 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, ThriftHTTP: &confighttp.ServerConfig{ @@ -94,7 +94,7 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:9876", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, ThriftCompact: &ProtocolUDP{ @@ -111,10 +111,10 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:9876", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "/test.crt", KeyFile: "/test.key", }, @@ -204,7 +204,7 @@ func TestInvalidConfig(t *testing.T) { cfg.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "1234", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } }, diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index 4755cf06653b..0ef2a473cd94 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -76,7 +76,7 @@ func createDefaultConfig() component.Config { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: localhostgate.EndpointForPort(defaultGRPCPort), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, ThriftHTTP: &confighttp.ServerConfig{ diff --git a/receiver/jaegerreceiver/factory_test.go b/receiver/jaegerreceiver/factory_test.go index aba1cb248e5d..92c45a910c10 100644 --- a/receiver/jaegerreceiver/factory_test.go +++ b/receiver/jaegerreceiver/factory_test.go @@ -42,7 +42,7 @@ func TestCreateReceiver(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } set := receivertest.NewNopCreateSettings() @@ -83,7 +83,7 @@ func TestCreateDefaultGRPCEndpoint(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } set := receivertest.NewNopCreateSettings() @@ -100,10 +100,10 @@ func TestCreateTLSGPRCEndpoint(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, @@ -121,8 +121,8 @@ func TestCreateTLSThriftHTTPEndpoint(t *testing.T) { cfg.(*Config).Protocols.ThriftHTTP = &confighttp.ServerConfig{ Endpoint: "0.0.0.0:14268", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index 48e9e7b07d5b..b98c00a0fa0e 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -9,17 +9,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -41,6 +41,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -59,14 +60,14 @@ require ( github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 668653b4da4e..5900ae6bba3b 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -38,6 +38,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= @@ -124,44 +126,44 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= diff --git a/receiver/jaegerreceiver/trace_receiver.go b/receiver/jaegerreceiver/trace_receiver.go index bcdce678b8ec..ccfcf4eb6f66 100644 --- a/receiver/jaegerreceiver/trace_receiver.go +++ b/receiver/jaegerreceiver/trace_receiver.go @@ -398,7 +398,7 @@ func (jr *jReceiver) startCollector(ctx context.Context, host component.Host) er if jr.config.GRPCServerConfig.NetAddr.Endpoint != "" { var err error - jr.grpc, err = jr.config.GRPCServerConfig.ToServer(host, jr.settings.TelemetrySettings) + jr.grpc, err = jr.config.GRPCServerConfig.ToServerContext(ctx, host, jr.settings.TelemetrySettings) if err != nil { return fmt.Errorf("failed to build the options for the Jaeger gRPC Collector: %w", err) } diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index 60987e7d914c..50de4cb2d787 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -144,7 +144,7 @@ func TestGRPCReception(t *testing.T) { GRPCServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, } @@ -188,8 +188,8 @@ func TestGRPCReception(t *testing.T) { func TestGRPCReceptionWithTLS(t *testing.T) { // prepare - tlsCreds := &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + tlsCreds := &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: filepath.Join("testdata", "server.crt"), KeyFile: filepath.Join("testdata", "server.key"), }, @@ -198,7 +198,7 @@ func TestGRPCReceptionWithTLS(t *testing.T) { grpcServerSettings := configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, TLSSetting: tlsCreds, } @@ -339,7 +339,7 @@ func TestSampling(t *testing.T) { config := &configuration{ GRPCServerConfig: configgrpc.ServerConfig{NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }}, } sink := new(consumertest.TracesSink) diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index cdfe2ef5681d..5b5f85cc36b2 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -9,14 +9,14 @@ require ( github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -83,20 +83,20 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index 317fe281fc54..908ecd906ba4 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -1,7 +1,3 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= @@ -18,8 +14,6 @@ github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqy github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= 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/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw= github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= @@ -39,8 +33,6 @@ github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= 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= @@ -164,52 +156,52 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -255,8 +247,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -290,8 +280,6 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= diff --git a/receiver/jmxreceiver/receiver.go b/receiver/jmxreceiver/receiver.go index 849ca0258fe4..8b405f7c741e 100644 --- a/receiver/jmxreceiver/receiver.go +++ b/receiver/jmxreceiver/receiver.go @@ -148,7 +148,7 @@ func (jmx *jmxMetricReceiver) buildOTLPReceiver() (receiver.Metrics, error) { factory := otlpreceiver.NewFactory() config := factory.CreateDefaultConfig().(*otlpreceiver.Config) - config.GRPC.NetAddr = confignet.AddrConfig{Endpoint: endpoint, Transport: "tcp"} + config.GRPC.NetAddr = confignet.AddrConfig{Endpoint: endpoint, Transport: confignet.TransportTypeTCP} config.HTTP = nil return factory.CreateMetricsReceiver(context.Background(), jmx.params, config, jmx.nextConsumer) diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index ac4ab1eee01b..47be3c919af4 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -43,11 +44,11 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -57,7 +58,7 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index 0098316f1556..98847917285a 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -26,6 +26,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -79,24 +81,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -119,8 +121,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -162,8 +164,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index df0d9e0ba2ad..bef364de4b94 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -16,24 +16,23 @@ require ( github.com/openshift/api v3.9.0+incompatible github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -54,7 +53,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -84,20 +83,20 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index ad483ee52292..e913c9ed780c 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -8,15 +8,10 @@ cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0 h1:3ithwDMr7/3vpAMXiH+ZQnYbuIsh+OPhUPMFC9enmn0= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -54,8 +49,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -76,8 +69,6 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -142,8 +133,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -316,50 +307,50 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -665,14 +656,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index 2bfd291f4555..d7ffde84c79b 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -5,18 +5,18 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -32,7 +32,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -58,8 +58,8 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index c8897e5da1e7..465bd4b3db8c 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -115,8 +115,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -265,22 +265,22 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -565,14 +565,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/receiver/k8sobjectsreceiver/go.mod b/receiver/k8sobjectsreceiver/go.mod index ead287a7e0da..e0b576ee3a3f 100644 --- a/receiver/k8sobjectsreceiver/go.mod +++ b/receiver/k8sobjectsreceiver/go.mod @@ -9,22 +9,21 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -45,7 +44,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -78,20 +77,20 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -113,7 +112,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/receiver/k8sobjectsreceiver/go.sum b/receiver/k8sobjectsreceiver/go.sum index b55b4c555d67..68d8f7029de1 100644 --- a/receiver/k8sobjectsreceiver/go.sum +++ b/receiver/k8sobjectsreceiver/go.sum @@ -8,15 +8,10 @@ cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0 h1:3ithwDMr7/3vpAMXiH+ZQnYbuIsh+OPhUPMFC9enmn0= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -54,8 +49,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -76,8 +69,6 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -142,8 +133,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -314,50 +305,50 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -664,14 +655,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/receiver/kafkametricsreceiver/config.go b/receiver/kafkametricsreceiver/config.go index a63e0fc119a6..ab71492e10b3 100644 --- a/receiver/kafkametricsreceiver/config.go +++ b/receiver/kafkametricsreceiver/config.go @@ -12,7 +12,7 @@ import ( // Config represents user settings for kafkametrics receiver type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` // The list of kafka brokers (default localhost:9092) Brokers []string `mapstructure:"brokers"` diff --git a/receiver/kafkametricsreceiver/config_test.go b/receiver/kafkametricsreceiver/config_test.go index 4751b3a9a35b..38a2c45a5ff7 100644 --- a/receiver/kafkametricsreceiver/config_test.go +++ b/receiver/kafkametricsreceiver/config_test.go @@ -29,14 +29,14 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Brokers: []string{"10.10.10.10:9092"}, - ProtocolVersion: "2.0.0", - TopicMatch: "test_\\w+", - GroupMatch: "test_\\w+", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Brokers: []string{"10.10.10.10:9092"}, + ProtocolVersion: "2.0.0", + TopicMatch: "test_\\w+", + GroupMatch: "test_\\w+", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "ca.pem", CertFile: "cert.pem", KeyFile: "key.pem", diff --git a/receiver/kafkametricsreceiver/factory.go b/receiver/kafkametricsreceiver/factory.go index fca35d2f4ae4..3efc4ef66a77 100644 --- a/receiver/kafkametricsreceiver/factory.go +++ b/receiver/kafkametricsreceiver/factory.go @@ -31,12 +31,12 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Brokers: []string{defaultBroker}, - GroupMatch: defaultGroupMatch, - TopicMatch: defaultTopicMatch, - ClientID: defaultClientID, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Brokers: []string{defaultBroker}, + GroupMatch: defaultGroupMatch, + TopicMatch: defaultTopicMatch, + ClientID: defaultClientID, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index b12ffce19711..0c236e563b59 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -35,6 +35,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect @@ -64,9 +65,9 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index fe9c31fdd4e2..44124adb1753 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -38,6 +38,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -127,24 +129,24 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/kafkametricsreceiver/receiver.go b/receiver/kafkametricsreceiver/receiver.go index 499beac9d1f5..7c8c8dd3e821 100644 --- a/receiver/kafkametricsreceiver/receiver.go +++ b/receiver/kafkametricsreceiver/receiver.go @@ -66,7 +66,7 @@ var newMetricsReceiver = func( } return scraperhelper.NewScraperControllerReceiver( - &config.ScraperControllerSettings, + &config.ControllerConfig, params, consumer, scraperControllerOptions..., diff --git a/receiver/kafkametricsreceiver/receiver_test.go b/receiver/kafkametricsreceiver/receiver_test.go index 5a8ac97222c6..27564342ad76 100644 --- a/receiver/kafkametricsreceiver/receiver_test.go +++ b/receiver/kafkametricsreceiver/receiver_test.go @@ -46,8 +46,8 @@ func TestNewReceiver_invalid_scraper_error(t *testing.T) { func TestNewReceiver_invalid_auth_error(t *testing.T) { c := createDefaultConfig().(*Config) c.Authentication = kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/invalid", }, }, diff --git a/receiver/kafkareceiver/config_test.go b/receiver/kafkareceiver/config_test.go index c59f70d92e74..bc0d8d4974d5 100644 --- a/receiver/kafkareceiver/config_test.go +++ b/receiver/kafkareceiver/config_test.go @@ -41,8 +41,8 @@ func TestLoadConfig(t *testing.T) { GroupID: "otel-collector", InitialOffset: "latest", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "ca.pem", CertFile: "cert.pem", KeyFile: "key.pem", @@ -73,8 +73,8 @@ func TestLoadConfig(t *testing.T) { GroupID: "otel-collector", InitialOffset: "earliest", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "ca.pem", CertFile: "cert.pem", KeyFile: "key.pem", diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index a1c0d81c1f66..5ab8a2caf3b9 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -17,13 +17,13 @@ require ( github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -45,6 +45,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect @@ -74,12 +75,12 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index 1d15d36bced8..b1cd89b3dbc5 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -72,6 +72,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -168,32 +170,32 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/kafkareceiver/kafka_receiver_test.go b/receiver/kafkareceiver/kafka_receiver_test.go index ca4b5f544dc1..25d4dcaa4bca 100644 --- a/receiver/kafkareceiver/kafka_receiver_test.go +++ b/receiver/kafkareceiver/kafka_receiver_test.go @@ -59,8 +59,8 @@ func TestNewTracesReceiver_err_auth_type(t *testing.T) { c := Config{ ProtocolVersion: "2.0.0", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/doesnotexist", }, }, @@ -325,8 +325,8 @@ func TestNewMetricsExporter_err_auth_type(t *testing.T) { c := Config{ ProtocolVersion: "2.0.0", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/doesnotexist", }, }, @@ -580,8 +580,8 @@ func TestNewLogsExporter_err_auth_type(t *testing.T) { c := Config{ ProtocolVersion: "2.0.0", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/doesnotexist", }, }, diff --git a/receiver/kubeletstatsreceiver/config.go b/receiver/kubeletstatsreceiver/config.go index e12577b93fe8..2133938cbb92 100644 --- a/receiver/kubeletstatsreceiver/config.go +++ b/receiver/kubeletstatsreceiver/config.go @@ -22,7 +22,7 @@ import ( var _ component.Config = (*Config)(nil) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` kube.ClientConfig `mapstructure:",squash"` confignet.TCPAddrConfig `mapstructure:",squash"` diff --git a/receiver/kubeletstatsreceiver/config_test.go b/receiver/kubeletstatsreceiver/config_test.go index fe5f055413e1..f588fb56e5bd 100644 --- a/receiver/kubeletstatsreceiver/config_test.go +++ b/receiver/kubeletstatsreceiver/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "default"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: duration, InitialDelay: time.Second, }, @@ -58,7 +58,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "tls"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: duration, InitialDelay: time.Second, }, @@ -69,7 +69,7 @@ func TestLoadConfig(t *testing.T) { APIConfig: k8sconfig.APIConfig{ AuthType: "tls", }, - TLSSetting: configtls.TLSSetting{ + Config: configtls.Config{ CAFile: "/path/to/ca.crt", CertFile: "/path/to/apiserver.crt", KeyFile: "/path/to/apiserver.key", @@ -87,7 +87,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "sa"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: duration, InitialDelay: time.Second, }, @@ -108,7 +108,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "metadata"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: duration, InitialDelay: time.Second, }, @@ -132,7 +132,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "metric_groups"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 20 * time.Second, InitialDelay: time.Second, }, @@ -152,7 +152,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "metadata_with_k8s_api"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: duration, InitialDelay: time.Second, }, @@ -256,7 +256,7 @@ func TestGetReceiverOptions(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/kubeletstatsreceiver/factory.go b/receiver/kubeletstatsreceiver/factory.go index 390220f12011..11131f109f14 100644 --- a/receiver/kubeletstatsreceiver/factory.go +++ b/receiver/kubeletstatsreceiver/factory.go @@ -38,11 +38,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - scs := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scs := scraperhelper.NewDefaultControllerConfig() scs.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: scs, + ControllerConfig: scs, ClientConfig: kube.ClientConfig{ APIConfig: k8sconfig.APIConfig{ AuthType: k8sconfig.AuthTypeTLS, @@ -73,7 +73,7 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, set, consumer, scraperhelper.AddScraper(scrp)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, set, consumer, scraperhelper.AddScraper(scrp)) } func restClient(logger *zap.Logger, cfg *Config) (kubelet.RestClient, error) { diff --git a/receiver/kubeletstatsreceiver/factory_test.go b/receiver/kubeletstatsreceiver/factory_test.go index 1bc8b23ce4ef..24ffa9cf57fa 100644 --- a/receiver/kubeletstatsreceiver/factory_test.go +++ b/receiver/kubeletstatsreceiver/factory_test.go @@ -113,7 +113,7 @@ func TestRestClientErr(t *testing.T) { func tlsConfig() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, @@ -121,7 +121,7 @@ func tlsConfig() *Config { APIConfig: k8sconfig.APIConfig{ AuthType: "tls", }, - TLSSetting: configtls.TLSSetting{ + Config: configtls.Config{ CAFile: "testdata/testcert.crt", CertFile: "testdata/testcert.crt", KeyFile: "testdata/testkey.key", @@ -178,7 +178,7 @@ func TestCustomUnmarshaller(t *testing.T) { args: args{ componentParser: confmap.New(), intoCfg: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, @@ -189,7 +189,7 @@ func TestCustomUnmarshaller(t *testing.T) { "collection_interval": 20 * time.Second, }, result: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 20 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 137da8c0f907..2fbb526a4eee 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -11,27 +11,26 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 - k8s.io/kubelet v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 + k8s.io/kubelet v0.29.3 ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -52,7 +51,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -85,18 +84,18 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 55379b1fcbe9..ea315a8a892a 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -8,15 +8,10 @@ cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0 h1:3ithwDMr7/3vpAMXiH+ZQnYbuIsh+OPhUPMFC9enmn0= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -54,8 +49,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -76,8 +69,6 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -142,8 +133,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -314,50 +305,50 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -664,14 +655,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -683,8 +674,8 @@ k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubelet v0.29.2 h1:bQ2StqkUqPCFNLtGLsb3v3O2LKQHXNMju537zOGboRg= -k8s.io/kubelet v0.29.2/go.mod h1:i5orNPqW/fAMrqptbCXFW/vLBBP12TZZc41IrrvF7SY= +k8s.io/kubelet v0.29.3 h1:X9h0ZHzc+eUeNTaksbN0ItHyvGhQ7Z0HPjnQD2oHdwU= +k8s.io/kubelet v0.29.3/go.mod h1:jDiGuTkFOUynyBKzOoC1xRSWlgAZ9UPcTYeFyjr6vas= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= diff --git a/receiver/lokireceiver/config_test.go b/receiver/lokireceiver/config_test.go index c8e8eed0286f..181b6e41d749 100644 --- a/receiver/lokireceiver/config_test.go +++ b/receiver/lokireceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:3600", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, HTTP: &confighttp.ServerConfig{ @@ -51,7 +51,7 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:4600", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, HTTP: &confighttp.ServerConfig{ diff --git a/receiver/lokireceiver/factory.go b/receiver/lokireceiver/factory.go index e61cce38e955..2958e568314e 100644 --- a/receiver/lokireceiver/factory.go +++ b/receiver/lokireceiver/factory.go @@ -40,7 +40,7 @@ func createDefaultConfig() component.Config { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: localhostgate.EndpointForPort(defaultGRPCPort), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, HTTP: &confighttp.ServerConfig{ diff --git a/receiver/lokireceiver/factory_test.go b/receiver/lokireceiver/factory_test.go index 4422d93947d1..aba939f46f13 100644 --- a/receiver/lokireceiver/factory_test.go +++ b/receiver/lokireceiver/factory_test.go @@ -28,7 +28,7 @@ func TestCreateReceiver(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: defaultGRPCBindEndpoint, - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } set := receivertest.NewNopCreateSettings() diff --git a/receiver/lokireceiver/go.mod b/receiver/lokireceiver/go.mod index 778fbeffdcc5..ff7c52d16bfe 100644 --- a/receiver/lokireceiver/go.mod +++ b/receiver/lokireceiver/go.mod @@ -15,20 +15,20 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.96.0 // indirect github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/zap v1.27.0 google.golang.org/grpc v1.62.1 ) require ( - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -47,6 +47,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -66,17 +67,17 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/prometheus v0.48.1 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/lokireceiver/go.sum b/receiver/lokireceiver/go.sum index 35f0c5186a87..42aa626badfb 100644 --- a/receiver/lokireceiver/go.sum +++ b/receiver/lokireceiver/go.sum @@ -1,7 +1,3 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 h1:9kDVnTz3vbfweTqAUmk/a/pH5pWFCHtvRpHYC0G/dcA= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0/go.mod h1:3Ug6Qzto9anB6mGlEdgYMDF5zHQ+wwhEaYR4s17PHMw= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI= @@ -20,16 +16,12 @@ github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMU github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= 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/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= 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= @@ -132,46 +124,46 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/lokireceiver/loki.go b/receiver/lokireceiver/loki.go index 374894fc2ef3..c51810f7357b 100644 --- a/receiver/lokireceiver/loki.go +++ b/receiver/lokireceiver/loki.go @@ -69,10 +69,6 @@ func newLokiReceiver(conf *Config, nextConsumer consumer.Logs, settings receiver return nil, err } - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - if conf.HTTP != nil { r.httpMux = http.NewServeMux() r.httpMux.HandleFunc("/loki/api/v1/push", func(resp http.ResponseWriter, req *http.Request) { @@ -106,7 +102,7 @@ func (r *lokiReceiver) startProtocolsServers(ctx context.Context, host component } if r.conf.GRPC != nil { - r.serverGRPC, err = r.conf.GRPC.ToServer(host, r.settings.TelemetrySettings) + r.serverGRPC, err = r.conf.GRPC.ToServerContext(ctx, host, r.settings.TelemetrySettings) if err != nil { return fmt.Errorf("failed create grpc server error: %w", err) } diff --git a/receiver/lokireceiver/loki_test.go b/receiver/lokireceiver/loki_test.go index bb723a8d72e3..50507b86861e 100644 --- a/receiver/lokireceiver/loki_test.go +++ b/receiver/lokireceiver/loki_test.go @@ -91,7 +91,7 @@ func startGRPCServer(t *testing.T) (*grpc.ClientConn, *consumertest.LogsSink) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, diff --git a/receiver/memcachedreceiver/config.go b/receiver/memcachedreceiver/config.go index 74b58c95a8f2..9c8cb093f7c6 100644 --- a/receiver/memcachedreceiver/config.go +++ b/receiver/memcachedreceiver/config.go @@ -11,8 +11,8 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confignet.AddrConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confignet.AddrConfig `mapstructure:",squash"` // MetricsBuilderConfig allows customizing scraped metrics/attributes representation. metadata.MetricsBuilderConfig `mapstructure:",squash"` diff --git a/receiver/memcachedreceiver/factory.go b/receiver/memcachedreceiver/factory.go index 9ae794d31fd3..ad0874253c41 100644 --- a/receiver/memcachedreceiver/factory.go +++ b/receiver/memcachedreceiver/factory.go @@ -31,12 +31,12 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultCollectionInterval cfg.Timeout = defaultTimeout return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, AddrConfig: confignet.AddrConfig{ Endpoint: defaultEndpoint, }, @@ -60,7 +60,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/memcachedreceiver/factory_test.go b/receiver/memcachedreceiver/factory_test.go index 09087e04fa63..188c843a1f60 100644 --- a/receiver/memcachedreceiver/factory_test.go +++ b/receiver/memcachedreceiver/factory_test.go @@ -35,7 +35,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 91158a1e557b..afc28431504e 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -10,12 +10,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -71,14 +71,14 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index b4094a0b4a29..34ab03913828 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -116,8 +116,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -142,24 +142,24 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -207,7 +207,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/mongodbatlasreceiver/access_logs_integration_test.go b/receiver/mongodbatlasreceiver/access_logs_integration_test.go index a8f39163136e..d6d798a8dc9d 100644 --- a/receiver/mongodbatlasreceiver/access_logs_integration_test.go +++ b/receiver/mongodbatlasreceiver/access_logs_integration_test.go @@ -23,7 +23,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/metadata" ) func TestAccessLogsIntegration(t *testing.T) { @@ -62,7 +61,7 @@ func TestAccessLogsIntegration(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), Logs: LogConfig{ Enabled: true, Projects: []*LogsProjectConfig{ diff --git a/receiver/mongodbatlasreceiver/access_logs_test.go b/receiver/mongodbatlasreceiver/access_logs_test.go index eba40bac80c6..0d7a059277f1 100644 --- a/receiver/mongodbatlasreceiver/access_logs_test.go +++ b/receiver/mongodbatlasreceiver/access_logs_test.go @@ -26,7 +26,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/metadata" ) var ( @@ -152,9 +151,9 @@ func TestAccessLogsRetrieval(t *testing.T) { name: "basic", config: func() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Logs: LogConfig{ Enabled: true, Projects: []*LogsProjectConfig{ @@ -206,9 +205,9 @@ func TestAccessLogsRetrieval(t *testing.T) { name: "multiple page read all", config: func() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Logs: LogConfig{ Enabled: true, Projects: []*LogsProjectConfig{ @@ -243,9 +242,9 @@ func TestAccessLogsRetrieval(t *testing.T) { name: "multiple page break early based on timestamp", config: func() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Logs: LogConfig{ Enabled: true, Projects: []*LogsProjectConfig{ @@ -304,9 +303,9 @@ func TestCheckpointing(t *testing.T) { } config := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Logs: LogConfig{ Enabled: true, Projects: []*LogsProjectConfig{pc}, diff --git a/receiver/mongodbatlasreceiver/alerts.go b/receiver/mongodbatlasreceiver/alerts.go index a1fd7b697885..1aae71729e59 100644 --- a/receiver/mongodbatlasreceiver/alerts.go +++ b/receiver/mongodbatlasreceiver/alerts.go @@ -63,7 +63,7 @@ type alertsReceiver struct { secret string server *http.Server mode string - tlsSettings *configtls.TLSServerSetting + tlsSettings *configtls.ServerConfig consumer consumer.Logs wg *sync.WaitGroup diff --git a/receiver/mongodbatlasreceiver/alerts_integration_test.go b/receiver/mongodbatlasreceiver/alerts_integration_test.go index b884fd94468f..e5bb9a424742 100644 --- a/receiver/mongodbatlasreceiver/alerts_integration_test.go +++ b/receiver/mongodbatlasreceiver/alerts_integration_test.go @@ -128,8 +128,8 @@ func TestAlertsReceiverTLS(t *testing.T) { Secret: testSecret, Mode: alertModeListen, Endpoint: testAddr, - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: filepath.Join("testdata", "alerts", "cert", "server.crt"), KeyFile: filepath.Join("testdata", "alerts", "cert", "server.key"), }, diff --git a/receiver/mongodbatlasreceiver/alerts_test.go b/receiver/mongodbatlasreceiver/alerts_test.go index 63e03d621b71..149cd7afd9e0 100644 --- a/receiver/mongodbatlasreceiver/alerts_test.go +++ b/receiver/mongodbatlasreceiver/alerts_test.go @@ -33,7 +33,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/model" ) @@ -449,9 +448,9 @@ func TestAlertsRetrieval(t *testing.T) { name: "default", config: func() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Alerts: AlertConfig{ Mode: alertModePoll, Projects: []*ProjectConfig{ @@ -495,9 +494,9 @@ func TestAlertsRetrieval(t *testing.T) { name: "project cluster inclusions", config: func() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Alerts: AlertConfig{ Mode: alertModePoll, Projects: []*ProjectConfig{ @@ -523,9 +522,9 @@ func TestAlertsRetrieval(t *testing.T) { name: "hostname and port missing", config: func() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Alerts: AlertConfig{ Mode: alertModePoll, Projects: []*ProjectConfig{ diff --git a/receiver/mongodbatlasreceiver/config.go b/receiver/mongodbatlasreceiver/config.go index aebe2cd86935..ce16f22cbd55 100644 --- a/receiver/mongodbatlasreceiver/config.go +++ b/receiver/mongodbatlasreceiver/config.go @@ -23,25 +23,25 @@ import ( var _ component.Config = (*Config)(nil) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - PublicKey string `mapstructure:"public_key"` - PrivateKey configopaque.String `mapstructure:"private_key"` - Granularity string `mapstructure:"granularity"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` - Projects []*ProjectConfig `mapstructure:"projects"` - Alerts AlertConfig `mapstructure:"alerts"` - Events *EventsConfig `mapstructure:"events"` - Logs LogConfig `mapstructure:"logs"` - BackOffConfig configretry.BackOffConfig `mapstructure:"retry_on_failure"` - StorageID *component.ID `mapstructure:"storage"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + PublicKey string `mapstructure:"public_key"` + PrivateKey configopaque.String `mapstructure:"private_key"` + Granularity string `mapstructure:"granularity"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` + Projects []*ProjectConfig `mapstructure:"projects"` + Alerts AlertConfig `mapstructure:"alerts"` + Events *EventsConfig `mapstructure:"events"` + Logs LogConfig `mapstructure:"logs"` + BackOffConfig configretry.BackOffConfig `mapstructure:"retry_on_failure"` + StorageID *component.ID `mapstructure:"storage"` } type AlertConfig struct { - Enabled bool `mapstructure:"enabled"` - Endpoint string `mapstructure:"endpoint"` - Secret configopaque.String `mapstructure:"secret"` - TLS *configtls.TLSServerSetting `mapstructure:"tls"` - Mode string `mapstructure:"mode"` + Enabled bool `mapstructure:"enabled"` + Endpoint string `mapstructure:"endpoint"` + Secret configopaque.String `mapstructure:"secret"` + TLS *configtls.ServerConfig `mapstructure:"tls"` + Mode string `mapstructure:"mode"` // these parameters are only relevant in retrieval mode Projects []*ProjectConfig `mapstructure:"projects"` diff --git a/receiver/mongodbatlasreceiver/config_test.go b/receiver/mongodbatlasreceiver/config_test.go index 183d58290053..a4bbc8f92526 100644 --- a/receiver/mongodbatlasreceiver/config_test.go +++ b/receiver/mongodbatlasreceiver/config_test.go @@ -28,7 +28,7 @@ func TestValidate(t *testing.T) { { name: "Empty config", input: Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -40,7 +40,7 @@ func TestValidate(t *testing.T) { Secret: "some_secret", Mode: alertModeListen, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -51,7 +51,7 @@ func TestValidate(t *testing.T) { Secret: "some_secret", Mode: alertModeListen, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoEndpoint.Error(), }, @@ -63,7 +63,7 @@ func TestValidate(t *testing.T) { Endpoint: "0.0.0.0:7706", Mode: alertModeListen, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoSecret.Error(), }, @@ -76,7 +76,7 @@ func TestValidate(t *testing.T) { Secret: "some_secret", Mode: alertModeListen, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: "failed to split endpoint into 'host:port' pair", }, @@ -88,13 +88,13 @@ func TestValidate(t *testing.T) { Endpoint: "0.0.0.0:7706", Secret: "some_secret", Mode: alertModeListen, - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "some_cert_file", }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoKey.Error(), }, @@ -106,13 +106,13 @@ func TestValidate(t *testing.T) { Endpoint: "0.0.0.0:7706", Secret: "some_secret", Mode: alertModeListen, - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ KeyFile: "some_key_file", }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoCert.Error(), }, @@ -124,7 +124,7 @@ func TestValidate(t *testing.T) { Name: "Project1", }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -140,7 +140,7 @@ func TestValidate(t *testing.T) { ExcludeClusters: []string{"Cluster1"}, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -153,7 +153,7 @@ func TestValidate(t *testing.T) { ExcludeClusters: []string{"Cluster2"}, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errClusterConfig.Error(), }, @@ -171,7 +171,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -180,7 +180,7 @@ func TestValidate(t *testing.T) { Logs: LogConfig{ Enabled: true, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoProjects.Error(), }, @@ -200,7 +200,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errClusterConfig.Error(), }, @@ -219,7 +219,7 @@ func TestValidate(t *testing.T) { }, PageSize: defaultAlertsPageSize, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errClusterConfig.Error(), }, @@ -232,7 +232,7 @@ func TestValidate(t *testing.T) { Projects: []*ProjectConfig{}, PageSize: defaultAlertsPageSize, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoProjects.Error(), }, @@ -249,7 +249,7 @@ func TestValidate(t *testing.T) { }, PageSize: defaultAlertsPageSize, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -260,7 +260,7 @@ func TestValidate(t *testing.T) { Mode: "invalid type", Projects: []*ProjectConfig{}, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoModeRecognized.Error(), }, @@ -277,7 +277,7 @@ func TestValidate(t *testing.T) { }, PageSize: -1, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errPageSizeIncorrect.Error(), }, @@ -287,7 +287,7 @@ func TestValidate(t *testing.T) { Events: &EventsConfig{ Projects: []*ProjectConfig{}, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoEvents.Error(), }, @@ -308,7 +308,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -330,7 +330,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errClusterConfig.Error(), }, diff --git a/receiver/mongodbatlasreceiver/factory.go b/receiver/mongodbatlasreceiver/factory.go index ac36ff33ee36..52fdf59e6185 100644 --- a/receiver/mongodbatlasreceiver/factory.go +++ b/receiver/mongodbatlasreceiver/factory.go @@ -47,7 +47,7 @@ func createMetricsReceiver( return nil, fmt.Errorf("unable to create a MongoDB Atlas Scaper instance: %w", err) } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(ms)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(ms)) } func createCombinedLogReceiver( @@ -95,10 +95,10 @@ func createCombinedLogReceiver( func createDefaultConfig() component.Config { c := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), Alerts: AlertConfig{ Enabled: defaultAlertsEnabled, Mode: alertModeListen, @@ -113,6 +113,6 @@ func createDefaultConfig() component.Config { } // reset default of 1 minute to be 3 minutes in order to avoid null values for some metrics that do not publish // more frequently - c.ScraperControllerSettings.CollectionInterval = 3 * time.Minute + c.ControllerConfig.CollectionInterval = 3 * time.Minute return c } diff --git a/receiver/mongodbatlasreceiver/factory_test.go b/receiver/mongodbatlasreceiver/factory_test.go index 7bf3d01c6076..f8f2d52ccf53 100644 --- a/receiver/mongodbatlasreceiver/factory_test.go +++ b/receiver/mongodbatlasreceiver/factory_test.go @@ -29,7 +29,7 @@ func TestBadAlertsReceiver(t *testing.T) { cfg := conf.(*Config) cfg.Alerts.Enabled = true - cfg.Alerts.TLS = &configtls.TLSServerSetting{ + cfg.Alerts.TLS = &configtls.ServerConfig{ ClientCAFile: "/not/a/file", } params := receivertest.NewNopCreateSettings() diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index 7b738f49be5d..14bc0f4c506d 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -12,15 +12,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 go.mongodb.org/atlas v0.36.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -40,6 +40,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-querystring v1.1.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -60,9 +61,9 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -70,7 +71,7 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index fa8b989dd062..63b768b1bfa8 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -33,6 +33,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -90,30 +92,30 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.mongodb.org/atlas v0.36.0 h1:m05S3AO7zkl+bcG1qaNsEKBnAqnKx2FDwLooHpIG3j4= go.mongodb.org/atlas v0.36.0/go.mod h1:nfPldE9dSama6G2IbIzmEza02Ly7yFZjMMVscaM0uEc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -136,8 +138,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -179,8 +181,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/receiver/mongodbatlasreceiver/receiver_test.go b/receiver/mongodbatlasreceiver/receiver_test.go index c592890f3984..9ade727feb20 100644 --- a/receiver/mongodbatlasreceiver/receiver_test.go +++ b/receiver/mongodbatlasreceiver/receiver_test.go @@ -17,7 +17,7 @@ import ( func TestDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - require.Equal(t, cfg.(*Config).ScraperControllerSettings.CollectionInterval, 3*time.Minute) + require.Equal(t, cfg.(*Config).ControllerConfig.CollectionInterval, 3*time.Minute) recv, err := createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) require.NotNil(t, recv, "receiver creation failed") diff --git a/receiver/mongodbreceiver/config.go b/receiver/mongodbreceiver/config.go index 73f6f86e3cf7..38f6f1868b0a 100644 --- a/receiver/mongodbreceiver/config.go +++ b/receiver/mongodbreceiver/config.go @@ -20,8 +20,8 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + configtls.ClientConfig `mapstructure:"tls,omitempty"` // MetricsBuilderConfig defines which metrics/attributes to enable for the scraper metadata.MetricsBuilderConfig `mapstructure:",squash"` Hosts []confignet.AddrConfig `mapstructure:"hosts"` diff --git a/receiver/mongodbreceiver/config_test.go b/receiver/mongodbreceiver/config_test.go index 1d8673c8a676..3bf4fd70c7f5 100644 --- a/receiver/mongodbreceiver/config_test.go +++ b/receiver/mongodbreceiver/config_test.go @@ -80,15 +80,16 @@ func TestValidate(t *testing.T) { for _, ep := range tc.endpoints { hosts = append(hosts, confignet.AddrConfig{ - Endpoint: ep, + Endpoint: ep, + Transport: confignet.TransportTypeTCP, }) } cfg := &Config{ - Username: tc.username, - Password: configopaque.String(tc.password), - Hosts: hosts, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Username: tc.username, + Password: configopaque.String(tc.password), + Hosts: hosts, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), } err := component.ValidateConfig(cfg) if tc.expected == nil { @@ -103,13 +104,13 @@ func TestValidate(t *testing.T) { func TestBadTLSConfigs(t *testing.T) { testCases := []struct { desc string - tlsConfig configtls.TLSClientSetting + tlsConfig configtls.ClientConfig expectError bool }{ { desc: "CA file not found", - tlsConfig: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + tlsConfig: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "not/a/real/file.pem", }, Insecure: false, @@ -120,8 +121,8 @@ func TestBadTLSConfigs(t *testing.T) { }, { desc: "no issues", - tlsConfig: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{}, + tlsConfig: configtls.ClientConfig{ + TLSSetting: configtls.Config{}, Insecure: false, InsecureSkipVerify: false, ServerName: "", @@ -136,11 +137,12 @@ func TestBadTLSConfigs(t *testing.T) { Password: "pword", Hosts: []confignet.AddrConfig{ { - Endpoint: "localhost:27017", + Endpoint: "localhost:27017", + Transport: confignet.TransportTypeTCP, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - TLSClientSetting: tc.tlsConfig, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + ClientConfig: tc.tlsConfig, } err := component.ValidateConfig(cfg) if tc.expectError { @@ -184,9 +186,9 @@ func TestOptionsTLS(t *testing.T) { Endpoint: "localhost:27017", }, }, - TLSClientSetting: configtls.TLSClientSetting{ + ClientConfig: configtls.ClientConfig{ Insecure: false, - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.Config{ CAFile: caFile, }, }, diff --git a/receiver/mongodbreceiver/factory.go b/receiver/mongodbreceiver/factory.go index 8a730dfde49f..48034feac7de 100644 --- a/receiver/mongodbreceiver/factory.go +++ b/receiver/mongodbreceiver/factory.go @@ -27,15 +27,16 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Timeout: time.Minute, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Timeout: time.Minute, Hosts: []confignet.AddrConfig{ { - Endpoint: "localhost:27017", + Endpoint: "localhost:27017", + Transport: confignet.TransportTypeTCP, }, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - TLSClientSetting: configtls.TLSClientSetting{}, + ClientConfig: configtls.ClientConfig{}, } } @@ -56,7 +57,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/mongodbreceiver/factory_test.go b/receiver/mongodbreceiver/factory_test.go index 6eb20f234a55..e1b778b0b49a 100644 --- a/receiver/mongodbreceiver/factory_test.go +++ b/receiver/mongodbreceiver/factory_test.go @@ -34,7 +34,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index 024a7c4208d7..e3517b33862c 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -11,15 +11,15 @@ require ( github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 go.mongodb.org/mongo-driver v1.14.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -79,7 +79,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect @@ -89,9 +89,9 @@ require ( github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index c602ae249fd1..b39cfd9e20aa 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -122,8 +122,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -159,32 +159,32 @@ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7Jul 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= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80= go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -243,7 +243,6 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/receiver/mysqlreceiver/client.go b/receiver/mysqlreceiver/client.go index 60a838a0458f..6fb000566b1c 100644 --- a/receiver/mysqlreceiver/client.go +++ b/receiver/mysqlreceiver/client.go @@ -180,7 +180,7 @@ func newMySQLClient(conf *Config) (client, error) { driverConf := mysql.Config{ User: conf.Username, Passwd: string(conf.Password), - Net: conf.Transport, + Net: string(conf.Transport), Addr: conf.Endpoint, DBName: conf.Database, AllowNativePasswords: conf.AllowNativePasswords, diff --git a/receiver/mysqlreceiver/config.go b/receiver/mysqlreceiver/config.go index 337891bfee15..a6e6ab6320a8 100644 --- a/receiver/mysqlreceiver/config.go +++ b/receiver/mysqlreceiver/config.go @@ -22,15 +22,15 @@ const ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - Username string `mapstructure:"username,omitempty"` - Password configopaque.String `mapstructure:"password,omitempty"` - Database string `mapstructure:"database,omitempty"` - AllowNativePasswords bool `mapstructure:"allow_native_passwords,omitempty"` - confignet.AddrConfig `mapstructure:",squash"` - TLS configtls.TLSClientSetting `mapstructure:"tls,omitempty"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` - StatementEvents StatementEventsConfig `mapstructure:"statement_events"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + Username string `mapstructure:"username,omitempty"` + Password configopaque.String `mapstructure:"password,omitempty"` + Database string `mapstructure:"database,omitempty"` + AllowNativePasswords bool `mapstructure:"allow_native_passwords,omitempty"` + confignet.AddrConfig `mapstructure:",squash"` + TLS configtls.ClientConfig `mapstructure:"tls,omitempty"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` + StatementEvents StatementEventsConfig `mapstructure:"statement_events"` } type StatementEventsConfig struct { @@ -48,7 +48,7 @@ func (cfg *Config) Unmarshal(componentParser *confmap.Conf) error { // Change the default to Insecure = true as we don't want to break // existing deployments which does not use TLS by default. if !componentParser.IsSet("tls") { - cfg.TLS = configtls.TLSClientSetting{} + cfg.TLS = configtls.ClientConfig{} cfg.TLS.Insecure = true } diff --git a/receiver/mysqlreceiver/factory.go b/receiver/mysqlreceiver/factory.go index 57f4a8abad1d..ce40309a2d9d 100644 --- a/receiver/mysqlreceiver/factory.go +++ b/receiver/mysqlreceiver/factory.go @@ -24,15 +24,15 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, - AllowNativePasswords: true, - Username: "root", + ControllerConfig: cfg, + AllowNativePasswords: true, + Username: "root", AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:3306", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), StatementEvents: StatementEventsConfig{ @@ -60,7 +60,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/mysqlreceiver/factory_test.go b/receiver/mysqlreceiver/factory_test.go index 58641f8ff241..1acab99f3b46 100644 --- a/receiver/mysqlreceiver/factory_test.go +++ b/receiver/mysqlreceiver/factory_test.go @@ -39,7 +39,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index 3ddbeba0561c..3c0b02b3122c 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -10,14 +10,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -75,14 +75,14 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 6ee56b4ea608..ffdd73d23116 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -120,8 +120,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -146,28 +146,28 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -215,7 +215,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/namedpipereceiver/go.mod b/receiver/namedpipereceiver/go.mod index d9b274f0fe92..2990074bb5bf 100644 --- a/receiver/namedpipereceiver/go.mod +++ b/receiver/namedpipereceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -44,11 +45,11 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -57,7 +58,7 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/receiver/namedpipereceiver/go.sum b/receiver/namedpipereceiver/go.sum index 44fe6d9204c1..9744a767d37e 100644 --- a/receiver/namedpipereceiver/go.sum +++ b/receiver/namedpipereceiver/go.sum @@ -28,6 +28,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -81,24 +83,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -121,8 +123,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -164,8 +166,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/receiver/nginxreceiver/config.go b/receiver/nginxreceiver/config.go index 8bb500012cc7..4a81800a208f 100644 --- a/receiver/nginxreceiver/config.go +++ b/receiver/nginxreceiver/config.go @@ -11,7 +11,7 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go index 40e79c14a07d..db6e036d43cf 100644 --- a/receiver/nginxreceiver/factory.go +++ b/receiver/nginxreceiver/factory.go @@ -25,11 +25,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:80/status", Timeout: 10 * time.Second, @@ -53,7 +53,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/nginxreceiver/factory_test.go b/receiver/nginxreceiver/factory_test.go index 0116dcc781b9..caada4c0d15c 100644 --- a/receiver/nginxreceiver/factory_test.go +++ b/receiver/nginxreceiver/factory_test.go @@ -35,7 +35,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 5ab189f0d31a..c9abd99234ff 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -77,21 +77,21 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index 52c167c96bc0..a2911c310375 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -126,8 +126,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -152,40 +152,40 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -235,7 +235,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/nginxreceiver/integration_test.go b/receiver/nginxreceiver/integration_test.go index c87b90023ab1..6ed93f58edc4 100644 --- a/receiver/nginxreceiver/integration_test.go +++ b/receiver/nginxreceiver/integration_test.go @@ -36,7 +36,7 @@ func TestIntegration(t *testing.T) { scraperinttest.WithCustomConfig( func(t *testing.T, cfg component.Config, ci *scraperinttest.ContainerInfo) { rCfg := cfg.(*Config) - rCfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + rCfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond rCfg.Endpoint = fmt.Sprintf("http://%s:%s/status", ci.Host(t), ci.MappedPort(t, nginxPort)) }), scraperinttest.WithCompareOptions( diff --git a/receiver/nginxreceiver/scraper_test.go b/receiver/nginxreceiver/scraper_test.go index 3d4f76110abf..00c391552570 100644 --- a/receiver/nginxreceiver/scraper_test.go +++ b/receiver/nginxreceiver/scraper_test.go @@ -85,8 +85,8 @@ func TestScraperFailedStart(t *testing.T) { sc := newNginxScraper(receivertest.NewNopCreateSettings(), &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:8080", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/receiver/nsxtreceiver/config.go b/receiver/nsxtreceiver/config.go index ea2d8bcd9388..a3ad6a685541 100644 --- a/receiver/nsxtreceiver/config.go +++ b/receiver/nsxtreceiver/config.go @@ -18,11 +18,11 @@ import ( // Config is the configuration for the NSX receiver type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` } // Validate returns if the NSX configuration is valid diff --git a/receiver/nsxtreceiver/config_test.go b/receiver/nsxtreceiver/config_test.go index f03765a819d4..15161f626ed1 100644 --- a/receiver/nsxtreceiver/config_test.go +++ b/receiver/nsxtreceiver/config_test.go @@ -36,7 +36,7 @@ func TestMetricValidation(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "wss://not-supported-websockets", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedError: errors.New("url scheme must be http or https"), }, @@ -46,7 +46,7 @@ func TestMetricValidation(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "\x00", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedError: errors.New("parse"), }, @@ -57,7 +57,7 @@ func TestMetricValidation(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedError: errors.New("username not provided"), }, @@ -68,7 +68,7 @@ func TestMetricValidation(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedError: errors.New("password not provided"), }, diff --git a/receiver/nsxtreceiver/factory.go b/receiver/nsxtreceiver/factory.go index e56f57cdde30..e8e665b8a193 100644 --- a/receiver/nsxtreceiver/factory.go +++ b/receiver/nsxtreceiver/factory.go @@ -28,8 +28,8 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -50,7 +50,7 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/nsxtreceiver/factory_test.go b/receiver/nsxtreceiver/factory_test.go index e05020c8da06..18e023702c5a 100644 --- a/receiver/nsxtreceiver/factory_test.go +++ b/receiver/nsxtreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 820ac2f93d13..1b10ccd57654 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -34,6 +34,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,15 +53,15 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/nsxtreceiver/go.sum b/receiver/nsxtreceiver/go.sum index a71b40588e0c..74ee56b8dcd4 100644 --- a/receiver/nsxtreceiver/go.sum +++ b/receiver/nsxtreceiver/go.sum @@ -30,6 +30,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -82,38 +84,38 @@ github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e/go.mod h1:aR 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index 1aa0d91a25c7..e8af7f509968 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:9090", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, ReadBufferSize: 512 * 1024, }, @@ -47,7 +47,7 @@ func TestLoadConfig(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:55678", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, ReadBufferSize: 512 * 1024, Keepalive: &configgrpc.KeepaliveServerConfig{ @@ -72,7 +72,7 @@ func TestLoadConfig(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:55678", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, MaxRecvMsgSizeMiB: 32, MaxConcurrentStreams: 16, @@ -92,11 +92,11 @@ func TestLoadConfig(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:55678", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, ReadBufferSize: 512 * 1024, - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "test.crt", KeyFile: "test.key", }, @@ -110,7 +110,7 @@ func TestLoadConfig(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:55678", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, ReadBufferSize: 512 * 1024, }, @@ -123,7 +123,7 @@ func TestLoadConfig(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "/tmp/opencensus.sock", - Transport: "unix", + Transport: confignet.TransportTypeUnix, }, ReadBufferSize: 512 * 1024, }, diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index 8ee917bcdf4e..f45c84eeb47f 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: localhostgate.EndpointForPort(grpcPort), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, // We almost write 0 bytes, so no need to tune WriteBufferSize. ReadBufferSize: 512 * 1024, @@ -47,16 +47,10 @@ func createTracesReceiver( cfg component.Config, nextConsumer consumer.Traces, ) (receiver.Traces, error) { - var err error r := receivers.GetOrAdd(cfg, func() component.Component { rCfg := cfg.(*Config) - var recv *ocReceiver - recv, err = newOpenCensusReceiver(rCfg.NetAddr.Transport, rCfg.NetAddr.Endpoint, nil, nil, set, rCfg.buildOptions()...) - return recv + return newOpenCensusReceiver(rCfg, nil, nil, set, rCfg.buildOptions()...) }) - if err != nil { - return nil, err - } r.Unwrap().(*ocReceiver).traceConsumer = nextConsumer return r, nil @@ -68,16 +62,10 @@ func createMetricsReceiver( cfg component.Config, nextConsumer consumer.Metrics, ) (receiver.Metrics, error) { - var err error r := receivers.GetOrAdd(cfg, func() component.Component { rCfg := cfg.(*Config) - var recv *ocReceiver - recv, err = newOpenCensusReceiver(rCfg.NetAddr.Transport, rCfg.NetAddr.Endpoint, nil, nil, set, rCfg.buildOptions()...) - return recv + return newOpenCensusReceiver(rCfg, nil, nil, set, rCfg.buildOptions()...) }) - if err != nil { - return nil, err - } r.Unwrap().(*ocReceiver).metricsConsumer = nextConsumer return r, nil diff --git a/receiver/opencensusreceiver/factory_test.go b/receiver/opencensusreceiver/factory_test.go index 32b560244339..84a07e1971a0 100644 --- a/receiver/opencensusreceiver/factory_test.go +++ b/receiver/opencensusreceiver/factory_test.go @@ -42,7 +42,7 @@ func TestCreateReceiver(t *testing.T) { func TestCreateTracesReceiver(t *testing.T) { defaultNetAddr := confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, } defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: defaultNetAddr, @@ -64,7 +64,7 @@ func TestCreateTracesReceiver(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:112233", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, @@ -86,14 +86,12 @@ func TestCreateTracesReceiver(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { tr, err := createTracesReceiver(ctx, set, tt.cfg, consumertest.NewNop()) + require.NoError(t, err) + err = tr.Start(context.Background(), componenttest.NewNopHost()) if (err != nil) != tt.wantErr { t.Errorf("factory.CreateTracesReceiver() error = %v, wantErr %v", err, tt.wantErr) - return - } - if tr != nil { - require.NoError(t, tr.Start(context.Background(), componenttest.NewNopHost())) - require.NoError(t, tr.Shutdown(context.Background())) } + require.NoError(t, tr.Shutdown(context.Background())) }) } } @@ -101,7 +99,7 @@ func TestCreateTracesReceiver(t *testing.T) { func TestCreateMetricsReceiver(t *testing.T) { defaultNetAddr := confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, } defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: defaultNetAddr, @@ -124,7 +122,7 @@ func TestCreateMetricsReceiver(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "327.0.0.1:1122", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, @@ -152,14 +150,15 @@ func TestCreateMetricsReceiver(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { tc, err := createMetricsReceiver(context.Background(), set, tt.cfg, consumertest.NewNop()) + require.NoError(t, err) + err = tc.Start(context.Background(), componenttest.NewNopHost()) + defer func() { + require.NoError(t, tc.Shutdown(context.Background())) + }() if (err != nil) != tt.wantErr { t.Errorf("factory.CreateMetricsReceiver() error = %v, wantErr %v", err, tt.wantErr) return } - if tc != nil { - require.NoError(t, tc.Start(context.Background(), componenttest.NewNopHost())) - require.NoError(t, tc.Shutdown(context.Background())) - } }) } } diff --git a/receiver/opencensusreceiver/generated_component_test.go b/receiver/opencensusreceiver/generated_component_test.go index 55f390324d6d..5d848da2b2d4 100644 --- a/receiver/opencensusreceiver/generated_component_test.go +++ b/receiver/opencensusreceiver/generated_component_test.go @@ -8,6 +8,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver" @@ -51,5 +52,17 @@ func TestComponentLifecycle(t *testing.T) { err = c.Shutdown(context.Background()) require.NoError(t, err) }) + t.Run(test.name+"-lifecycle", func(t *testing.T) { + firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + host := componenttest.NewNopHost() + require.NoError(t, err) + require.NoError(t, firstRcvr.Start(context.Background(), host)) + require.NoError(t, firstRcvr.Shutdown(context.Background())) + secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + require.NoError(t, secondRcvr.Start(context.Background(), host)) + require.NoError(t, secondRcvr.Shutdown(context.Background())) + }) } } diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index a4cfc39921a1..9dffd91aa839 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -12,14 +12,14 @@ require ( github.com/rs/cors v1.10.1 github.com/soheilhy/cmux v0.1.5 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 @@ -42,6 +42,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.2 // indirect @@ -59,16 +60,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index 6cba35329a29..2136a4b145d5 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -55,6 +55,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -116,42 +118,42 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go b/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go index e4d3bc1110aa..a99bf7b865d3 100644 --- a/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go +++ b/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go @@ -12,7 +12,6 @@ import ( agentmetricspb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/metrics/v1" ocmetrics "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/receiverhelper" @@ -29,9 +28,6 @@ type Receiver struct { // New creates a new ocmetrics.Receiver reference. func New(nextConsumer consumer.Metrics, set receiver.CreateSettings) (*Receiver, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ ReceiverID: set.ID, Transport: receiverTransport, diff --git a/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go b/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go index 8a4211fd1cb0..e9f14d1f002a 100644 --- a/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go +++ b/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go @@ -357,11 +357,8 @@ func ocReceiverOnGRPCServer(t *testing.T, sr consumer.Metrics, set receiver.Crea ln, err := net.Listen("tcp", "localhost:") require.NoError(t, err, "Failed to find an available address to run the gRPC server: %v", err) - doneFnList := []func(){func() { ln.Close() }} done := func() { - for _, doneFn := range doneFnList { - doneFn() - } + _ = ln.Close() } oci, err := New(sr, set) diff --git a/receiver/opencensusreceiver/internal/octrace/opencensus.go b/receiver/opencensusreceiver/internal/octrace/opencensus.go index f85e5e5a684c..8edf43e86284 100644 --- a/receiver/opencensusreceiver/internal/octrace/opencensus.go +++ b/receiver/opencensusreceiver/internal/octrace/opencensus.go @@ -11,7 +11,6 @@ import ( commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1" resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/ptrace" "go.opentelemetry.io/collector/receiver" @@ -34,9 +33,6 @@ type Receiver struct { // New creates a new opencensus.Receiver reference. func New(nextConsumer consumer.Traces, set receiver.CreateSettings) (*Receiver, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ ReceiverID: set.ID, diff --git a/receiver/opencensusreceiver/metadata.yaml b/receiver/opencensusreceiver/metadata.yaml index f90969ca0641..49a52b22d551 100644 --- a/receiver/opencensusreceiver/metadata.yaml +++ b/receiver/opencensusreceiver/metadata.yaml @@ -13,7 +13,4 @@ status: - redhat - sumo codeowners: - active: [open-telemetry/collector-approvers] -tests: - config: - skip_lifecycle: true \ No newline at end of file + active: [open-telemetry/collector-approvers] \ No newline at end of file diff --git a/receiver/opencensusreceiver/opencensus.go b/receiver/opencensusreceiver/opencensus.go index d89ce069c8f8..66e4977a7253 100644 --- a/receiver/opencensusreceiver/opencensus.go +++ b/receiver/opencensusreceiver/opencensus.go @@ -30,7 +30,7 @@ import ( // ocReceiver is the type that exposes Trace and Metrics reception. type ocReceiver struct { - mu sync.Mutex + cfg *Config ln net.Listener serverGRPC *grpc.Server serverHTTP *http.Server @@ -45,31 +45,24 @@ type ocReceiver struct { traceConsumer consumer.Traces metricsConsumer consumer.Metrics - startTracesReceiverOnce sync.Once - startMetricsReceiverOnce sync.Once + stopWG sync.WaitGroup - settings receiver.CreateSettings + settings receiver.CreateSettings + multiplexer cmux.CMux } // newOpenCensusReceiver just creates the OpenCensus receiver services. It is the caller's // responsibility to invoke the respective Start*Reception methods as well // as the various Stop*Reception methods to end it. func newOpenCensusReceiver( - transport string, - addr string, + cfg *Config, tc consumer.Traces, mc consumer.Metrics, settings receiver.CreateSettings, opts ...ocOption, -) (*ocReceiver, error) { - // TODO: (@odeke-em) use options to enable address binding changes. - ln, err := net.Listen(transport, addr) - if err != nil { - return nil, fmt.Errorf("failed to bind to address %q: %w", addr, err) - } - +) *ocReceiver { ocr := &ocReceiver{ - ln: ln, + cfg: cfg, corsOrigins: []string{}, // Disable CORS by default. gatewayMux: gatewayruntime.NewServeMux(), traceConsumer: tc, @@ -81,184 +74,142 @@ func newOpenCensusReceiver( opt.withReceiver(ocr) } - return ocr, nil + return ocr } // Start runs the trace receiver on the gRPC server. Currently // it also enables the metrics receiver too. -func (ocr *ocReceiver) Start(_ context.Context, host component.Host) error { +func (ocr *ocReceiver) Start(ctx context.Context, host component.Host) error { + var err error + ocr.serverGRPC, err = ocr.grpcServerSettings.ToServerContext(ctx, host, ocr.settings.TelemetrySettings) + if err != nil { + return err + } + var mux http.Handler = ocr.gatewayMux + if len(ocr.corsOrigins) > 0 { + co := cors.Options{AllowedOrigins: ocr.corsOrigins} + mux = cors.New(co).Handler(mux) + } + ocr.serverHTTP = &http.Server{Handler: mux, ReadHeaderTimeout: 20 * time.Second} hasConsumer := false if ocr.traceConsumer != nil { hasConsumer = true - if err := ocr.registerTraceConsumer(host); err != nil { + ocr.traceReceiver, err = octrace.New(ocr.traceConsumer, ocr.settings) + if err != nil { return err } + agenttracepb.RegisterTraceServiceServer(ocr.serverGRPC, ocr.traceReceiver) } if ocr.metricsConsumer != nil { hasConsumer = true - if err := ocr.registerMetricsConsumer(host); err != nil { + ocr.metricsReceiver, err = ocmetrics.New(ocr.metricsConsumer, ocr.settings) + if err != nil { return err } + agentmetricspb.RegisterMetricsServiceServer(ocr.serverGRPC, ocr.metricsReceiver) } if !hasConsumer { return errors.New("cannot start receiver: no consumers were specified") } + ocr.ln, err = net.Listen(string(ocr.cfg.NetAddr.Transport), ocr.cfg.NetAddr.Endpoint) + if err != nil { + return fmt.Errorf("failed to bind to address %q: %w", ocr.cfg.NetAddr.Endpoint, err) + } + // Register the grpc-gateway on the HTTP server mux + var c context.Context + c, ocr.cancel = context.WithCancel(context.Background()) - if err := ocr.startServer(); err != nil { - return err + endpoint := ocr.ln.Addr().String() + + _, ok := ocr.ln.(*net.UnixListener) + if ok { + endpoint = "unix:" + endpoint } - // At this point we've successfully started all the services/receivers. - // Add other start routines here. - return nil -} + // Start the gRPC and HTTP/JSON (grpc-gateway) servers on the same port. + ocr.multiplexer = cmux.New(ocr.ln) + grpcL := ocr.multiplexer.MatchWithWriters( + cmux.HTTP2MatchHeaderFieldSendSettings("content-type", "application/grpc"), + cmux.HTTP2MatchHeaderFieldSendSettings("content-type", "application/grpc+proto")) -func (ocr *ocReceiver) registerTraceConsumer(host component.Host) error { - var err error + httpL := ocr.multiplexer.Match(cmux.Any()) + ocr.stopWG.Add(1) + startWG := sync.WaitGroup{} + startWG.Add(3) - ocr.startTracesReceiverOnce.Do(func() { - ocr.traceReceiver, err = octrace.New(ocr.traceConsumer, ocr.settings) - if err != nil { - return + go func() { + defer ocr.stopWG.Done() + startWG.Done() + // Check for cmux.ErrServerClosed, because during the shutdown this is not properly close before closing the cmux, + if err := ocr.serverGRPC.Serve(grpcL); !errors.Is(err, grpc.ErrServerStopped) && !errors.Is(err, cmux.ErrServerClosed) && err != nil { + ocr.settings.TelemetrySettings.ReportStatus(component.NewFatalErrorEvent(err)) } - - var srv *grpc.Server - srv, err = ocr.grpcServer(host) - if err != nil { - return + }() + go func() { + startWG.Done() + if err := ocr.serverHTTP.Serve(httpL); !errors.Is(err, http.ErrServerClosed) && !errors.Is(err, cmux.ErrServerClosed) && err != nil { + ocr.settings.TelemetrySettings.ReportStatus(component.NewFatalErrorEvent(err)) } - - agenttracepb.RegisterTraceServiceServer(srv, ocr.traceReceiver) - - }) - - return err -} - -func (ocr *ocReceiver) registerMetricsConsumer(host component.Host) error { - var err error - - ocr.startMetricsReceiverOnce.Do(func() { - ocr.metricsReceiver, err = ocmetrics.New(ocr.metricsConsumer, ocr.settings) - if err != nil { - return + }() + go func() { + startWG.Done() + if err := ocr.multiplexer.Serve(); !errors.Is(err, cmux.ErrServerClosed) && err != nil { + ocr.settings.TelemetrySettings.ReportStatus(component.NewFatalErrorEvent(err)) } + }() - var srv *grpc.Server - srv, err = ocr.grpcServer(host) - if err != nil { - return - } + startWG.Wait() - agentmetricspb.RegisterMetricsServiceServer(srv, ocr.metricsReceiver) - }) - return err -} + opts := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock()} + if err := agenttracepb.RegisterTraceServiceHandlerFromEndpoint(c, ocr.gatewayMux, endpoint, opts); err != nil { + return err + } -func (ocr *ocReceiver) grpcServer(host component.Host) (*grpc.Server, error) { - ocr.mu.Lock() - defer ocr.mu.Unlock() + if err := agentmetricspb.RegisterMetricsServiceHandlerFromEndpoint(c, ocr.gatewayMux, endpoint, opts); err != nil { + return err + } if ocr.serverGRPC == nil { var err error - ocr.serverGRPC, err = ocr.grpcServerSettings.ToServer(host, ocr.settings.TelemetrySettings) + ocr.serverGRPC, err = ocr.grpcServerSettings.ToServerContext(context.Background(), host, ocr.settings.TelemetrySettings) if err != nil { - return nil, err + return err } } - return ocr.serverGRPC, nil + // At this point we've successfully started all the services/receivers. + // Add other start routines here. + return nil } // Shutdown is a method to turn off receiving. func (ocr *ocReceiver) Shutdown(context.Context) error { - ocr.mu.Lock() - defer ocr.mu.Unlock() - - var err error - if ocr.serverHTTP != nil { - err = ocr.serverHTTP.Close() - } - - if ocr.ln != nil { - _ = ocr.ln.Close() - } - - // TODO: @(odeke-em) investigate what utility invoking (*grpc.Server).Stop() - // gives us yet we invoke (net.Listener).Close(). - // Sure (*grpc.Server).Stop() enables proper shutdown but imposes - // a painful and artificial wait time that goes into 20+seconds yet most of our - // tests and code should be reactive in less than even 1second. - // ocr.serverGRPC.Stop() if ocr.cancel != nil { ocr.cancel() } - return err -} - -func (ocr *ocReceiver) httpServer() *http.Server { - ocr.mu.Lock() - defer ocr.mu.Unlock() - - if ocr.serverHTTP == nil { - var mux http.Handler = ocr.gatewayMux - if len(ocr.corsOrigins) > 0 { - co := cors.Options{AllowedOrigins: ocr.corsOrigins} - mux = cors.New(co).Handler(mux) - } - ocr.serverHTTP = &http.Server{Handler: mux, ReadHeaderTimeout: 20 * time.Second} + if ocr.serverGRPC != nil { + ocr.serverGRPC.Stop() + ocr.stopWG.Wait() } - return ocr.serverHTTP -} - -func (ocr *ocReceiver) startServer() error { - // Register the grpc-gateway on the HTTP server mux - var c context.Context - c, ocr.cancel = context.WithCancel(context.Background()) - opts := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())} - endpoint := ocr.ln.Addr().String() - - _, ok := ocr.ln.(*net.UnixListener) - if ok { - endpoint = "unix:" + endpoint + if ocr.serverHTTP != nil { + _ = ocr.serverHTTP.Close() } - if err := agenttracepb.RegisterTraceServiceHandlerFromEndpoint(c, ocr.gatewayMux, endpoint, opts); err != nil { - return err + if ocr.ln != nil { + _ = ocr.ln.Close() } - if err := agentmetricspb.RegisterMetricsServiceHandlerFromEndpoint(c, ocr.gatewayMux, endpoint, opts); err != nil { - return err + if ocr.multiplexer != nil { + ocr.multiplexer.Close() } - // Start the gRPC and HTTP/JSON (grpc-gateway) servers on the same port. - m := cmux.New(ocr.ln) - grpcL := m.MatchWithWriters( - cmux.HTTP2MatchHeaderFieldSendSettings("content-type", "application/grpc"), - cmux.HTTP2MatchHeaderFieldSendSettings("content-type", "application/grpc+proto")) + ocr.traceConsumer = nil + ocr.metricsConsumer = nil - httpL := m.Match(cmux.Any()) - go func() { - // Check for cmux.ErrServerClosed, because during the shutdown this is not properly close before closing the cmux, - // see TODO in Shutdown. - if err := ocr.serverGRPC.Serve(grpcL); !errors.Is(err, grpc.ErrServerStopped) && !errors.Is(err, cmux.ErrServerClosed) && err != nil { - ocr.settings.TelemetrySettings.ReportStatus(component.NewFatalErrorEvent(err)) - } - }() - go func() { - if err := ocr.httpServer().Serve(httpL); !errors.Is(err, http.ErrServerClosed) && err != nil { - ocr.settings.TelemetrySettings.ReportStatus(component.NewFatalErrorEvent(err)) - } - }() - go func() { - if err := m.Serve(); !errors.Is(err, cmux.ErrServerClosed) && err != nil { - ocr.settings.TelemetrySettings.ReportStatus(component.NewFatalErrorEvent(err)) - } - }() return nil } diff --git a/receiver/opencensusreceiver/opencensus_test.go b/receiver/opencensusreceiver/opencensus_test.go index 1846baae582a..c722f7fafcb9 100644 --- a/receiver/opencensusreceiver/opencensus_test.go +++ b/receiver/opencensusreceiver/opencensus_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configgrpc" + "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" @@ -56,17 +57,20 @@ func TestGrpcGateway_endToEnd(t *testing.T) { // Set the buffer count to 1 to make it flush the test span immediately. sink := new(consumertest.TracesSink) - ocr, err := newOpenCensusReceiver("tcp", addr, sink, nil, receivertest.NewNopCreateSettings()) - require.NoError(t, err, "Failed to create trace receiver: %v", err) + cfg := &Config{ + ServerConfig: configgrpc.ServerConfig{ + NetAddr: confignet.AddrConfig{ + Endpoint: addr, + Transport: "tcp", + }, + }, + } + ocr := newOpenCensusReceiver(cfg, sink, nil, receivertest.NewNopCreateSettings()) - err = ocr.Start(context.Background(), componenttest.NewNopHost()) + err := ocr.Start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err, "Failed to start trace receiver: %v", err) t.Cleanup(func() { require.NoError(t, ocr.Shutdown(context.Background())) }) - // TODO(songy23): make starting server deterministic - // Wait for the servers to start - <-time.After(10 * time.Millisecond) - url := fmt.Sprintf("http://%s/v1/trace", addr) // Verify that CORS is not enabled by default, but that it gives a method not allowed error. @@ -95,6 +99,7 @@ func TestGrpcGateway_endToEnd(t *testing.T) { req.Header.Set("Content-Type", "application/json") client := &http.Client{} + defer client.CloseIdleConnections() resp, err := client.Do(req) require.NoError(t, err, "Error posting trace to grpc-gateway server: %v", err) @@ -141,12 +146,18 @@ func TestGrpcGateway_endToEnd(t *testing.T) { func TestTraceGrpcGatewayCors_endToEnd(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) corsOrigins := []string{"allowed-*.com"} - - ocr, err := newOpenCensusReceiver("tcp", addr, consumertest.NewNop(), nil, receivertest.NewNopCreateSettings(), withCorsOrigins(corsOrigins)) - require.NoError(t, err, "Failed to create trace receiver: %v", err) + cfg := &Config{ + ServerConfig: configgrpc.ServerConfig{ + NetAddr: confignet.AddrConfig{ + Endpoint: addr, + Transport: "tcp", + }, + }, + } + ocr := newOpenCensusReceiver(cfg, consumertest.NewNop(), nil, receivertest.NewNopCreateSettings(), withCorsOrigins(corsOrigins)) t.Cleanup(func() { require.NoError(t, ocr.Shutdown(context.Background())) }) - err = ocr.Start(context.Background(), componenttest.NewNopHost()) + err := ocr.Start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err, "Failed to start trace receiver: %v", err) // TODO(songy23): make starting server deterministic @@ -165,12 +176,18 @@ func TestTraceGrpcGatewayCors_endToEnd(t *testing.T) { func TestMetricsGrpcGatewayCors_endToEnd(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) corsOrigins := []string{"allowed-*.com"} - - ocr, err := newOpenCensusReceiver("tcp", addr, nil, consumertest.NewNop(), receivertest.NewNopCreateSettings(), withCorsOrigins(corsOrigins)) - require.NoError(t, err, "Failed to create metrics receiver: %v", err) + cfg := &Config{ + ServerConfig: configgrpc.ServerConfig{ + NetAddr: confignet.AddrConfig{ + Endpoint: addr, + Transport: "tcp", + }, + }, + } + ocr := newOpenCensusReceiver(cfg, nil, consumertest.NewNop(), receivertest.NewNopCreateSettings(), withCorsOrigins(corsOrigins)) t.Cleanup(func() { require.NoError(t, ocr.Shutdown(context.Background())) }) - err = ocr.Start(context.Background(), componenttest.NewNopHost()) + err := ocr.Start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err, "Failed to start metrics receiver: %v", err) // TODO(songy23): make starting server deterministic @@ -193,6 +210,7 @@ func verifyCorsResp(t *testing.T, url string, origin string, wantStatus int, wan req.Header.Set("Access-Control-Request-Method", "POST") client := &http.Client{} + defer client.CloseIdleConnections() resp, err := client.Do(req) require.NoError(t, err, "Error sending OPTIONS to grpc-gateway server: %v", err) @@ -219,8 +237,15 @@ func verifyCorsResp(t *testing.T, url string, origin string, wantStatus int, wan func TestStopWithoutStartNeverCrashes(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) - ocr, err := newOpenCensusReceiver("tcp", addr, nil, nil, receivertest.NewNopCreateSettings()) - require.NoError(t, err, "Failed to create an OpenCensus receiver: %v", err) + cfg := &Config{ + ServerConfig: configgrpc.ServerConfig{ + NetAddr: confignet.AddrConfig{ + Endpoint: addr, + Transport: "tcp", + }, + }, + } + ocr := newOpenCensusReceiver(cfg, nil, nil, receivertest.NewNopCreateSettings()) // Stop it before ever invoking Start*. require.NoError(t, ocr.Shutdown(context.Background())) } @@ -230,16 +255,31 @@ func TestNewPortAlreadyUsed(t *testing.T) { ln, err := net.Listen("tcp", addr) require.NoError(t, err, "failed to listen on %q: %v", addr, err) defer ln.Close() - - r, err := newOpenCensusReceiver("tcp", addr, nil, nil, receivertest.NewNopCreateSettings()) + cfg := &Config{ + ServerConfig: configgrpc.ServerConfig{ + NetAddr: confignet.AddrConfig{ + Endpoint: addr, + Transport: "tcp", + }, + }, + } + r := newOpenCensusReceiver(cfg, nil, nil, receivertest.NewNopCreateSettings()) + err = r.Start(context.Background(), componenttest.NewNopHost()) require.Error(t, err) - require.Nil(t, r) + require.NoError(t, r.Shutdown(context.Background())) } func TestMultipleStopReceptionShouldNotError(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) - r, err := newOpenCensusReceiver("tcp", addr, consumertest.NewNop(), consumertest.NewNop(), receivertest.NewNopCreateSettings()) - require.NoError(t, err) + cfg := &Config{ + ServerConfig: configgrpc.ServerConfig{ + NetAddr: confignet.AddrConfig{ + Endpoint: addr, + Transport: "tcp", + }, + }, + } + r := newOpenCensusReceiver(cfg, consumertest.NewNop(), consumertest.NewNop(), receivertest.NewNopCreateSettings()) require.NotNil(t, r) require.NoError(t, r.Start(context.Background(), componenttest.NewNopHost())) @@ -248,8 +288,15 @@ func TestMultipleStopReceptionShouldNotError(t *testing.T) { func TestStartWithoutConsumersShouldFail(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) - r, err := newOpenCensusReceiver("tcp", addr, nil, nil, receivertest.NewNopCreateSettings()) - require.NoError(t, err) + cfg := &Config{ + ServerConfig: configgrpc.ServerConfig{ + NetAddr: confignet.AddrConfig{ + Endpoint: addr, + Transport: "tcp", + }, + }, + } + r := newOpenCensusReceiver(cfg, nil, nil, receivertest.NewNopCreateSettings()) require.NotNil(t, r) require.Error(t, r.Start(context.Background(), componenttest.NewNopHost())) @@ -267,15 +314,19 @@ func tempSocketName(t *testing.T) string { func TestReceiveOnUnixDomainSocket_endToEnd(t *testing.T) { socketName := tempSocketName(t) cbts := consumertest.NewNop() - r, err := newOpenCensusReceiver("unix", socketName, cbts, nil, receivertest.NewNopCreateSettings()) - require.NoError(t, err) + cfg := &Config{ + ServerConfig: configgrpc.ServerConfig{ + NetAddr: confignet.AddrConfig{ + Endpoint: socketName, + Transport: "unix", + }, + }, + } + r := newOpenCensusReceiver(cfg, cbts, nil, receivertest.NewNopCreateSettings()) require.NotNil(t, r) require.NoError(t, r.Start(context.Background(), componenttest.NewNopHost())) t.Cleanup(func() { require.NoError(t, r.Shutdown(context.Background())) }) - // Wait for the servers to start - <-time.After(10 * time.Millisecond) - span := ` { "node": { @@ -302,10 +353,12 @@ func TestReceiveOnUnixDomainSocket_endToEnd(t *testing.T) { }, }, } + defer c.CloseIdleConnections() response, err := c.Post("http://unix/v1/trace", "application/json", strings.NewReader(span)) require.NoError(t, err) - defer response.Body.Close() + _, _ = io.ReadAll(response.Body) + require.NoError(t, response.Body.Close()) require.Equal(t, 200, response.StatusCode) } @@ -413,8 +466,15 @@ func TestOCReceiverTrace_HandleNextConsumerResponse(t *testing.T) { sink := &errOrSinkConsumer{TracesSink: new(consumertest.TracesSink)} var opts []ocOption - ocr, err := newOpenCensusReceiver("tcp", addr, nil, nil, receiver.CreateSettings{ID: exporter.receiverID, TelemetrySettings: testTel.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, opts...) - require.NoError(t, err) + cfg := &Config{ + ServerConfig: configgrpc.ServerConfig{ + NetAddr: confignet.AddrConfig{ + Endpoint: addr, + Transport: "tcp", + }, + }, + } + ocr := newOpenCensusReceiver(cfg, nil, nil, receiver.CreateSettings{ID: exporter.receiverID, TelemetrySettings: testTel.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, opts...) require.NotNil(t, ocr) ocr.traceConsumer = sink @@ -564,8 +624,15 @@ func TestOCReceiverMetrics_HandleNextConsumerResponse(t *testing.T) { sink := &errOrSinkConsumer{MetricsSink: new(consumertest.MetricsSink)} var opts []ocOption - ocr, err := newOpenCensusReceiver("tcp", addr, nil, nil, receiver.CreateSettings{ID: exporter.receiverID, TelemetrySettings: testTel.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, opts...) - require.NoError(t, err) + cfg := &Config{ + ServerConfig: configgrpc.ServerConfig{ + NetAddr: confignet.AddrConfig{ + Endpoint: addr, + Transport: "tcp", + }, + }, + } + ocr := newOpenCensusReceiver(cfg, nil, nil, receiver.CreateSettings{ID: exporter.receiverID, TelemetrySettings: testTel.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, opts...) require.NotNil(t, ocr) ocr.metricsConsumer = sink @@ -600,24 +667,27 @@ func TestOCReceiverMetrics_HandleNextConsumerResponse(t *testing.T) { } func TestInvalidTLSCredentials(t *testing.T) { + addr := testutil.GetAvailableLocalAddress(t) cfg := Config{ ServerConfig: configgrpc.ServerConfig{ - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "willfail", }, }, + NetAddr: confignet.AddrConfig{ + Endpoint: addr, + Transport: "tcp", + }, }, } opt := cfg.buildOptions() assert.NotNil(t, opt) - addr := testutil.GetAvailableLocalAddress(t) - ocr, err := newOpenCensusReceiver("tcp", addr, nil, nil, receivertest.NewNopCreateSettings(), opt...) - assert.NoError(t, err) + ocr := newOpenCensusReceiver(&cfg, nil, nil, receivertest.NewNopCreateSettings(), opt...) assert.NotNil(t, ocr) - srv, err := ocr.grpcServer(componenttest.NewNopHost()) + srv, err := ocr.grpcServerSettings.ToServerContext(context.Background(), componenttest.NewNopHost(), ocr.settings.TelemetrySettings) assert.EqualError(t, err, `failed to load TLS config: failed to load TLS cert and key: for auth via TLS, provide both certificate and key, or neither`) assert.Nil(t, srv) } diff --git a/receiver/oracledbreceiver/config.go b/receiver/oracledbreceiver/config.go index 9e87197bc88d..c14cd60beac8 100644 --- a/receiver/oracledbreceiver/config.go +++ b/receiver/oracledbreceiver/config.go @@ -27,13 +27,13 @@ var ( ) type Config struct { - DataSource string `mapstructure:"datasource"` - Endpoint string `mapstructure:"endpoint"` - Password string `mapstructure:"password"` - Service string `mapstructure:"service"` - Username string `mapstructure:"username"` - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + DataSource string `mapstructure:"datasource"` + Endpoint string `mapstructure:"endpoint"` + Password string `mapstructure:"password"` + Service string `mapstructure:"service"` + Username string `mapstructure:"username"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } func (c Config) Validate() error { diff --git a/receiver/oracledbreceiver/config_test.go b/receiver/oracledbreceiver/config_test.go index fd68e70a968e..ba03402451a3 100644 --- a/receiver/oracledbreceiver/config_test.go +++ b/receiver/oracledbreceiver/config_test.go @@ -13,8 +13,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/receiver/scraperhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver/internal/metadata" ) func TestValidateInvalidConfigs(t *testing.T) { @@ -26,85 +24,85 @@ func TestValidateInvalidConfigs(t *testing.T) { { name: "Empty endpoint", config: &Config{ - Endpoint: "", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyEndpoint, }, { name: "Missing port in endpoint", config: &Config{ - Endpoint: "localhost", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadEndpoint, }, { name: "Invalid endpoint format", config: &Config{ - Endpoint: "x;;ef;s;d:::ss:23423423423423423", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "x;;ef;s;d:::ss:23423423423423423", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadEndpoint, }, { name: "Missing host in endpoint", config: &Config{ - Endpoint: ":3001", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: ":3001", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadEndpoint, }, { name: "Negative port", config: &Config{ - Endpoint: "localhost:-2", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:-2", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadPort, }, { name: "Bad port", config: &Config{ - Endpoint: "localhost:9999999999999999999", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:9999999999999999999", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadPort, }, { name: "Empty username", config: &Config{ - Endpoint: "localhost:3000", - Username: "", - Password: "secret", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:3000", + Username: "", + Password: "secret", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyUsername, }, { name: "Empty password", config: &Config{ - Endpoint: "localhost:3000", - Username: "ro_user", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:3000", + Username: "ro_user", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyPassword, }, { name: "Empty service", config: &Config{ - Endpoint: "localhost:3000", - Password: "password", - Username: "ro_user", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:3000", + Password: "password", + Username: "ro_user", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyService, }, { name: "Invalid data source", config: &Config{ - DataSource: "%%%", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + DataSource: "%%%", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadDataSource, }, @@ -120,7 +118,7 @@ func TestValidateInvalidConfigs(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig().(*Config) - assert.Equal(t, 10*time.Second, cfg.ScraperControllerSettings.CollectionInterval) + assert.Equal(t, 10*time.Second, cfg.ControllerConfig.CollectionInterval) } func TestParseConfig(t *testing.T) { diff --git a/receiver/oracledbreceiver/factory.go b/receiver/oracledbreceiver/factory.go index 0fce68e160bd..c322f0904019 100644 --- a/receiver/oracledbreceiver/factory.go +++ b/receiver/oracledbreceiver/factory.go @@ -31,12 +31,12 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: cfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -57,7 +57,7 @@ func createReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clientPr return nil, err } - mp, err := newScraper(metricsBuilder, sqlCfg.MetricsBuilderConfig, sqlCfg.ScraperControllerSettings, settings.TelemetrySettings.Logger, func() (*sql.DB, error) { + mp, err := newScraper(metricsBuilder, sqlCfg.MetricsBuilderConfig, sqlCfg.ControllerConfig, settings.TelemetrySettings.Logger, func() (*sql.DB, error) { return sqlOpenerFunc(getDataSource(*sqlCfg)) }, clientProviderFunc, instanceName) if err != nil { @@ -66,7 +66,7 @@ func createReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clientPr opt := scraperhelper.AddScraper(mp) return scraperhelper.NewScraperControllerReceiver( - &sqlCfg.ScraperControllerSettings, + &sqlCfg.ControllerConfig, settings, consumer, opt, diff --git a/receiver/oracledbreceiver/go.mod b/receiver/oracledbreceiver/go.mod index db9d434eb32e..ba0c1363e97e 100644 --- a/receiver/oracledbreceiver/go.mod +++ b/receiver/oracledbreceiver/go.mod @@ -4,13 +4,13 @@ go 1.21 require ( github.com/google/go-cmp v0.6.0 - github.com/sijms/go-ora/v2 v2.8.9 + github.com/sijms/go-ora/v2 v2.8.10 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -40,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/oracledbreceiver/go.sum b/receiver/oracledbreceiver/go.sum index b796f2790db7..0acd9f9a3d9e 100644 --- a/receiver/oracledbreceiver/go.sum +++ b/receiver/oracledbreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -56,28 +58,28 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/sijms/go-ora/v2 v2.8.9 h1:XIghcG8hjtYu+G9H235VEe5JXPLJtdzzj7pQm7JucVo= -github.com/sijms/go-ora/v2 v2.8.9/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.10 h1:Ekhx0I+A9qVBy1eOLa2eIhHWWYwVTa0MM78KS6h+5fg= +github.com/sijms/go-ora/v2 v2.8.10/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/oracledbreceiver/scraper.go b/receiver/oracledbreceiver/scraper.go index 18b9d5aeaa71..9da8f711e657 100644 --- a/receiver/oracledbreceiver/scraper.go +++ b/receiver/oracledbreceiver/scraper.go @@ -59,12 +59,12 @@ type scraper struct { logger *zap.Logger id component.ID instanceName string - scrapeCfg scraperhelper.ScraperControllerSettings + scrapeCfg scraperhelper.ControllerConfig startTime pcommon.Timestamp metricsBuilderConfig metadata.MetricsBuilderConfig } -func newScraper(metricsBuilder *metadata.MetricsBuilder, metricsBuilderConfig metadata.MetricsBuilderConfig, scrapeCfg scraperhelper.ScraperControllerSettings, logger *zap.Logger, providerFunc dbProviderFunc, clientProviderFunc clientProviderFunc, instanceName string) (scraperhelper.Scraper, error) { +func newScraper(metricsBuilder *metadata.MetricsBuilder, metricsBuilderConfig metadata.MetricsBuilderConfig, scrapeCfg scraperhelper.ControllerConfig, logger *zap.Logger, providerFunc dbProviderFunc, clientProviderFunc clientProviderFunc, instanceName string) (scraperhelper.Scraper, error) { s := &scraper{ mb: metricsBuilder, metricsBuilderConfig: metricsBuilderConfig, diff --git a/receiver/osqueryreceiver/config.go b/receiver/osqueryreceiver/config.go index d6e834992e35..abddbecac074 100644 --- a/receiver/osqueryreceiver/config.go +++ b/receiver/osqueryreceiver/config.go @@ -9,8 +9,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/receiver/scraperhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/osqueryreceiver/internal/metadata" ) const ( @@ -18,19 +16,19 @@ const ( ) func createDefaultConfig() component.Config { - scs := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scs := scraperhelper.NewDefaultControllerConfig() scs.CollectionInterval = 30 * time.Second return &Config{ - ExtensionsSocket: defaultSocket, - ScraperControllerSettings: scs, + ExtensionsSocket: defaultSocket, + ControllerConfig: scs, } } type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - ExtensionsSocket string `mapstructure:"extensions_socket"` - Queries []string `mapstructure:"queries"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + ExtensionsSocket string `mapstructure:"extensions_socket"` + Queries []string `mapstructure:"queries"` } func (c Config) Validate() error { diff --git a/receiver/osqueryreceiver/factory_test.go b/receiver/osqueryreceiver/factory_test.go index b65a43f7b167..e548ba7e3261 100644 --- a/receiver/osqueryreceiver/factory_test.go +++ b/receiver/osqueryreceiver/factory_test.go @@ -18,5 +18,5 @@ func TestFactory(t *testing.T) { cfg := f.CreateDefaultConfig() assert.NotNil(t, cfg) duration, _ := time.ParseDuration("30s") - assert.Equal(t, duration, cfg.(*Config).ScraperControllerSettings.CollectionInterval) + assert.Equal(t, duration, cfg.(*Config).ControllerConfig.CollectionInterval) } diff --git a/receiver/osqueryreceiver/go.mod b/receiver/osqueryreceiver/go.mod index e684608615a3..c6f57982d57d 100644 --- a/receiver/osqueryreceiver/go.mod +++ b/receiver/osqueryreceiver/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -25,11 +25,11 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect diff --git a/receiver/osqueryreceiver/go.sum b/receiver/osqueryreceiver/go.sum index 0893b871fa10..69e3f2364478 100644 --- a/receiver/osqueryreceiver/go.sum +++ b/receiver/osqueryreceiver/go.sum @@ -20,6 +20,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -61,20 +63,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/otelarrowreceiver/config_test.go b/receiver/otelarrowreceiver/config_test.go index 9e5126987e12..43d8316de8bb 100644 --- a/receiver/otelarrowreceiver/config_test.go +++ b/receiver/otelarrowreceiver/config_test.go @@ -51,10 +51,10 @@ func TestUnmarshalConfig(t *testing.T) { GRPC: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:4317", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "test.crt", KeyFile: "test.key", }, @@ -100,7 +100,7 @@ func TestUnmarshalConfigUnix(t *testing.T) { GRPC: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "/tmp/grpc_otlp.sock", - Transport: "unix", + Transport: confignet.TransportTypeUnix, }, ReadBufferSize: 512 * 1024, }, @@ -121,5 +121,5 @@ func TestUnmarshalConfigInvalidProtocol(t *testing.T) { func TestUnmarshalConfigNoProtocols(t *testing.T) { cfg := Config{} - assert.NoError(t, component.ValidateConfig(cfg)) + assert.Error(t, component.ValidateConfig(cfg)) } diff --git a/receiver/otelarrowreceiver/factory.go b/receiver/otelarrowreceiver/factory.go index 92a32e48b99e..4e29b3fdf38d 100644 --- a/receiver/otelarrowreceiver/factory.go +++ b/receiver/otelarrowreceiver/factory.go @@ -39,7 +39,7 @@ func createDefaultConfig() component.Config { GRPC: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: defaultGRPCEndpoint, - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, // We almost write 0 bytes, so no need to tune WriteBufferSize. ReadBufferSize: 512 * 1024, @@ -67,9 +67,7 @@ func createTraces( return nil, err } - if err = r.Unwrap().(*otelArrowReceiver).registerTraceConsumer(nextConsumer); err != nil { - return nil, err - } + r.Unwrap().(*otelArrowReceiver).registerTraceConsumer(nextConsumer) return r, nil } @@ -89,9 +87,7 @@ func createMetrics( return nil, err } - if err = r.Unwrap().(*otelArrowReceiver).registerMetricsConsumer(consumer); err != nil { - return nil, err - } + r.Unwrap().(*otelArrowReceiver).registerMetricsConsumer(consumer) return r, nil } @@ -111,9 +107,7 @@ func createLog( return nil, err } - if err = r.Unwrap().(*otelArrowReceiver).registerLogsConsumer(consumer); err != nil { - return nil, err - } + r.Unwrap().(*otelArrowReceiver).registerLogsConsumer(consumer) return r, nil } diff --git a/receiver/otelarrowreceiver/factory_test.go b/receiver/otelarrowreceiver/factory_test.go index 91e41107fe8f..53bf61a4da9e 100644 --- a/receiver/otelarrowreceiver/factory_test.go +++ b/receiver/otelarrowreceiver/factory_test.go @@ -45,7 +45,7 @@ func TestCreateTracesReceiver(t *testing.T) { defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } @@ -69,7 +69,7 @@ func TestCreateTracesReceiver(t *testing.T) { GRPC: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:112233", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, @@ -101,7 +101,7 @@ func TestCreateMetricReceiver(t *testing.T) { defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } @@ -125,7 +125,7 @@ func TestCreateMetricReceiver(t *testing.T) { GRPC: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "327.0.0.1:1122", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, @@ -156,7 +156,7 @@ func TestCreateLogReceiver(t *testing.T) { defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } @@ -183,7 +183,7 @@ func TestCreateLogReceiver(t *testing.T) { GRPC: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "327.0.0.1:1122", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, diff --git a/receiver/otelarrowreceiver/go.mod b/receiver/otelarrowreceiver/go.mod index d99f06ffb2eb..f785f6595ad3 100644 --- a/receiver/otelarrowreceiver/go.mod +++ b/receiver/otelarrowreceiver/go.mod @@ -7,15 +7,15 @@ require ( github.com/open-telemetry/otel-arrow v0.18.0 github.com/open-telemetry/otel-arrow/collector v0.18.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -40,6 +40,7 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -60,16 +61,16 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/otelarrowreceiver/go.sum b/receiver/otelarrowreceiver/go.sum index 4ce2c98bea6f..05e9eb530755 100644 --- a/receiver/otelarrowreceiver/go.sum +++ b/receiver/otelarrowreceiver/go.sum @@ -1,7 +1,3 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= @@ -17,16 +13,12 @@ github.com/brianvoe/gofakeit/v6 v6.17.0 h1:obbQTJeHfktJtiZzq0Q1bEpsNUs+yHrYlPVWt github.com/brianvoe/gofakeit/v6 v6.17.0/go.mod h1:Ow6qC71xtwm79anlwKRlWZW6zVq9D2XHE4QSSMP/rU8= 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/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc h1:8WFBn63wegobsYAX0YjD+8suexZDga5CctH4CCTx2+8= github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= @@ -125,44 +117,44 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -207,8 +199,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -246,8 +236,6 @@ gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c h1:NUsgEN92SQQqzfA+YtqYNqYmB3DMMYLlIwUZAQFVFbo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/receiver/otelarrowreceiver/otelarrow.go b/receiver/otelarrowreceiver/otelarrow.go index 6130f0555288..697c041c7a98 100644 --- a/receiver/otelarrowreceiver/otelarrow.go +++ b/receiver/otelarrowreceiver/otelarrow.go @@ -101,7 +101,7 @@ func (r *otelArrowReceiver) startProtocolServers(host component.Host) error { if r.netReporter != nil { serverOpts = append(serverOpts, grpc.StatsHandler(r.netReporter.Handler())) } - r.serverGRPC, err = r.cfg.GRPC.ToServer(host, r.settings.TelemetrySettings, serverOpts...) + r.serverGRPC, err = r.cfg.GRPC.ToServerContext(context.Background(), host, r.settings.TelemetrySettings, serverOpts...) if err != nil { return err } @@ -170,28 +170,16 @@ func (r *otelArrowReceiver) Shutdown(_ context.Context) error { return err } -func (r *otelArrowReceiver) registerTraceConsumer(tc consumer.Traces) error { - if tc == nil { - return component.ErrNilNextConsumer - } +func (r *otelArrowReceiver) registerTraceConsumer(tc consumer.Traces) { r.tracesReceiver = trace.New(tc, r.obsrepGRPC) - return nil } -func (r *otelArrowReceiver) registerMetricsConsumer(mc consumer.Metrics) error { - if mc == nil { - return component.ErrNilNextConsumer - } +func (r *otelArrowReceiver) registerMetricsConsumer(mc consumer.Metrics) { r.metricsReceiver = metrics.New(mc, r.obsrepGRPC) - return nil } -func (r *otelArrowReceiver) registerLogsConsumer(lc consumer.Logs) error { - if lc == nil { - return component.ErrNilNextConsumer - } +func (r *otelArrowReceiver) registerLogsConsumer(lc consumer.Logs) { r.logsReceiver = logs.New(lc, r.obsrepGRPC) - return nil } var _ arrow.Consumers = &otelArrowReceiver{} diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index 0d862e704478..8844e477e4b1 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,6 +28,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -45,21 +46,21 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 // indirect + golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index c7209453b58a..18570d8593b1 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -28,6 +28,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -81,24 +83,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -121,8 +123,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -164,8 +166,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/receiver/podmanreceiver/config.go b/receiver/podmanreceiver/config.go index 43f3364a0923..bf80db303c8c 100644 --- a/receiver/podmanreceiver/config.go +++ b/receiver/podmanreceiver/config.go @@ -14,7 +14,7 @@ import ( var _ component.Config = (*Config)(nil) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` // The URL of the podman server. Default is "unix:///run/podman/podman.sock" Endpoint string `mapstructure:"endpoint"` diff --git a/receiver/podmanreceiver/config_test.go b/receiver/podmanreceiver/config_test.go index 458d1c7ab8d8..fc415e629ffc 100644 --- a/receiver/podmanreceiver/config_test.go +++ b/receiver/podmanreceiver/config_test.go @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, ""), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, Timeout: 5 * time.Second, @@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "all"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 2 * time.Second, InitialDelay: time.Second, Timeout: 20 * time.Second, diff --git a/receiver/podmanreceiver/factory.go b/receiver/podmanreceiver/factory.go index 4c9ebaff350e..14dcfde7b9b5 100644 --- a/receiver/podmanreceiver/factory.go +++ b/receiver/podmanreceiver/factory.go @@ -27,14 +27,14 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() *Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second cfg.Timeout = 5 * time.Second return &Config{ - ScraperControllerSettings: cfg, - Endpoint: "unix:///run/podman/podman.sock", - APIVersion: defaultAPIVersion, + ControllerConfig: cfg, + Endpoint: "unix:///run/podman/podman.sock", + APIVersion: defaultAPIVersion, } } diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index 5636531de511..4dcd51e126c2 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,13 +4,13 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -40,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index cd735c67dc16..020fc02744c2 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,24 +64,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/podmanreceiver/podman_test.go b/receiver/podmanreceiver/podman_test.go index 9bac08850908..b1e43b838646 100644 --- a/receiver/podmanreceiver/podman_test.go +++ b/receiver/podmanreceiver/podman_test.go @@ -70,7 +70,7 @@ func TestWatchingTimeouts(t *testing.T) { config := &Config{ Endpoint: fmt.Sprintf("unix://%s", addr), - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ Timeout: 50 * time.Millisecond, }, } @@ -123,7 +123,7 @@ func TestEventLoopHandlesError(t *testing.T) { observed, logs := observer.New(zapcore.WarnLevel) config := &Config{ Endpoint: fmt.Sprintf("unix://%s", addr), - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ Timeout: 50 * time.Millisecond, }, } diff --git a/receiver/podmanreceiver/receiver.go b/receiver/podmanreceiver/receiver.go index 2fe1685bb271..1a748cfa7fd4 100644 --- a/receiver/podmanreceiver/receiver.go +++ b/receiver/podmanreceiver/receiver.go @@ -55,7 +55,7 @@ func newMetricsReceiver( if err != nil { return nil, err } - return scraperhelper.NewScraperControllerReceiver(&recv.config.ScraperControllerSettings, set, nextConsumer, scraperhelper.AddScraper(scrp)) + return scraperhelper.NewScraperControllerReceiver(&recv.config.ControllerConfig, set, nextConsumer, scraperhelper.AddScraper(scrp)) } func (r *metricsReceiver) start(ctx context.Context, _ component.Host) error { diff --git a/receiver/podmanreceiver/receiver_test.go b/receiver/podmanreceiver/receiver_test.go index 531208d72ce6..b516069da111 100644 --- a/receiver/podmanreceiver/receiver_test.go +++ b/receiver/podmanreceiver/receiver_test.go @@ -26,7 +26,7 @@ import ( func TestNewReceiver(t *testing.T) { config := &Config{ Endpoint: "unix:///run/some.sock", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 1 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/postgresqlreceiver/client.go b/receiver/postgresqlreceiver/client.go index 977dddd69290..160b943e0cc0 100644 --- a/receiver/postgresqlreceiver/client.go +++ b/receiver/postgresqlreceiver/client.go @@ -70,10 +70,10 @@ type postgreSQLConfig struct { password string database string address confignet.AddrConfig - tls configtls.TLSClientSetting + tls configtls.ClientConfig } -func sslConnectionString(tls configtls.TLSClientSetting) string { +func sslConnectionString(tls configtls.ClientConfig) string { if tls.Insecure { return "sslmode='disable'" } @@ -114,7 +114,7 @@ func (c postgreSQLConfig) ConnectionString() (string, error) { return "", err } - if c.address.Transport == "unix" { + if c.address.Transport == confignet.TransportTypeUnix { // lib/pg expects a unix socket host to start with a "/" and appends the appropriate .s.PGSQL.port internally host = fmt.Sprintf("/%s", host) } diff --git a/receiver/postgresqlreceiver/client_factory.go b/receiver/postgresqlreceiver/client_factory.go index da332a660b70..c940bf2ba723 100644 --- a/receiver/postgresqlreceiver/client_factory.go +++ b/receiver/postgresqlreceiver/client_factory.go @@ -40,7 +40,7 @@ func newDefaultClientFactory(cfg *Config) *defaultClientFactory { username: cfg.Username, password: string(cfg.Password), address: cfg.AddrConfig, - tls: cfg.TLSClientSetting, + tls: cfg.ClientConfig, }, } } @@ -73,7 +73,7 @@ func newPoolClientFactory(cfg *Config) *poolClientFactory { username: cfg.Username, password: string(cfg.Password), address: cfg.AddrConfig, - tls: cfg.TLSClientSetting, + tls: cfg.ClientConfig, }, poolConfig: &poolCfg, pool: make(map[string]*sql.DB), diff --git a/receiver/postgresqlreceiver/config.go b/receiver/postgresqlreceiver/config.go index f5f6160a2a5f..6bd0ba5b817a 100644 --- a/receiver/postgresqlreceiver/config.go +++ b/receiver/postgresqlreceiver/config.go @@ -28,15 +28,15 @@ const ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` - Databases []string `mapstructure:"databases"` - ExcludeDatabases []string `mapstructure:"exclude_databases"` - confignet.AddrConfig `mapstructure:",squash"` // provides Endpoint and Transport - configtls.TLSClientSetting `mapstructure:"tls,omitempty"` // provides SSL details - ConnectionPool `mapstructure:"connection_pool,omitempty"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` + Databases []string `mapstructure:"databases"` + ExcludeDatabases []string `mapstructure:"exclude_databases"` + confignet.AddrConfig `mapstructure:",squash"` // provides Endpoint and Transport + configtls.ClientConfig `mapstructure:"tls,omitempty"` // provides SSL details + ConnectionPool `mapstructure:"connection_pool,omitempty"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } type ConnectionPool struct { @@ -67,7 +67,7 @@ func (cfg *Config) Validate() error { } switch cfg.Transport { - case "tcp", "unix": + case confignet.TransportTypeTCP, confignet.TransportTypeUnix: _, _, endpointErr := net.SplitHostPort(cfg.Endpoint) if endpointErr != nil { err = multierr.Append(err, errors.New(ErrHostPort)) diff --git a/receiver/postgresqlreceiver/config_test.go b/receiver/postgresqlreceiver/config_test.go index c6e3a546c26d..d93a92b60d74 100644 --- a/receiver/postgresqlreceiver/config_test.go +++ b/receiver/postgresqlreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" "go.uber.org/multierr" @@ -67,7 +68,7 @@ func TestValidate(t *testing.T) { defaultConfigModifier: func(cfg *Config) { cfg.Username = "otel" cfg.Password = "otel" - cfg.Transport = "teacup" + cfg.Transport = "udp" }, expected: multierr.Combine( errors.New(ErrTransportsSupported), @@ -135,7 +136,7 @@ func TestLoadConfig(t *testing.T) { expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "localhost:5432" - expected.AddrConfig.Transport = "tcp" + expected.AddrConfig.Transport = confignet.TransportTypeTCP expected.Username = "otel" expected.Password = "${env:POSTGRESQL_PASSWORD}" expected.ConnectionPool = ConnectionPool{ @@ -153,16 +154,16 @@ func TestLoadConfig(t *testing.T) { expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "localhost:5432" - expected.AddrConfig.Transport = "tcp" + expected.AddrConfig.Transport = confignet.TransportTypeTCP expected.Username = "otel" expected.Password = "${env:POSTGRESQL_PASSWORD}" expected.Databases = []string{"otel"} expected.ExcludeDatabases = []string{"template0"} expected.CollectionInterval = 10 * time.Second - expected.TLSClientSetting = configtls.TLSClientSetting{ + expected.ClientConfig = configtls.ClientConfig{ Insecure: false, InsecureSkipVerify: false, - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.Config{ CAFile: "/home/otel/authorities.crt", CertFile: "/home/otel/mypostgrescert.crt", KeyFile: "/home/otel/mypostgreskey.key", diff --git a/receiver/postgresqlreceiver/factory.go b/receiver/postgresqlreceiver/factory.go index 4e455fcc1cd9..6bc6a66c41bb 100644 --- a/receiver/postgresqlreceiver/factory.go +++ b/receiver/postgresqlreceiver/factory.go @@ -25,16 +25,16 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:5432", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLSClientSetting: configtls.TLSClientSetting{ + ClientConfig: configtls.ClientConfig{ Insecure: false, InsecureSkipVerify: true, }, @@ -64,7 +64,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/postgresqlreceiver/factory_test.go b/receiver/postgresqlreceiver/factory_test.go index 49b454b145b7..585b9a14572d 100644 --- a/receiver/postgresqlreceiver/factory_test.go +++ b/receiver/postgresqlreceiver/factory_test.go @@ -37,7 +37,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index bccc87b127c3..a68741af9914 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -11,15 +11,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -78,15 +78,15 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 9877b19333e0..680ad7442c90 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -120,8 +120,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -148,30 +148,30 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -219,7 +219,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 24ea9d444401..d801fe9eab4f 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -13,19 +13,19 @@ require ( github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -146,7 +146,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect @@ -158,25 +158,25 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index 22cd7fb5bf89..45082cb5df2b 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -504,8 +504,8 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULu github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= @@ -557,8 +557,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/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= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -566,70 +566,70 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= @@ -842,7 +842,7 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.6.0/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/receiver/pulsarreceiver/go.mod b/receiver/pulsarreceiver/go.mod index 8eeb3d30d620..d0725d8311f5 100644 --- a/receiver/pulsarreceiver/go.mod +++ b/receiver/pulsarreceiver/go.mod @@ -11,13 +11,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.96.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -42,6 +42,7 @@ require ( github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect @@ -66,7 +67,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/pulsarreceiver/go.sum b/receiver/pulsarreceiver/go.sum index 1f99130e6428..574af8edaf2f 100644 --- a/receiver/pulsarreceiver/go.sum +++ b/receiver/pulsarreceiver/go.sum @@ -420,24 +420,24 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/purefareceiver/go.mod b/receiver/purefareceiver/go.mod index 32cf60668097..6bf791543138 100644 --- a/receiver/purefareceiver/go.mod +++ b/receiver/purefareceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -133,16 +133,16 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/purefareceiver/go.sum b/receiver/purefareceiver/go.sum index 6369d831692a..c92e63f84e60 100644 --- a/receiver/purefareceiver/go.sum +++ b/receiver/purefareceiver/go.sum @@ -502,8 +502,8 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULu github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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.6 h1:Oe8TPH9wAbv++YPNDKJWUnI8Q4PPWCx3UbOfH+FxiMU= @@ -553,8 +553,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/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= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -562,66 +562,66 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= diff --git a/receiver/purefbreceiver/go.mod b/receiver/purefbreceiver/go.mod index 781340e8b7e4..e5bd0aad46a9 100644 --- a/receiver/purefbreceiver/go.mod +++ b/receiver/purefbreceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -133,16 +133,16 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/purefbreceiver/go.sum b/receiver/purefbreceiver/go.sum index 6369d831692a..c92e63f84e60 100644 --- a/receiver/purefbreceiver/go.sum +++ b/receiver/purefbreceiver/go.sum @@ -502,8 +502,8 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULu github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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.6 h1:Oe8TPH9wAbv++YPNDKJWUnI8Q4PPWCx3UbOfH+FxiMU= @@ -553,8 +553,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/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= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -562,66 +562,66 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= diff --git a/receiver/rabbitmqreceiver/client_test.go b/receiver/rabbitmqreceiver/client_test.go index f6427bb3a3fe..113b4bbda05f 100644 --- a/receiver/rabbitmqreceiver/client_test.go +++ b/receiver/rabbitmqreceiver/client_test.go @@ -41,8 +41,8 @@ func TestNewClient(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -57,7 +57,7 @@ func TestNewClient(t *testing.T) { desc: "Valid Configuration", cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/rabbitmqreceiver/config.go b/receiver/rabbitmqreceiver/config.go index bddc1c4dbc7a..6549234233bf 100644 --- a/receiver/rabbitmqreceiver/config.go +++ b/receiver/rabbitmqreceiver/config.go @@ -27,11 +27,11 @@ const defaultEndpoint = "http://localhost:15672" // Config defines the configuration for the various elements of the receiver agent. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } // Validate validates the configuration by checking for missing or invalid fields diff --git a/receiver/rabbitmqreceiver/factory.go b/receiver/rabbitmqreceiver/factory.go index 51aca22ca36d..13c304d38daa 100644 --- a/receiver/rabbitmqreceiver/factory.go +++ b/receiver/rabbitmqreceiver/factory.go @@ -28,11 +28,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, @@ -53,5 +53,5 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/rabbitmqreceiver/factory_test.go b/receiver/rabbitmqreceiver/factory_test.go index a6bb4b9b315d..f09667afd6cc 100644 --- a/receiver/rabbitmqreceiver/factory_test.go +++ b/receiver/rabbitmqreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 392b4cac0353..22bb9d50dad6 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -33,6 +33,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -51,14 +52,14 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/rabbitmqreceiver/go.sum b/receiver/rabbitmqreceiver/go.sum index 1edec012db99..9697de4b59e2 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -76,38 +78,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/rabbitmqreceiver/scraper_test.go b/receiver/rabbitmqreceiver/scraper_test.go index 527c9d15f53c..bcb64e7e7c56 100644 --- a/receiver/rabbitmqreceiver/scraper_test.go +++ b/receiver/rabbitmqreceiver/scraper_test.go @@ -37,8 +37,8 @@ func TestScraperStart(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -53,7 +53,7 @@ func TestScraperStart(t *testing.T) { scraper: &rabbitmqScraper{ cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/receivercreator/factory.go b/receiver/receivercreator/factory.go index 26c35128a8e7..1e9aca70aac7 100644 --- a/receiver/receivercreator/factory.go +++ b/receiver/receivercreator/factory.go @@ -66,20 +66,10 @@ func createLogsReceiver( cfg component.Config, consumer consumer.Logs, ) (receiver.Logs, error) { - var err error - var recv receiver.Logs - rCfg := cfg.(*Config) r := receivers.GetOrAdd(cfg, func() component.Component { - recv, err = newLogsReceiverCreator(params, rCfg, consumer) - return recv + return newReceiverCreator(params, cfg.(*Config)) }) - rcvr := r.Component.(*receiverCreator) - if rcvr.nextLogsConsumer == nil { - rcvr.nextLogsConsumer = consumer - } - if err != nil { - return nil, err - } + r.Component.(*receiverCreator).nextLogsConsumer = consumer return r, nil } @@ -89,20 +79,10 @@ func createMetricsReceiver( cfg component.Config, consumer consumer.Metrics, ) (receiver.Metrics, error) { - var err error - var recv receiver.Logs - rCfg := cfg.(*Config) r := receivers.GetOrAdd(cfg, func() component.Component { - recv, err = newMetricsReceiverCreator(params, rCfg, consumer) - return recv + return newReceiverCreator(params, cfg.(*Config)) }) - rcvr := r.Component.(*receiverCreator) - if rcvr.nextMetricsConsumer == nil { - rcvr.nextMetricsConsumer = consumer - } - if err != nil { - return nil, err - } + r.Component.(*receiverCreator).nextMetricsConsumer = consumer return r, nil } @@ -112,19 +92,9 @@ func createTracesReceiver( cfg component.Config, consumer consumer.Traces, ) (receiver.Traces, error) { - var err error - var recv receiver.Logs - rCfg := cfg.(*Config) r := receivers.GetOrAdd(cfg, func() component.Component { - recv, err = newTracesReceiverCreator(params, rCfg, consumer) - return recv + return newReceiverCreator(params, cfg.(*Config)) }) - rcvr := r.Component.(*receiverCreator) - if rcvr.nextTracesConsumer == nil { - rcvr.nextTracesConsumer = consumer - } - if err != nil { - return nil, err - } + r.Component.(*receiverCreator).nextTracesConsumer = consumer return r, nil } diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index 15c5120ee09d..e28716d69b6c 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,14 +9,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/spf13/cast v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -56,27 +56,27 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // 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/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index d7f7fb4264eb..00f67ef4f0f6 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -111,8 +111,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -141,58 +141,58 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -271,7 +271,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/receivercreator/receiver.go b/receiver/receivercreator/receiver.go index 704efa2608f4..7355c7c341dc 100644 --- a/receiver/receivercreator/receiver.go +++ b/receiver/receivercreator/receiver.go @@ -27,46 +27,11 @@ type receiverCreator struct { observables []observer.Observable } -// newLogsReceiverCreator creates the receiver_creator with the given parameters. -func newLogsReceiverCreator(params receiver.CreateSettings, cfg *Config, nextConsumer consumer.Logs) (receiver.Logs, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer +func newReceiverCreator(params receiver.CreateSettings, cfg *Config) receiver.Metrics { + return &receiverCreator{ + params: params, + cfg: cfg, } - - r := &receiverCreator{ - params: params, - cfg: cfg, - nextLogsConsumer: nextConsumer, - } - return r, nil -} - -// newMetricsReceiverCreator creates the receiver_creator with the given parameters. -func newMetricsReceiverCreator(params receiver.CreateSettings, cfg *Config, nextConsumer consumer.Metrics) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - - r := &receiverCreator{ - params: params, - cfg: cfg, - nextMetricsConsumer: nextConsumer, - } - return r, nil -} - -// newTracesReceiverCreator creates the receiver_creator with the given parameters. -func newTracesReceiverCreator(params receiver.CreateSettings, cfg *Config, nextConsumer consumer.Traces) (receiver.Traces, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - - r := &receiverCreator{ - params: params, - cfg: cfg, - nextTracesConsumer: nextConsumer, - } - return r, nil } // Start receiver_creator. diff --git a/receiver/redisreceiver/config.go b/receiver/redisreceiver/config.go index 7a932efc2aad..e466dd40ff26 100644 --- a/receiver/redisreceiver/config.go +++ b/receiver/redisreceiver/config.go @@ -16,7 +16,7 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` // TODO: Use one of the configs from core. // The target endpoint. confignet.AddrConfig `mapstructure:",squash"` @@ -33,7 +33,7 @@ type Config struct { // to a Redis 6.0 instance, or greater, that is using the Redis ACL system. Password configopaque.String `mapstructure:"password"` - TLS configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + TLS configtls.ClientConfig `mapstructure:"tls,omitempty"` MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/redisreceiver/config_test.go b/receiver/redisreceiver/config_test.go index a70ac3c10a6f..0863408bc19d 100644 --- a/receiver/redisreceiver/config_test.go +++ b/receiver/redisreceiver/config_test.go @@ -33,14 +33,14 @@ func TestConfig(t *testing.T) { &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:6379", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLS: configtls.TLSClientSetting{ + TLS: configtls.ClientConfig{ Insecure: true, }, Username: "test", Password: "test", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/redisreceiver/factory.go b/receiver/redisreceiver/factory.go index 495a5837fed5..5500ac844526 100644 --- a/receiver/redisreceiver/factory.go +++ b/receiver/redisreceiver/factory.go @@ -26,17 +26,17 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - scs := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scs := scraperhelper.NewDefaultControllerConfig() scs.CollectionInterval = 10 * time.Second return &Config{ AddrConfig: confignet.AddrConfig{ - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLS: configtls.TLSClientSetting{ + TLS: configtls.ClientConfig{ Insecure: true, }, - ScraperControllerSettings: scs, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scs, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -53,5 +53,5 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&oCfg.ScraperControllerSettings, set, consumer, scraperhelper.AddScraper(scrp)) + return scraperhelper.NewScraperControllerReceiver(&oCfg.ControllerConfig, set, consumer, scraperhelper.AddScraper(scrp)) } diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 27dc73fdd516..b6ee7c78921e 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -9,14 +9,14 @@ require ( github.com/redis/go-redis/v9 v9.5.1 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -75,14 +75,14 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index 99b8d022630d..c08e1bd68b1a 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -124,8 +124,8 @@ github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLB github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -150,28 +150,28 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -219,7 +219,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/redisreceiver/redis_scraper.go b/receiver/redisreceiver/redis_scraper.go index dc7a9161cd2c..aee7cff55b24 100644 --- a/receiver/redisreceiver/redis_scraper.go +++ b/receiver/redisreceiver/redis_scraper.go @@ -38,7 +38,7 @@ func newRedisScraper(cfg *Config, settings receiver.CreateSettings) (scraperhelp Addr: cfg.Endpoint, Username: cfg.Username, Password: string(cfg.Password), - Network: cfg.Transport, + Network: string(cfg.Transport), } var err error diff --git a/receiver/redisreceiver/redis_scraper_test.go b/receiver/redisreceiver/redis_scraper_test.go index a7da4f803a68..b46a679f74bf 100644 --- a/receiver/redisreceiver/redis_scraper_test.go +++ b/receiver/redisreceiver/redis_scraper_test.go @@ -45,8 +45,8 @@ func TestNewReceiver_invalid_endpoint(t *testing.T) { func TestNewReceiver_invalid_auth_error(t *testing.T) { c := createDefaultConfig().(*Config) - c.TLS = configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + c.TLS = configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/invalid", }, } diff --git a/receiver/riakreceiver/client_test.go b/receiver/riakreceiver/client_test.go index e9ebe738e6ac..e1b0e57e1c00 100644 --- a/receiver/riakreceiver/client_test.go +++ b/receiver/riakreceiver/client_test.go @@ -37,8 +37,8 @@ func TestNewClient(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -50,7 +50,7 @@ func TestNewClient(t *testing.T) { desc: "Valid Configuration", cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/riakreceiver/config.go b/receiver/riakreceiver/config.go index 24634aca000c..ee6a77f01d8b 100644 --- a/receiver/riakreceiver/config.go +++ b/receiver/riakreceiver/config.go @@ -28,11 +28,11 @@ const defaultEndpoint = "http://localhost:8098" // Config defines the configuration for the various elements of the receiver agent. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:"metrics"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:"metrics"` } // Validate validates the configuration by checking for missing or invalid fields diff --git a/receiver/riakreceiver/config_test.go b/receiver/riakreceiver/config_test.go index 62ab4082daf5..0874b07b7531 100644 --- a/receiver/riakreceiver/config_test.go +++ b/receiver/riakreceiver/config_test.go @@ -11,8 +11,6 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/multierr" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver/internal/metadata" ) func TestValidate(t *testing.T) { @@ -27,7 +25,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingUsername, @@ -42,7 +40,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingPassword, @@ -56,7 +54,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingUsername, @@ -71,7 +69,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`), @@ -85,7 +83,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: nil, }, diff --git a/receiver/riakreceiver/factory.go b/receiver/riakreceiver/factory.go index fb12efe5d12f..d51866684361 100644 --- a/receiver/riakreceiver/factory.go +++ b/receiver/riakreceiver/factory.go @@ -28,11 +28,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, @@ -53,5 +53,5 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/riakreceiver/factory_test.go b/receiver/riakreceiver/factory_test.go index 2ca3de378967..23924dbc4df2 100644 --- a/receiver/riakreceiver/factory_test.go +++ b/receiver/riakreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index 0879ece809e6..423f8af9a9c4 100644 --- a/receiver/riakreceiver/go.mod +++ b/receiver/riakreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -34,6 +34,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,14 +53,14 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/riakreceiver/go.sum b/receiver/riakreceiver/go.sum index 1edec012db99..9697de4b59e2 100644 --- a/receiver/riakreceiver/go.sum +++ b/receiver/riakreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -76,38 +78,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/riakreceiver/scraper_test.go b/receiver/riakreceiver/scraper_test.go index 87792b40d345..24d39dd4ce07 100644 --- a/receiver/riakreceiver/scraper_test.go +++ b/receiver/riakreceiver/scraper_test.go @@ -38,8 +38,8 @@ func TestScraperStart(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -55,7 +55,7 @@ func TestScraperStart(t *testing.T) { scraper: &riakScraper{ cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/saphanareceiver/client.go b/receiver/saphanareceiver/client.go index 2c725f23e47e..0462fa0d1bfc 100644 --- a/receiver/saphanareceiver/client.go +++ b/receiver/saphanareceiver/client.go @@ -107,7 +107,7 @@ func (c *sapHanaClient) Connect(ctx context.Context) error { return fmt.Errorf("error generating DSN for SAP HANA connection: %w", err) } - tls, err := c.receiverConfig.TLSClientSetting.LoadTLSConfig() + tls, err := c.receiverConfig.ClientConfig.LoadTLSConfig() if err != nil { return fmt.Errorf("error generating TLS config for SAP HANA connection: %w", err) } diff --git a/receiver/saphanareceiver/config.go b/receiver/saphanareceiver/config.go index 5d7a923ae18e..fae91e22cb47 100644 --- a/receiver/saphanareceiver/config.go +++ b/receiver/saphanareceiver/config.go @@ -22,9 +22,9 @@ const ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confignet.TCPAddrConfig `mapstructure:",squash"` - configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confignet.TCPAddrConfig `mapstructure:",squash"` + configtls.ClientConfig `mapstructure:"tls,omitempty"` // MetricsBuilderConfig defines which metrics/attributes to enable for the scraper metadata.MetricsBuilderConfig `mapstructure:",squash"` diff --git a/receiver/saphanareceiver/factory.go b/receiver/saphanareceiver/factory.go index b9d3bd4bd840..7c1c9d3d6d6c 100644 --- a/receiver/saphanareceiver/factory.go +++ b/receiver/saphanareceiver/factory.go @@ -31,17 +31,17 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - scs := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scs := scraperhelper.NewDefaultControllerConfig() scs.CollectionInterval = 10 * time.Second return &Config{ TCPAddrConfig: confignet.TCPAddrConfig{ Endpoint: defaultEndpoint, }, - TLSClientSetting: configtls.TLSClientSetting{ + ClientConfig: configtls.ClientConfig{ Insecure: true, }, - ScraperControllerSettings: scs, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scs, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -62,5 +62,5 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&c.ScraperControllerSettings, set, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&c.ControllerConfig, set, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/saphanareceiver/factory_test.go b/receiver/saphanareceiver/factory_test.go index c76951530f5a..2f14794462a9 100644 --- a/receiver/saphanareceiver/factory_test.go +++ b/receiver/saphanareceiver/factory_test.go @@ -37,7 +37,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index f89e3b62bacc..3d9e5eb2e842 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -8,14 +8,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -33,6 +33,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -48,8 +49,8 @@ require ( github.com/prometheus/common v0.50.0 // indirect github.com/prometheus/procfs v0.13.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/saphanareceiver/go.sum b/receiver/saphanareceiver/go.sum index 67ae66b0d41b..31157194b6ac 100644 --- a/receiver/saphanareceiver/go.sum +++ b/receiver/saphanareceiver/go.sum @@ -25,6 +25,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -68,26 +70,26 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/sapmreceiver/config_test.go b/receiver/sapmreceiver/config_test.go index 8dda68c3e374..12793588a7b6 100644 --- a/receiver/sapmreceiver/config_test.go +++ b/receiver/sapmreceiver/config_test.go @@ -45,8 +45,8 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7276", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "/test.crt", KeyFile: "/test.key", }, diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 6e17f89bc981..3d6d80bb1e6a 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -11,14 +11,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/signalfx/sapm-proto v0.14.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -38,6 +38,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -54,17 +55,17 @@ require ( github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index 1debf2203d67..538f60a500e8 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -32,6 +32,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= @@ -86,44 +88,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/sapmreceiver/trace_receiver_test.go b/receiver/sapmreceiver/trace_receiver_test.go index 247c3c44274b..2446b4f02676 100644 --- a/receiver/sapmreceiver/trace_receiver_test.go +++ b/receiver/sapmreceiver/trace_receiver_test.go @@ -174,8 +174,8 @@ func sendSapm( client := &http.Client{} if tlsEnabled { - tlscs := configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + tlscs := configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/ca.crt", CertFile: "./testdata/client.crt", KeyFile: "./testdata/client.key", @@ -310,8 +310,8 @@ func TestReception(t *testing.T) { config: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: tlsAddress, - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/ca.crt", CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", diff --git a/receiver/signalfxreceiver/config_test.go b/receiver/signalfxreceiver/config_test.go index e1d3f55cca04..1ae28b779f17 100644 --- a/receiver/signalfxreceiver/config_test.go +++ b/receiver/signalfxreceiver/config_test.go @@ -48,8 +48,8 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:9943", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "/test.crt", KeyFile: "/test.key", }, diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 5ef7e5dd5fe8..0edf9379db53 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -11,14 +11,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.96.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -39,6 +39,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -66,17 +67,17 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 368341da6303..f1d0934cd0f6 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -44,6 +44,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= @@ -117,44 +119,44 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/signalfxreceiver/receiver.go b/receiver/signalfxreceiver/receiver.go index 077614782af3..a5053ccc71fd 100644 --- a/receiver/signalfxreceiver/receiver.go +++ b/receiver/signalfxreceiver/receiver.go @@ -122,9 +122,6 @@ func (r *sfxReceiver) RegisterLogsConsumer(lc consumer.Logs) { // By convention the consumer of the received data is set when the receiver // instance is created. func (r *sfxReceiver) Start(_ context.Context, host component.Host) error { - if r.metricsConsumer == nil && r.logsConsumer == nil { - return component.ErrNilNextConsumer - } if r.server != nil { return nil diff --git a/receiver/signalfxreceiver/receiver_test.go b/receiver/signalfxreceiver/receiver_test.go index 442c570f0a42..07004c0cdc6b 100644 --- a/receiver/signalfxreceiver/receiver_test.go +++ b/receiver/signalfxreceiver/receiver_test.go @@ -616,8 +616,8 @@ func Test_sfxReceiver_TLS(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) cfg := createDefaultConfig().(*Config) cfg.Endpoint = addr - cfg.ServerConfig.TLSSetting = &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + cfg.ServerConfig.TLSSetting = &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, @@ -666,8 +666,8 @@ func Test_sfxReceiver_TLS(t *testing.T) { require.NoErrorf(t, err, "should have no errors with new request: %v", err) req.Header.Set("Content-Type", "application/x-protobuf") - tlscs := configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + tlscs := configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/ca.crt", CertFile: "./testdata/client.crt", KeyFile: "./testdata/client.key", diff --git a/receiver/simpleprometheusreceiver/config_test.go b/receiver/simpleprometheusreceiver/config_test.go index 9e4f33132319..2e1190da56b4 100644 --- a/receiver/simpleprometheusreceiver/config_test.go +++ b/receiver/simpleprometheusreceiver/config_test.go @@ -38,8 +38,8 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "path", CertFile: "path", KeyFile: "path", @@ -58,7 +58,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, diff --git a/receiver/simpleprometheusreceiver/factory.go b/receiver/simpleprometheusreceiver/factory.go index 976ad36d5cc5..ec7cf2f779dd 100644 --- a/receiver/simpleprometheusreceiver/factory.go +++ b/receiver/simpleprometheusreceiver/factory.go @@ -36,7 +36,7 @@ func createDefaultConfig() component.Config { return &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 28d2411c78c8..c9f5376928af 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -7,16 +7,16 @@ require ( github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 - k8s.io/client-go v0.29.2 + k8s.io/client-go v0.29.3 ) require ( @@ -61,7 +61,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -131,17 +131,17 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -171,8 +171,8 @@ require ( gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index bdd1a91ac15c..75cc74ad68f7 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -208,8 +208,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -502,8 +502,8 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULu github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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.6 h1:Oe8TPH9wAbv++YPNDKJWUnI8Q4PPWCx3UbOfH+FxiMU= @@ -553,8 +553,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/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= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -562,66 +562,66 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= @@ -1021,12 +1021,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= diff --git a/receiver/simpleprometheusreceiver/receiver.go b/receiver/simpleprometheusreceiver/receiver.go index 7fed4cd52ee0..bb885c9dad87 100644 --- a/receiver/simpleprometheusreceiver/receiver.go +++ b/receiver/simpleprometheusreceiver/receiver.go @@ -56,8 +56,8 @@ func (prw *prometheusReceiverWrapper) Start(ctx context.Context, host component. func getPrometheusConfigWrapper(cfg *Config, params receiver.CreateSettings) (*prometheusreceiver.Config, error) { if cfg.TLSEnabled { params.Logger.Warn("the `tls_config` and 'tls_enabled' settings are deprecated, please use `tls` instead") - cfg.ClientConfig.TLSSetting = configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + cfg.ClientConfig.TLSSetting = configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: cfg.TLSConfig.CAFile, CertFile: cfg.TLSConfig.CertFile, KeyFile: cfg.TLSConfig.KeyFile, diff --git a/receiver/simpleprometheusreceiver/receiver_test.go b/receiver/simpleprometheusreceiver/receiver_test.go index 87e40f01ff0c..f03f23405542 100644 --- a/receiver/simpleprometheusreceiver/receiver_test.go +++ b/receiver/simpleprometheusreceiver/receiver_test.go @@ -77,7 +77,7 @@ func TestGetPrometheusConfig(t *testing.T) { config: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, @@ -115,8 +115,8 @@ func TestGetPrometheusConfig(t *testing.T) { config: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/test_cert.pem", }, InsecureSkipVerify: true, @@ -221,7 +221,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { }, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, @@ -268,7 +268,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { }, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, @@ -309,7 +309,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { }, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -350,9 +350,9 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { }, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.Config{ CAFile: "./testdata/test_cert.pem", }, }, diff --git a/receiver/skywalkingreceiver/config_test.go b/receiver/skywalkingreceiver/config_test.go index 0a1b1c15a3c2..935b5b193a3f 100644 --- a/receiver/skywalkingreceiver/config_test.go +++ b/receiver/skywalkingreceiver/config_test.go @@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:11800", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, diff --git a/receiver/skywalkingreceiver/factory.go b/receiver/skywalkingreceiver/factory.go index 6084583ed357..d82bd1a75a09 100644 --- a/receiver/skywalkingreceiver/factory.go +++ b/receiver/skywalkingreceiver/factory.go @@ -49,7 +49,7 @@ func createDefaultConfig() component.Config { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: localhostgate.EndpointForPort(defaultGRPCPort), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, HTTP: &confighttp.ServerConfig{ diff --git a/receiver/skywalkingreceiver/factory_test.go b/receiver/skywalkingreceiver/factory_test.go index 7ab5e7480248..b9a150372c52 100644 --- a/receiver/skywalkingreceiver/factory_test.go +++ b/receiver/skywalkingreceiver/factory_test.go @@ -44,7 +44,7 @@ func TestCreateReceiver(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:11800", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } traceSink := new(consumertest.TracesSink) @@ -89,7 +89,7 @@ func TestCreateDefaultGRPCEndpoint(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:11800", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } traceSink := new(consumertest.TracesSink) @@ -107,10 +107,10 @@ func TestCreateTLSGPRCEndpoint(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:11800", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, @@ -128,8 +128,8 @@ func TestCreateTLSHTTPEndpoint(t *testing.T) { cfg.(*Config).Protocols.HTTP = &confighttp.ServerConfig{ Endpoint: "0.0.0.0:12800", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index 384b04138ce6..83c296d9e4e9 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -8,16 +8,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,7 +28,6 @@ require ( ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -58,16 +57,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index acd3fe394fae..ae68133f4f64 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -1,10 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg= cloud.google.com/go v0.34.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 v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= @@ -18,8 +13,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -30,8 +23,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= 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= @@ -136,46 +127,46 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -233,8 +224,6 @@ golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -292,8 +281,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= 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-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= diff --git a/receiver/skywalkingreceiver/skywalking_receiver.go b/receiver/skywalkingreceiver/skywalking_receiver.go index 1da974c42fef..159bb6443ccd 100644 --- a/receiver/skywalkingreceiver/skywalking_receiver.go +++ b/receiver/skywalkingreceiver/skywalking_receiver.go @@ -70,9 +70,6 @@ func newSkywalkingReceiver( // registerTraceConsumer register a TracesReceiver that receives trace func (sr *swReceiver) registerTraceConsumer(tc consumer.Traces) error { - if tc == nil { - return component.ErrNilNextConsumer - } var err error sr.traceReceiver, err = trace.NewReceiver(tc, sr.settings) if err != nil { @@ -83,9 +80,6 @@ func (sr *swReceiver) registerTraceConsumer(tc consumer.Traces) error { // registerTraceConsumer register a TracesReceiver that receives trace func (sr *swReceiver) registerMetricsConsumer(mc consumer.Metrics) error { - if mc == nil { - return component.ErrNilNextConsumer - } var err error sr.metricsReceiver, err = metrics.NewReceiver(mc, sr.settings) if err != nil { @@ -160,7 +154,7 @@ func (sr *swReceiver) startCollector(host component.Host) error { if sr.collectorGRPCEnabled() { var err error - sr.grpc, err = sr.config.CollectorGRPCServerSettings.ToServer(host, sr.settings.TelemetrySettings) + sr.grpc, err = sr.config.CollectorGRPCServerSettings.ToServerContext(context.Background(), host, sr.settings.TelemetrySettings) if err != nil { return fmt.Errorf("failed to build the options for the Skywalking gRPC Collector: %w", err) } diff --git a/receiver/snmpreceiver/config.go b/receiver/snmpreceiver/config.go index c0b275998264..2e6200ec1ae8 100644 --- a/receiver/snmpreceiver/config.go +++ b/receiver/snmpreceiver/config.go @@ -72,7 +72,7 @@ var ( // Config defines the configuration for the various elements of the receiver. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` // Endpoint is the SNMP target to request data from. Must be formatted as [udp|tcp|][4|6|]://{host}:{port}. // Default: udp://localhost:161 diff --git a/receiver/snmpreceiver/factory.go b/receiver/snmpreceiver/factory.go index dfcac84c072a..29c7edafd703 100644 --- a/receiver/snmpreceiver/factory.go +++ b/receiver/snmpreceiver/factory.go @@ -31,7 +31,7 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates a config for SNMP with as many default values as possible func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: defaultCollectionInterval, Timeout: defaultTimeout, }, @@ -66,7 +66,7 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&snmpConfig.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&snmpConfig.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } // addMissingConfigDefaults adds any missing config parameters that have defaults diff --git a/receiver/snmpreceiver/factory_test.go b/receiver/snmpreceiver/factory_test.go index d52d03f7d4b1..77eff2b9656d 100644 --- a/receiver/snmpreceiver/factory_test.go +++ b/receiver/snmpreceiver/factory_test.go @@ -34,7 +34,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: defaultCollectionInterval, Timeout: defaultTimeout, }, diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index 77e7b4ea038c..f690ed76d30b 100644 --- a/receiver/snmpreceiver/go.mod +++ b/receiver/snmpreceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -74,7 +74,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.8.0 // indirect @@ -82,23 +82,23 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect diff --git a/receiver/snmpreceiver/go.sum b/receiver/snmpreceiver/go.sum index e8ee3a6d6073..5973623d1c25 100644 --- a/receiver/snmpreceiver/go.sum +++ b/receiver/snmpreceiver/go.sum @@ -155,8 +155,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -188,60 +188,60 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -326,7 +326,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/snowflakereceiver/config.go b/receiver/snowflakereceiver/config.go index e93a3377583f..289bc5d7e953 100644 --- a/receiver/snowflakereceiver/config.go +++ b/receiver/snowflakereceiver/config.go @@ -21,15 +21,15 @@ var ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` - Account string `mapstructure:"account"` - Schema string `mapstructure:"schema"` - Warehouse string `mapstructure:"warehouse"` - Database string `mapstructure:"database"` - Role string `mapstructure:"role"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` + Account string `mapstructure:"account"` + Schema string `mapstructure:"schema"` + Warehouse string `mapstructure:"warehouse"` + Database string `mapstructure:"database"` + Role string `mapstructure:"role"` } func (cfg *Config) Validate() error { diff --git a/receiver/snowflakereceiver/config_test.go b/receiver/snowflakereceiver/config_test.go index 706eaa404205..4235f9615f5e 100644 --- a/receiver/snowflakereceiver/config_test.go +++ b/receiver/snowflakereceiver/config_test.go @@ -37,55 +37,55 @@ func TestValidateConfig(t *testing.T) { desc: "Missing username all else present", expect: errMissingUsername, conf: Config{ - Username: "", - Password: "password", - Account: "account", - Warehouse: "warehouse", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Username: "", + Password: "password", + Account: "account", + Warehouse: "warehouse", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { desc: "Missing password all else present", expect: errMissingPassword, conf: Config{ - Username: "username", - Password: "", - Account: "account", - Warehouse: "warehouse", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Username: "username", + Password: "", + Account: "account", + Warehouse: "warehouse", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { desc: "Missing account all else present", expect: errMissingAccount, conf: Config{ - Username: "username", - Password: "password", - Account: "", - Warehouse: "warehouse", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Username: "username", + Password: "password", + Account: "", + Warehouse: "warehouse", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { desc: "Missing warehouse all else present", expect: errMissingWarehouse, conf: Config{ - Username: "username", - Password: "password", - Account: "account", - Warehouse: "", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Username: "username", + Password: "password", + Account: "account", + Warehouse: "", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { desc: "Missing multiple check multierror", expect: multierror, conf: Config{ - Username: "username", - Password: "", - Account: "account", - Warehouse: "", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Username: "username", + Password: "", + Account: "account", + Warehouse: "", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, } @@ -122,7 +122,7 @@ func TestLoadConfig(t *testing.T) { Password: "securepassword", Account: "bigbusinessaccount", Warehouse: "metricWarehouse", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 18 * time.Minute, InitialDelay: time.Second, }, diff --git a/receiver/snowflakereceiver/factory.go b/receiver/snowflakereceiver/factory.go index 91509b1ec7e0..1b8ebf7940c0 100644 --- a/receiver/snowflakereceiver/factory.go +++ b/receiver/snowflakereceiver/factory.go @@ -23,15 +23,15 @@ const ( ) func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultInterval return &Config{ - ScraperControllerSettings: cfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - Schema: defaultSchema, - Database: defaultDB, - Role: defaultRole, + ControllerConfig: cfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + Schema: defaultSchema, + Database: defaultDB, + Role: defaultRole, } } @@ -57,7 +57,7 @@ func createMetricsReceiver(_ context.Context, } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/snowflakereceiver/go.mod b/receiver/snowflakereceiver/go.mod index 7b7763a48cc2..63c75568feb5 100644 --- a/receiver/snowflakereceiver/go.mod +++ b/receiver/snowflakereceiver/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/snowflakedb/gosnowflake v1.8.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -58,6 +58,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect + github.com/google/uuid v1.6.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -81,8 +82,8 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/snowflakereceiver/go.sum b/receiver/snowflakereceiver/go.sum index e4f43c87ecfd..341ad85190bc 100644 --- a/receiver/snowflakereceiver/go.sum +++ b/receiver/snowflakereceiver/go.sum @@ -186,22 +186,22 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/solacereceiver/config.go b/receiver/solacereceiver/config.go index 40e75a25efd4..2e4316c1c986 100644 --- a/receiver/solacereceiver/config.go +++ b/receiver/solacereceiver/config.go @@ -37,7 +37,7 @@ type Config struct { // The maximum number of unacknowledged messages the Solace broker can transmit, to configure AMQP Link MaxUnacked int32 `mapstructure:"max_unacknowledged"` - TLS configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + TLS configtls.ClientConfig `mapstructure:"tls,omitempty"` Auth Authentication `mapstructure:"auth"` diff --git a/receiver/solacereceiver/config_test.go b/receiver/solacereceiver/config_test.go index 3c6a66e48b47..c3746a417c5a 100644 --- a/receiver/solacereceiver/config_test.go +++ b/receiver/solacereceiver/config_test.go @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { }, Queue: "queue://#trace-profile123", MaxUnacked: 1234, - TLS: configtls.TLSClientSetting{ + TLS: configtls.ClientConfig{ Insecure: false, InsecureSkipVerify: false, }, diff --git a/receiver/solacereceiver/factory.go b/receiver/solacereceiver/factory.go index 574aaf522446..6e75725747f9 100644 --- a/receiver/solacereceiver/factory.go +++ b/receiver/solacereceiver/factory.go @@ -37,7 +37,7 @@ func createDefaultConfig() component.Config { Broker: []string{defaultHost}, MaxUnacked: defaultMaxUnaked, Auth: Authentication{}, - TLS: configtls.TLSClientSetting{ + TLS: configtls.ClientConfig{ InsecureSkipVerify: false, Insecure: false, }, diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index 0d3bbae3e9d2..da5187090b4f 100644 --- a/receiver/solacereceiver/go.mod +++ b/receiver/solacereceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/Azure/go-amqp v1.0.5 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 @@ -35,6 +35,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -48,7 +49,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect diff --git a/receiver/solacereceiver/go.sum b/receiver/solacereceiver/go.sum index c3fc0ec1e2b4..a82cc971f5cd 100644 --- a/receiver/solacereceiver/go.sum +++ b/receiver/solacereceiver/go.sum @@ -57,6 +57,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -108,22 +110,22 @@ 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.96.0 h1:qXA3biNps8LPYYCTJwepGu58sW0XInmwnQbkkWZchIg= go.opentelemetry.io/collector v0.96.0/go.mod h1:/i3zyRg23r7vloTLzKG/mRI2VkEt1Q4ARXbe3vKnAaE= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/solacereceiver/messaging_service_test.go b/receiver/solacereceiver/messaging_service_test.go index 678ad4f5666d..f2099f5ab95d 100644 --- a/receiver/solacereceiver/messaging_service_test.go +++ b/receiver/solacereceiver/messaging_service_test.go @@ -85,7 +85,7 @@ func TestNewAMQPMessagingServiceFactory(t *testing.T) { name: "expecting authentication errors", cfg: &Config{ // no password Auth: Authentication{PlainText: &SaslPlainTextConfig{Username: "set"}}, - TLS: configtls.TLSClientSetting{Insecure: false, InsecureSkipVerify: false}, + TLS: configtls.ClientConfig{Insecure: false, InsecureSkipVerify: false}, Broker: []string{broker}, Queue: queue, MaxUnacked: maxUnacked, @@ -97,7 +97,7 @@ func TestNewAMQPMessagingServiceFactory(t *testing.T) { name: "expecting tls errors", cfg: &Config{ // invalid to only provide a key file Auth: Authentication{PlainText: &SaslPlainTextConfig{Username: "user", Password: "password"}}, - TLS: configtls.TLSClientSetting{TLSSetting: configtls.TLSSetting{KeyFile: "someKeyFile"}, Insecure: false}, + TLS: configtls.ClientConfig{TLSSetting: configtls.Config{KeyFile: "someKeyFile"}, Insecure: false}, Broker: []string{broker}, Queue: queue, MaxUnacked: maxUnacked, @@ -109,7 +109,7 @@ func TestNewAMQPMessagingServiceFactory(t *testing.T) { name: "expecting success with TLS expecting an amqps connection", cfg: &Config{ // invalid to only provide a key file Auth: Authentication{PlainText: &SaslPlainTextConfig{Username: "user", Password: "password"}}, - TLS: configtls.TLSClientSetting{Insecure: false}, + TLS: configtls.ClientConfig{Insecure: false}, Broker: []string{broker}, Queue: queue, MaxUnacked: maxUnacked, @@ -133,7 +133,7 @@ func TestNewAMQPMessagingServiceFactory(t *testing.T) { name: "expecting success without TLS expecting an amqp connection", cfg: &Config{ // invalid to only provide a key file Auth: Authentication{PlainText: &SaslPlainTextConfig{Username: "user", Password: "password"}}, - TLS: configtls.TLSClientSetting{Insecure: true}, + TLS: configtls.ClientConfig{Insecure: true}, Broker: []string{broker}, Queue: queue, MaxUnacked: maxUnacked, diff --git a/receiver/solacereceiver/receiver.go b/receiver/solacereceiver/receiver.go index 70ad59598371..56e3d3fadbff 100644 --- a/receiver/solacereceiver/receiver.go +++ b/receiver/solacereceiver/receiver.go @@ -40,10 +40,6 @@ type solaceTracesReceiver struct { // newTracesReceiver creates a new solaceTraceReceiver as a receiver.Traces func newTracesReceiver(config *Config, set receiver.CreateSettings, nextConsumer consumer.Traces) (receiver.Traces, error) { - if nextConsumer == nil { - set.Logger.Warn("Next consumer in pipeline is null, stopping receiver") - return nil, component.ErrNilNextConsumer - } factory, err := newAMQPMessagingServiceFactory(config, set.Logger) if err != nil { diff --git a/receiver/splunkenterprisereceiver/client_test.go b/receiver/splunkenterprisereceiver/client_test.go index 8dd873da9f02..f11bc0a84ad3 100644 --- a/receiver/splunkenterprisereceiver/client_test.go +++ b/receiver/splunkenterprisereceiver/client_test.go @@ -38,7 +38,7 @@ func TestClientCreation(t *testing.T) { Endpoint: "https://localhost:8089", Auth: &configauth.Authentication{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: 1 * time.Second, Timeout: 11 * time.Second, @@ -67,7 +67,7 @@ func TestClientCreateRequest(t *testing.T) { Endpoint: "https://localhost:8089", Auth: &configauth.Authentication{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: 1 * time.Second, Timeout: 11 * time.Second, @@ -148,7 +148,7 @@ func TestAPIRequestCreate(t *testing.T) { Endpoint: "https://localhost:8089", Auth: &configauth.Authentication{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: 1 * time.Second, Timeout: 11 * time.Second, diff --git a/receiver/splunkenterprisereceiver/config.go b/receiver/splunkenterprisereceiver/config.go index f9ac3488aa65..077734fc06ba 100644 --- a/receiver/splunkenterprisereceiver/config.go +++ b/receiver/splunkenterprisereceiver/config.go @@ -22,11 +22,11 @@ var ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - IdxEndpoint confighttp.ClientConfig `mapstructure:"indexer"` - SHEndpoint confighttp.ClientConfig `mapstructure:"search_head"` - CMEndpoint confighttp.ClientConfig `mapstructure:"cluster_master"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + IdxEndpoint confighttp.ClientConfig `mapstructure:"indexer"` + SHEndpoint confighttp.ClientConfig `mapstructure:"search_head"` + CMEndpoint confighttp.ClientConfig `mapstructure:"cluster_master"` } func (cfg *Config) Validate() (errors error) { diff --git a/receiver/splunkenterprisereceiver/factory.go b/receiver/splunkenterprisereceiver/factory.go index d0b9343c63a1..af86220bd48d 100644 --- a/receiver/splunkenterprisereceiver/factory.go +++ b/receiver/splunkenterprisereceiver/factory.go @@ -31,16 +31,16 @@ func createDefaultConfig() component.Config { httpCfg.Timeout = defaultMaxSearchWaitTime // Default ScraperController settings - scfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scfg := scraperhelper.NewDefaultControllerConfig() scfg.CollectionInterval = defaultInterval scfg.Timeout = defaultMaxSearchWaitTime return &Config{ - IdxEndpoint: httpCfg, - SHEndpoint: httpCfg, - CMEndpoint: httpCfg, - ScraperControllerSettings: scfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + IdxEndpoint: httpCfg, + SHEndpoint: httpCfg, + CMEndpoint: httpCfg, + ControllerConfig: scfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -69,7 +69,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/splunkenterprisereceiver/factory_test.go b/receiver/splunkenterprisereceiver/factory_test.go index be717b5c73f8..49e8933efbea 100644 --- a/receiver/splunkenterprisereceiver/factory_test.go +++ b/receiver/splunkenterprisereceiver/factory_test.go @@ -34,7 +34,7 @@ func TestDefaultConfig(t *testing.T) { IdxEndpoint: cfg, SHEndpoint: cfg, CMEndpoint: cfg, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Minute, InitialDelay: 1 * time.Second, Timeout: 60 * time.Second, diff --git a/receiver/splunkenterprisereceiver/go.mod b/receiver/splunkenterprisereceiver/go.mod index 23c1f83140a4..118542101919 100644 --- a/receiver/splunkenterprisereceiver/go.mod +++ b/receiver/splunkenterprisereceiver/go.mod @@ -7,15 +7,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -35,6 +35,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,13 +53,13 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/splunkenterprisereceiver/go.sum b/receiver/splunkenterprisereceiver/go.sum index ce221d1a2a71..765decb76527 100644 --- a/receiver/splunkenterprisereceiver/go.sum +++ b/receiver/splunkenterprisereceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -74,38 +76,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/splunkenterprisereceiver/scraper.go b/receiver/splunkenterprisereceiver/scraper.go index f132ed8c7b9e..978411b168dd 100644 --- a/receiver/splunkenterprisereceiver/scraper.go +++ b/receiver/splunkenterprisereceiver/scraper.go @@ -131,7 +131,7 @@ func (s *splunkScraper) scrapeLicenseUsageByIndex(ctx context.Context, now pcomm time.Sleep(2 * time.Second) } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -209,7 +209,7 @@ func (s *splunkScraper) scrapeAvgExecLatencyByHost(ctx context.Context, now pcom break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -291,7 +291,7 @@ func (s *splunkScraper) scrapeIndexerAvgRate(ctx context.Context, now pcommon.Ti break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -373,7 +373,7 @@ func (s *splunkScraper) scrapeIndexerPipelineQueues(ctx context.Context, now pco break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -486,7 +486,7 @@ func (s *splunkScraper) scrapeBucketsSearchableStatus(ctx context.Context, now p break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -574,7 +574,7 @@ func (s *splunkScraper) scrapeIndexesBucketCountAdHoc(ctx context.Context, now p break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -682,7 +682,7 @@ func (s *splunkScraper) scrapeSchedulerCompletionRatioByHost(ctx context.Context break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -760,7 +760,7 @@ func (s *splunkScraper) scrapeIndexerRawWriteSecondsByHost(ctx context.Context, break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -838,7 +838,7 @@ func (s *splunkScraper) scrapeIndexerCPUSecondsByHost(ctx context.Context, now p break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -916,7 +916,7 @@ func (s *splunkScraper) scrapeAvgIopsByHost(ctx context.Context, now pcommon.Tim break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -994,7 +994,7 @@ func (s *splunkScraper) scrapeSchedulerRunTimeByHost(ctx context.Context, now pc break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } diff --git a/receiver/splunkenterprisereceiver/scraper_test.go b/receiver/splunkenterprisereceiver/scraper_test.go index f6e6c547d1a2..e79f908089a8 100644 --- a/receiver/splunkenterprisereceiver/scraper_test.go +++ b/receiver/splunkenterprisereceiver/scraper_test.go @@ -95,7 +95,7 @@ func TestScraper(t *testing.T) { Endpoint: ts.URL, Auth: &configauth.Authentication{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: 1 * time.Second, Timeout: 11 * time.Second, diff --git a/receiver/splunkhecreceiver/config_test.go b/receiver/splunkhecreceiver/config_test.go index 22a73fbd3a0d..595968959d28 100644 --- a/receiver/splunkhecreceiver/config_test.go +++ b/receiver/splunkhecreceiver/config_test.go @@ -57,8 +57,8 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:8088", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "/test.crt", KeyFile: "/test.key", }, diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index 20c0eb3fa813..4750152de84e 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -11,15 +11,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -39,6 +39,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -58,16 +59,16 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index d66d36ab5294..ed35227b03e8 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -150,8 +150,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= @@ -173,48 +173,48 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/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.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/splunkhecreceiver/receiver_test.go b/receiver/splunkhecreceiver/receiver_test.go index b87c26305619..5f85cd8277e0 100644 --- a/receiver/splunkhecreceiver/receiver_test.go +++ b/receiver/splunkhecreceiver/receiver_test.go @@ -442,8 +442,8 @@ func Test_splunkhecReceiver_TLS(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) cfg := createDefaultConfig().(*Config) cfg.Endpoint = addr - cfg.TLSSetting = &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + cfg.TLSSetting = &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, @@ -494,8 +494,8 @@ func Test_splunkhecReceiver_TLS(t *testing.T) { req, err := http.NewRequestWithContext(context.Background(), "POST", url, bytes.NewReader(body)) require.NoErrorf(t, err, "should have no errors with new request: %v", err) - tlscs := configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + tlscs := configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/ca.crt", CertFile: "./testdata/client.crt", KeyFile: "./testdata/client.key", diff --git a/receiver/sqlqueryreceiver/config.go b/receiver/sqlqueryreceiver/config.go index e3459f5dc924..6928ed4c7753 100644 --- a/receiver/sqlqueryreceiver/config.go +++ b/receiver/sqlqueryreceiver/config.go @@ -10,7 +10,6 @@ import ( "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver/internal/metadata" ) type Config struct { @@ -18,11 +17,11 @@ type Config struct { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ Config: sqlquery.Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, }, } } diff --git a/receiver/sqlqueryreceiver/config_test.go b/receiver/sqlqueryreceiver/config_test.go index d4d4e11b2f7f..5d7c3b6db867 100644 --- a/receiver/sqlqueryreceiver/config_test.go +++ b/receiver/sqlqueryreceiver/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { fname: "config.yaml", expected: &Config{ Config: sqlquery.Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, @@ -113,7 +113,7 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, ""), expected: &Config{ Config: sqlquery.Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, @@ -170,7 +170,7 @@ func TestLoadConfig(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig().(*Config) - assert.Equal(t, 10*time.Second, cfg.Config.ScraperControllerSettings.CollectionInterval) + assert.Equal(t, 10*time.Second, cfg.Config.ControllerConfig.CollectionInterval) } func TestConfig_Validate_Multierr(t *testing.T) { diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index 3dc7a02c1043..9ef845a64234 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -11,12 +11,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -123,19 +123,19 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.50.0 // indirect github.com/prometheus/procfs v0.13.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect - github.com/sijms/go-ora/v2 v2.8.9 // indirect + github.com/sijms/go-ora/v2 v2.8.10 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/snowflakedb/gosnowflake v1.8.0 // 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 + github.com/yusufpapurcu/wmi v1.2.4 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -151,7 +151,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/receiver/sqlqueryreceiver/go.sum b/receiver/sqlqueryreceiver/go.sum index 42d2791bc67d..6682c4f48cda 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -266,14 +266,14 @@ github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGK github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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/sijms/go-ora/v2 v2.8.9 h1:XIghcG8hjtYu+G9H235VEe5JXPLJtdzzj7pQm7JucVo= -github.com/sijms/go-ora/v2 v2.8.9/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.10 h1:Ekhx0I+A9qVBy1eOLa2eIhHWWYwVTa0MM78KS6h+5fg= +github.com/sijms/go-ora/v2 v2.8.10/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/snowflakedb/gosnowflake v1.8.0 h1:4bQj8eAYGMkou/nICiIEb9jSbBLDDp5cB6JaKx9WwiA= @@ -304,30 +304,30 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr 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= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -393,7 +393,7 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -423,8 +423,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/receiver/sqlqueryreceiver/receiver.go b/receiver/sqlqueryreceiver/receiver.go index 269237140998..262bb39b2033 100644 --- a/receiver/sqlqueryreceiver/receiver.go +++ b/receiver/sqlqueryreceiver/receiver.go @@ -45,13 +45,13 @@ func createMetricsReceiverFunc(sqlOpenerFunc sqlquery.SQLOpenerFunc, clientProvi dbProviderFunc := func() (*sql.DB, error) { return sqlOpenerFunc(sqlCfg.Driver, sqlCfg.DataSource) } - mp := sqlquery.NewScraper(id, query, sqlCfg.ScraperControllerSettings, settings.TelemetrySettings.Logger, sqlCfg.Config.Telemetry, dbProviderFunc, clientProviderFunc) + mp := sqlquery.NewScraper(id, query, sqlCfg.ControllerConfig, settings.TelemetrySettings.Logger, sqlCfg.Config.Telemetry, dbProviderFunc, clientProviderFunc) opt := scraperhelper.AddScraper(mp) opts = append(opts, opt) } return scraperhelper.NewScraperControllerReceiver( - &sqlCfg.ScraperControllerSettings, + &sqlCfg.ControllerConfig, settings, consumer, opts..., diff --git a/receiver/sqlqueryreceiver/receiver_test.go b/receiver/sqlqueryreceiver/receiver_test.go index d5a1aecf882b..fa1b44679271 100644 --- a/receiver/sqlqueryreceiver/receiver_test.go +++ b/receiver/sqlqueryreceiver/receiver_test.go @@ -27,7 +27,7 @@ func TestCreateLogsReceiver(t *testing.T) { receivertest.NewNopCreateSettings(), &Config{ Config: sqlquery.Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, }, Driver: "mydriver", @@ -56,7 +56,7 @@ func TestCreateMetricsReceiver(t *testing.T) { receivertest.NewNopCreateSettings(), &Config{ Config: sqlquery.Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/sqlserverreceiver/config.go b/receiver/sqlserverreceiver/config.go index 053d5c34ef89..4040c97bffa7 100644 --- a/receiver/sqlserverreceiver/config.go +++ b/receiver/sqlserverreceiver/config.go @@ -13,10 +13,10 @@ import ( // Config defines configuration for a sqlserver receiver. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - InstanceName string `mapstructure:"instance_name"` - ComputerName string `mapstructure:"computer_name"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + InstanceName string `mapstructure:"instance_name"` + ComputerName string `mapstructure:"computer_name"` } func (cfg *Config) Validate() error { diff --git a/receiver/sqlserverreceiver/config_test.go b/receiver/sqlserverreceiver/config_test.go index e9abf6e521b9..6700bf0dae35 100644 --- a/receiver/sqlserverreceiver/config_test.go +++ b/receiver/sqlserverreceiver/config_test.go @@ -26,13 +26,13 @@ func TestValidate(t *testing.T) { { desc: "valid config", cfg: &Config{ - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { desc: "valid config with no metric settings", cfg: &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { diff --git a/receiver/sqlserverreceiver/factory.go b/receiver/sqlserverreceiver/factory.go index 2bef83a5b03c..fac2e6fee7c7 100644 --- a/receiver/sqlserverreceiver/factory.go +++ b/receiver/sqlserverreceiver/factory.go @@ -22,10 +22,10 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: cfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } diff --git a/receiver/sqlserverreceiver/factory_test.go b/receiver/sqlserverreceiver/factory_test.go index 866595671b19..ab13808f0899 100644 --- a/receiver/sqlserverreceiver/factory_test.go +++ b/receiver/sqlserverreceiver/factory_test.go @@ -32,7 +32,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/sqlserverreceiver/factory_windows.go b/receiver/sqlserverreceiver/factory_windows.go index 8f232885a9d0..5b74fd94039e 100644 --- a/receiver/sqlserverreceiver/factory_windows.go +++ b/receiver/sqlserverreceiver/factory_windows.go @@ -40,6 +40,6 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, metricsConsumer, scraperhelper.AddScraper(scraper), + &cfg.ControllerConfig, params, metricsConsumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index cb2555e48026..0b0247f0efab 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -29,6 +29,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -44,8 +45,8 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/sqlserverreceiver/go.sum b/receiver/sqlserverreceiver/go.sum index e8d9358aaafc..1b02e6b7c6dc 100644 --- a/receiver/sqlserverreceiver/go.sum +++ b/receiver/sqlserverreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -64,20 +66,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/sshcheckreceiver/config.go b/receiver/sshcheckreceiver/config.go index 46f73ecf5097..d1a14714aa4f 100644 --- a/receiver/sshcheckreceiver/config.go +++ b/receiver/sshcheckreceiver/config.go @@ -27,8 +27,8 @@ var ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - configssh.SSHClientSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + configssh.SSHClientSettings `mapstructure:",squash"` CheckSFTP bool `mapstructure:"check_sftp"` MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` diff --git a/receiver/sshcheckreceiver/config_test.go b/receiver/sshcheckreceiver/config_test.go index 94bc2a1ec411..fdaf556cd9a8 100644 --- a/receiver/sshcheckreceiver/config_test.go +++ b/receiver/sshcheckreceiver/config_test.go @@ -15,7 +15,6 @@ import ( "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshcheckreceiver/internal/configssh" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshcheckreceiver/internal/metadata" ) // check that OTel Collector patterns are implemented @@ -41,7 +40,7 @@ func TestValidate(t *testing.T) { Username: "otelu", Endpoint: "goodhost:2222", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine(errMissingPasswordAndKeyFile), }, @@ -52,7 +51,7 @@ func TestValidate(t *testing.T) { Endpoint: "goodhost:2222", KeyFile: "/home/.ssh/id_rsa", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingUsername, @@ -66,7 +65,7 @@ func TestValidate(t *testing.T) { Username: "otelu", Password: "otelp", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errInvalidEndpoint, @@ -80,7 +79,7 @@ func TestValidate(t *testing.T) { Username: "otelu", Password: "otelp", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: error(nil), }, @@ -92,7 +91,7 @@ func TestValidate(t *testing.T) { Username: "otelu", KeyFile: "/possibly/a_path", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: error(nil), }, @@ -126,7 +125,7 @@ func TestLoadConfig(t *testing.T) { expectedConfig, ok := NewFactory().CreateDefaultConfig().(*Config) require.True(t, ok) - expectedConfig.ScraperControllerSettings = scraperhelper.ScraperControllerSettings{ + expectedConfig.ControllerConfig = scraperhelper.ControllerConfig{ InitialDelay: time.Second, CollectionInterval: 10 * time.Second, } diff --git a/receiver/sshcheckreceiver/factory.go b/receiver/sshcheckreceiver/factory.go index 8fd7199f0785..e1b6dfd07eaf 100644 --- a/receiver/sshcheckreceiver/factory.go +++ b/receiver/sshcheckreceiver/factory.go @@ -25,11 +25,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, SSHClientSettings: configssh.SSHClientSettings{ Timeout: 10 * time.Second, }, @@ -54,5 +54,5 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/sshcheckreceiver/factory_test.go b/receiver/sshcheckreceiver/factory_test.go index 4de6d5198aaf..2dc748fc9529 100644 --- a/receiver/sshcheckreceiver/factory_test.go +++ b/receiver/sshcheckreceiver/factory_test.go @@ -39,7 +39,7 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/sshcheckreceiver/go.mod b/receiver/sshcheckreceiver/go.mod index d79df283ca11..26e4a7712073 100644 --- a/receiver/sshcheckreceiver/go.mod +++ b/receiver/sshcheckreceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/pkg/sftp v1.13.6 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 golang.org/x/crypto v0.21.0 @@ -25,8 +25,8 @@ require ( github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect ) @@ -36,6 +36,7 @@ require ( github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect diff --git a/receiver/sshcheckreceiver/go.sum b/receiver/sshcheckreceiver/go.sum index 3b7517c41221..92a92513a906 100644 --- a/receiver/sshcheckreceiver/go.sum +++ b/receiver/sshcheckreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -70,24 +72,24 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/sshcheckreceiver/scraper_test.go b/receiver/sshcheckreceiver/scraper_test.go index 4628c5cdf01d..c0064c9684e6 100644 --- a/receiver/sshcheckreceiver/scraper_test.go +++ b/receiver/sshcheckreceiver/scraper_test.go @@ -151,7 +151,7 @@ func TestScraper(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + cfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond cfg.Username = "otelu" cfg.Password = "otelp" cfg.Endpoint = endpoint @@ -193,7 +193,7 @@ func TestScraperPropagatesResourceAttributes(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) cfg.MetricsBuilderConfig.ResourceAttributes.SSHEndpoint.Enabled = true - cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + cfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond cfg.Username = "otelu" cfg.Password = "otelp" cfg.Endpoint = endpoint @@ -228,7 +228,7 @@ func TestScraperDoesNotErrForSSHErr(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + cfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond cfg.Username = "not-the-user" cfg.Password = "not-the-password" cfg.Endpoint = endpoint @@ -279,7 +279,7 @@ func TestTimeout(t *testing.T) { func TestCancellation(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + cfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond settings := receivertest.NewNopCreateSettings() @@ -304,7 +304,7 @@ func TestCancellation(t *testing.T) { func TestWithoutStartErrsNotPanics(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + cfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond cfg.Username = "otelu" cfg.Password = "otelp" cfg.Endpoint = "localhost:22" diff --git a/receiver/statsdreceiver/config_test.go b/receiver/statsdreceiver/config_test.go index feac712d51cb..ef98e777f99a 100644 --- a/receiver/statsdreceiver/config_test.go +++ b/receiver/statsdreceiver/config_test.go @@ -39,7 +39,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:12345", - Transport: "custom_transport", + Transport: confignet.TransportTypeUDP6, }, AggregationInterval: 70 * time.Second, TimerHistogramMapping: []protocol.TimerHistogramMapping{ diff --git a/receiver/statsdreceiver/factory.go b/receiver/statsdreceiver/factory.go index 85d9fca0b95c..438564ebf7e5 100644 --- a/receiver/statsdreceiver/factory.go +++ b/receiver/statsdreceiver/factory.go @@ -18,7 +18,6 @@ import ( const ( defaultBindEndpoint = "localhost:8125" - defaultTransport = "udp" defaultAggregationInterval = 60 * time.Second defaultEnableMetricType = false defaultIsMonotonicCounter = false @@ -41,7 +40,7 @@ func createDefaultConfig() component.Config { return &Config{ NetAddr: confignet.AddrConfig{ Endpoint: defaultBindEndpoint, - Transport: defaultTransport, + Transport: confignet.TransportTypeUDP, }, AggregationInterval: defaultAggregationInterval, EnableMetricType: defaultEnableMetricType, diff --git a/receiver/statsdreceiver/factory_test.go b/receiver/statsdreceiver/factory_test.go index 095a8bd4a4d2..1ecf4f2710c4 100644 --- a/receiver/statsdreceiver/factory_test.go +++ b/receiver/statsdreceiver/factory_test.go @@ -29,15 +29,3 @@ func TestCreateReceiver(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") } - -func TestCreateMetricsReceiverWithNilConsumer(t *testing.T) { - receiver, err := createMetricsReceiver( - context.Background(), - receivertest.NewNopCreateSettings(), - createDefaultConfig(), - nil, - ) - - assert.Error(t, err, "nil consumer") - assert.Nil(t, receiver) -} diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index 11fcb233df3e..e2ba3cb9e788 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -7,21 +7,21 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - gonum.org/v1/gonum v0.14.0 + gonum.org/v1/gonum v0.15.0 ) require ( @@ -33,6 +33,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -47,8 +48,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index e5f2aec928f7..4b9cb11d8991 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -66,26 +68,26 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -107,8 +109,8 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= 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/exp v0.0.0-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -137,8 +139,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/receiver/statsdreceiver/receiver.go b/receiver/statsdreceiver/receiver.go index aba562030ee1..3e05ca47eb2a 100644 --- a/receiver/statsdreceiver/receiver.go +++ b/receiver/statsdreceiver/receiver.go @@ -42,9 +42,6 @@ func newReceiver( config Config, nextConsumer consumer.Metrics, ) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } if config.NetAddr.Endpoint == "" { config.NetAddr.Endpoint = "localhost:8125" @@ -69,7 +66,7 @@ func newReceiver( func buildTransportServer(config Config) (transport.Server, error) { // TODO: Add unix socket transport implementations - trans := transport.NewTransport(strings.ToLower(config.NetAddr.Transport)) + trans := transport.NewTransport(strings.ToLower(string(config.NetAddr.Transport))) switch trans { case transport.UDP, transport.UDP4, transport.UDP6: return transport.NewUDPServer(trans, config.NetAddr.Endpoint) @@ -77,7 +74,7 @@ func buildTransportServer(config Config) (transport.Server, error) { return transport.NewTCPServer(trans, config.NetAddr.Endpoint) } - return nil, fmt.Errorf("unsupported transport %q", config.NetAddr.Transport) + return nil, fmt.Errorf("unsupported transport %q", string(config.NetAddr.Transport)) } // Start starts a UDP server that can process StatsD messages. diff --git a/receiver/statsdreceiver/receiver_test.go b/receiver/statsdreceiver/receiver_test.go index 9b2ce42c335d..b55456f80004 100644 --- a/receiver/statsdreceiver/receiver_test.go +++ b/receiver/statsdreceiver/receiver_test.go @@ -96,7 +96,7 @@ func Test_statsdreceiver_EndToEnd(t *testing.T) { return &Config{ NetAddr: confignet.AddrConfig{ Endpoint: defaultBindEndpoint, - Transport: defaultTransport, + Transport: confignet.TransportTypeUDP, }, AggregationInterval: 4 * time.Second, } diff --git a/receiver/statsdreceiver/testdata/config.yaml b/receiver/statsdreceiver/testdata/config.yaml index d3984fb9684c..ed319d8e5781 100644 --- a/receiver/statsdreceiver/testdata/config.yaml +++ b/receiver/statsdreceiver/testdata/config.yaml @@ -1,7 +1,7 @@ statsd: statsd/receiver_settings: endpoint: "localhost:12345" - transport: "custom_transport" + transport: "udp6" aggregation_interval: 70s enable_metric_type: false timer_histogram_mapping: diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index 3f10af0f6df1..e876aa52c8e6 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,6 +28,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/jpillora/backoff v1.0.0 // indirect @@ -46,12 +47,12 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -61,7 +62,7 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 06a4f0c81953..a3901309e5aa 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -28,6 +28,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -83,28 +85,28 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -170,8 +172,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index fbd8882a7310..09c4e993304e 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/jpillora/backoff v1.0.0 // indirect @@ -45,13 +46,13 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -61,7 +62,7 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 06a4f0c81953..a3901309e5aa 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -28,6 +28,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -83,28 +85,28 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -170,8 +172,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index a6ecac3a66c9..4b3137e4f19b 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -25,6 +25,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -43,11 +44,11 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -57,7 +58,7 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 0098316f1556..98847917285a 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -26,6 +26,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -79,24 +81,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -119,8 +121,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -162,8 +164,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/receiver/vcenterreceiver/README.md b/receiver/vcenterreceiver/README.md index 3534169ecba8..184e27529c36 100644 --- a/receiver/vcenterreceiver/README.md +++ b/receiver/vcenterreceiver/README.md @@ -34,7 +34,7 @@ A “Read Only” user assigned to a vSphere with permissions to the vCenter ser | endpoint | | String | Endpoint to the vCenter Server or ESXi host that has the sdk path enabled. Required. The expected format is `://`

i.e: `https://vcsa.hostname.localnet` | | username | | String | Required | | password | | String | Required | -| tls | | TLSClientSetting | Not Required. Will use defaults for [configtls.TLSClientSetting](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md). By default insecure settings are rejected and certificate verification is on. | +| tls | | TLSClientSetting | Not Required. Will use defaults for [configtls.ClientConfig](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md). By default insecure settings are rejected and certificate verification is on. | | collection_interval | 2m | Duration | This receiver collects metrics on an interval. If the vCenter is fairly large, this value may need to be increased. Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h` | | initial_delay | 1s | Duration | Defines how long this receiver waits before starting. | diff --git a/receiver/vcenterreceiver/client_test.go b/receiver/vcenterreceiver/client_test.go index fd42d979d6e4..fb3cf28ce1a3 100644 --- a/receiver/vcenterreceiver/client_test.go +++ b/receiver/vcenterreceiver/client_test.go @@ -73,7 +73,7 @@ func TestSessionReestablish(t *testing.T) { Username: simulator.DefaultLogin.Username(), Password: configopaque.String(pw), Endpoint: fmt.Sprintf("%s://%s", c.URL().Scheme, c.URL().Host), - TLSClientSetting: configtls.TLSClientSetting{ + ClientConfig: configtls.ClientConfig{ Insecure: true, }, }, diff --git a/receiver/vcenterreceiver/config.go b/receiver/vcenterreceiver/config.go index 40f31e0fd73d..5a4c40779559 100644 --- a/receiver/vcenterreceiver/config.go +++ b/receiver/vcenterreceiver/config.go @@ -18,12 +18,12 @@ import ( // Config is the configuration of the receiver type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - configtls.TLSClientSetting `mapstructure:"tls,omitempty"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - Endpoint string `mapstructure:"endpoint"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + configtls.ClientConfig `mapstructure:"tls,omitempty"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + Endpoint string `mapstructure:"endpoint"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` } // Validate checks to see if the supplied config will work for the receiver diff --git a/receiver/vcenterreceiver/config_test.go b/receiver/vcenterreceiver/config_test.go index 13297408db20..18832d495ac2 100644 --- a/receiver/vcenterreceiver/config_test.go +++ b/receiver/vcenterreceiver/config_test.go @@ -29,50 +29,50 @@ func TestConfigValidation(t *testing.T) { { desc: "empty endpoint", cfg: Config{ - Endpoint: "", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errors.New("no endpoint was provided"), }, { desc: "with endpoint", cfg: Config{ - Endpoint: "http://vcsa.some-host", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "http://vcsa.some-host", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { desc: "not http or https", cfg: Config{ - Endpoint: "ws://vcsa.some-host", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "ws://vcsa.some-host", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errors.New("url scheme must be http or https"), }, { desc: "unparseable URL", cfg: Config{ - Endpoint: "h" + string(rune(0x7f)), - TLSClientSetting: configtls.TLSClientSetting{}, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "h" + string(rune(0x7f)), + ClientConfig: configtls.ClientConfig{}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errors.New("unable to parse url"), }, { desc: "no username", cfg: Config{ - Endpoint: "https://vcsa.some-host", - Password: "otelp", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "https://vcsa.some-host", + Password: "otelp", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errors.New("username not provided"), }, { desc: "no password", cfg: Config{ - Endpoint: "https://vcsa.some-host", - Username: "otelu", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "https://vcsa.some-host", + Username: "otelu", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errors.New("password not provided"), }, diff --git a/receiver/vcenterreceiver/factory.go b/receiver/vcenterreceiver/factory.go index 673d40d088a3..a25e8043fab6 100644 --- a/receiver/vcenterreceiver/factory.go +++ b/receiver/vcenterreceiver/factory.go @@ -27,13 +27,13 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 2 * time.Minute return &Config{ - ScraperControllerSettings: cfg, - TLSClientSetting: configtls.TLSClientSetting{}, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: cfg, + ClientConfig: configtls.ClientConfig{}, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -62,7 +62,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index 0676585f8c0b..3d5f695a1330 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -10,14 +10,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/vmware/govmomi v0.36.1 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -77,15 +77,15 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/testcontainers/testcontainers-go v0.27.0 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/vcenterreceiver/go.sum b/receiver/vcenterreceiver/go.sum index 058dbc2263cc..d228da52b4a7 100644 --- a/receiver/vcenterreceiver/go.sum +++ b/receiver/vcenterreceiver/go.sum @@ -122,8 +122,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -150,28 +150,28 @@ github.com/vmware/govmomi v0.36.1 h1:+E/nlfteQ8JvC0xhuKAfpnMsuIeGeGj7rJwqENUcWm8 github.com/vmware/govmomi v0.36.1/go.mod h1:mtGWtM+YhTADHlCgJBiskSRPOZRsN9MSjPzaZLte/oQ= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -219,7 +219,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/vcenterreceiver/integration_test.go b/receiver/vcenterreceiver/integration_test.go index 44191affcc23..49f08eb1c150 100644 --- a/receiver/vcenterreceiver/integration_test.go +++ b/receiver/vcenterreceiver/integration_test.go @@ -61,7 +61,7 @@ func TestIntegration(t *testing.T) { rCfg.Endpoint = fmt.Sprintf("%s://%s", c.URL().Scheme, c.URL().Host) rCfg.Username = simulator.DefaultLogin.Username() rCfg.Password = configopaque.String(pw) - rCfg.TLSClientSetting = configtls.TLSClientSetting{ + rCfg.ClientConfig = configtls.ClientConfig{ Insecure: true, } }), diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index c33517b1bd64..3023b28b3d60 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -41,9 +42,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index ff82d113c07b..bc1b949d29a5 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -64,24 +66,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/wavefrontreceiver/receiver.go b/receiver/wavefrontreceiver/receiver.go index 35e60ff3b51c..0538eb567ee6 100644 --- a/receiver/wavefrontreceiver/receiver.go +++ b/receiver/wavefrontreceiver/receiver.go @@ -44,7 +44,7 @@ func (r *metricsReceiver) Start(ctx context.Context, host component.Host) error carbonCfg := &carbonreceiver.Config{ AddrConfig: confignet.AddrConfig{ Endpoint: r.cfg.Endpoint, - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, TCPIdleTimeout: r.cfg.TCPIdleTimeout, Parser: &protocol.Config{ diff --git a/receiver/webhookeventreceiver/go.mod b/receiver/webhookeventreceiver/go.mod index aacc468b07ab..d666450750bb 100644 --- a/receiver/webhookeventreceiver/go.mod +++ b/receiver/webhookeventreceiver/go.mod @@ -6,12 +6,12 @@ require ( github.com/json-iterator/go v1.1.12 github.com/julienschmidt/httprouter v1.3.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -31,6 +31,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -46,16 +47,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/webhookeventreceiver/go.sum b/receiver/webhookeventreceiver/go.sum index 41d66dce0755..f27c1c2cd1c3 100644 --- a/receiver/webhookeventreceiver/go.sum +++ b/receiver/webhookeventreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -76,38 +78,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/windowseventlogreceiver/go.mod b/receiver/windowseventlogreceiver/go.mod index cbe314a954da..2b03f0ebcc8b 100644 --- a/receiver/windowseventlogreceiver/go.mod +++ b/receiver/windowseventlogreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -44,11 +45,11 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -57,7 +58,7 @@ require ( go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index 0098316f1556..98847917285a 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -26,6 +26,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -79,24 +81,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr 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= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -119,8 +121,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -162,8 +164,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= diff --git a/receiver/windowsperfcountersreceiver/config.go b/receiver/windowsperfcountersreceiver/config.go index 2b1a49e35448..2a62fdaef01d 100644 --- a/receiver/windowsperfcountersreceiver/config.go +++ b/receiver/windowsperfcountersreceiver/config.go @@ -12,7 +12,7 @@ import ( // Config defines configuration for WindowsPerfCounters receiver. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` MetricMetaData map[string]MetricConfig `mapstructure:"metrics"` PerfCounters []ObjectConfig `mapstructure:"perfcounters"` diff --git a/receiver/windowsperfcountersreceiver/config_test.go b/receiver/windowsperfcountersreceiver/config_test.go index 9a6da4959719..6f5242b7ea2a 100644 --- a/receiver/windowsperfcountersreceiver/config_test.go +++ b/receiver/windowsperfcountersreceiver/config_test.go @@ -59,7 +59,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "customname"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 30 * time.Second, InitialDelay: time.Second, }, @@ -98,7 +98,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "nometrics"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 60 * time.Second, InitialDelay: time.Second, }, @@ -113,7 +113,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "nometricspecified"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 60 * time.Second, InitialDelay: time.Second, }, @@ -135,7 +135,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "summetric"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 60 * time.Second, InitialDelay: time.Second, }, @@ -160,7 +160,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "unspecifiedmetrictype"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 60 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/windowsperfcountersreceiver/factory.go b/receiver/windowsperfcountersreceiver/factory.go index 37c79195d91f..125e49c41bf4 100644 --- a/receiver/windowsperfcountersreceiver/factory.go +++ b/receiver/windowsperfcountersreceiver/factory.go @@ -24,6 +24,6 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates the default configuration for receiver. func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), } } diff --git a/receiver/windowsperfcountersreceiver/factory_windows.go b/receiver/windowsperfcountersreceiver/factory_windows.go index f773e6c11512..974ef60a032f 100644 --- a/receiver/windowsperfcountersreceiver/factory_windows.go +++ b/receiver/windowsperfcountersreceiver/factory_windows.go @@ -35,7 +35,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &oCfg.ScraperControllerSettings, + &oCfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scrp), diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 65cbc1998af7..005176120497 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,6 +28,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -42,8 +43,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index 7fc3ead3a635..ae323ea7283f 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= diff --git a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go index 181debcf22a2..e30192a2830c 100644 --- a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go +++ b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go @@ -90,7 +90,7 @@ func Test_WindowsPerfCounterScraper(t *testing.T) { {Object: "Processor", Instances: []string{"*"}, Counters: []CounterConfig{{Name: "% Idle Time", MetricRep: MetricRep{Name: "cpu.idle"}}}}, {Object: "Processor", Instances: []string{"1", "2"}, Counters: []CounterConfig{{Name: "% Processor Time", MetricRep: MetricRep{Name: "processor.time"}}}}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: time.Minute, InitialDelay: time.Second}, + ControllerConfig: scraperhelper.ControllerConfig{CollectionInterval: time.Minute, InitialDelay: time.Second}, }, expectedMetricPath: filepath.Join("testdata", "scraper", "standard.yaml"), }, @@ -107,7 +107,7 @@ func Test_WindowsPerfCounterScraper(t *testing.T) { PerfCounters: []ObjectConfig{ {Object: "Memory", Counters: []CounterConfig{{Name: "Committed Bytes", MetricRep: MetricRep{Name: "bytes.committed"}}}}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: time.Minute, InitialDelay: time.Second}, + ControllerConfig: scraperhelper.ControllerConfig{CollectionInterval: time.Minute, InitialDelay: time.Second}, }, expectedMetricPath: filepath.Join("testdata", "scraper", "sum_metric.yaml"), }, @@ -117,7 +117,7 @@ func Test_WindowsPerfCounterScraper(t *testing.T) { PerfCounters: []ObjectConfig{ {Object: "Memory", Counters: []CounterConfig{{Name: "Committed Bytes"}}}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: time.Minute, InitialDelay: time.Second}, + ControllerConfig: scraperhelper.ControllerConfig{CollectionInterval: time.Minute, InitialDelay: time.Second}, }, expectedMetricPath: filepath.Join("testdata", "scraper", "no_metric_def.yaml"), }, @@ -134,7 +134,7 @@ func Test_WindowsPerfCounterScraper(t *testing.T) { Counters: []CounterConfig{{Name: "Invalid Counter", MetricRep: MetricRep{Name: "invalid"}}}, }, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: time.Minute, InitialDelay: time.Second}, + ControllerConfig: scraperhelper.ControllerConfig{CollectionInterval: time.Minute, InitialDelay: time.Second}, }, startMessage: "some performance counters could not be initialized", startErr: "failed to create perf counter with path \\Invalid Object\\Invalid Counter: The specified object was not found on the computer.\r\n", diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index f0385cba1fa4..0e4dacee5a68 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.96.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -35,6 +35,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -51,16 +52,16 @@ require ( github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index ec99ef7d7c2d..bb4acfc68a5b 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -30,6 +30,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= @@ -82,40 +84,40 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= diff --git a/receiver/zipkinreceiver/trace_receiver.go b/receiver/zipkinreceiver/trace_receiver.go index 6ca40f7aed55..c525f7305e10 100644 --- a/receiver/zipkinreceiver/trace_receiver.go +++ b/receiver/zipkinreceiver/trace_receiver.go @@ -57,10 +57,6 @@ var _ http.Handler = (*zipkinReceiver)(nil) // newReceiver creates a new zipkinReceiver reference. func newReceiver(config *Config, nextConsumer consumer.Traces, settings receiver.CreateSettings) (*zipkinReceiver, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - transports := []string{receiverTransportV1Thrift, receiverTransportV1JSON, receiverTransportV2JSON, receiverTransportV2PROTO} obsrecvrs := make(map[string]*receiverhelper.ObsReport) for _, transport := range transports { diff --git a/receiver/zookeeperreceiver/config.go b/receiver/zookeeperreceiver/config.go index 0bd42b26dbef..65776fa6eb72 100644 --- a/receiver/zookeeperreceiver/config.go +++ b/receiver/zookeeperreceiver/config.go @@ -11,7 +11,7 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confignet.TCPAddrConfig `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confignet.TCPAddrConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/zookeeperreceiver/factory.go b/receiver/zookeeperreceiver/factory.go index 3778e274ca75..bc01373b0da5 100644 --- a/receiver/zookeeperreceiver/factory.go +++ b/receiver/zookeeperreceiver/factory.go @@ -32,12 +32,12 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultCollectionInterval cfg.Timeout = defaultTimeout return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, TCPAddrConfig: confignet.TCPAddrConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, @@ -68,7 +68,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &rConfig.ScraperControllerSettings, + &rConfig.ControllerConfig, params, consumer, scraperhelper.AddScraper(scrp), diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 86970e3f9ae4..2a302cb735ca 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -10,12 +10,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -72,15 +72,15 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index da12494fa365..c2389bbf3e4a 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -116,8 +116,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -142,26 +142,26 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -209,7 +209,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/testbed/datareceivers/jaeger.go b/testbed/datareceivers/jaeger.go index baaddaf9b1bc..a195a7535138 100644 --- a/testbed/datareceivers/jaeger.go +++ b/testbed/datareceivers/jaeger.go @@ -34,7 +34,7 @@ func (jr *jaegerDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, _ co factory := jaegerreceiver.NewFactory() cfg := factory.CreateDefaultConfig().(*jaegerreceiver.Config) cfg.Protocols.GRPC = &configgrpc.ServerConfig{ - NetAddr: confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", jr.Port), Transport: "tcp"}, + NetAddr: confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", jr.Port), Transport: confignet.TransportTypeTCP}, } var err error set := receivertest.NewNopCreateSettings() diff --git a/testbed/datareceivers/opencensus.go b/testbed/datareceivers/opencensus.go index c945e587930b..0302d1a786e2 100644 --- a/testbed/datareceivers/opencensus.go +++ b/testbed/datareceivers/opencensus.go @@ -33,7 +33,7 @@ func NewOCDataReceiver(port int) testbed.DataReceiver { func (or *ocDataReceiver) Start(tc consumer.Traces, mc consumer.Metrics, _ consumer.Logs) error { factory := opencensusreceiver.NewFactory() cfg := factory.CreateDefaultConfig().(*opencensusreceiver.Config) - cfg.NetAddr = confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", or.Port), Transport: "tcp"} + cfg.NetAddr = confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", or.Port), Transport: confignet.TransportTypeTCP} var err error set := receivertest.NewNopCreateSettings() if or.traceReceiver, err = factory.CreateTracesReceiver(context.Background(), set, cfg, tc); err != nil { diff --git a/testbed/datasenders/jaeger.go b/testbed/datasenders/jaeger.go index 39f380c5a704..5de7c6d5616b 100644 --- a/testbed/datasenders/jaeger.go +++ b/testbed/datasenders/jaeger.go @@ -98,7 +98,7 @@ func (cfg *jaegerConfig) Validate() error { func (je *jaegerGRPCDataSender) newTracesExporter(set exporter.CreateSettings) (exporter.Traces, error) { cfg := jaegerConfig{} cfg.Endpoint = je.GetEndpoint().String() - cfg.TLSSetting = configtls.TLSClientSetting{ + cfg.TLSSetting = configtls.ClientConfig{ Insecure: true, } diff --git a/testbed/datasenders/opencensus.go b/testbed/datasenders/opencensus.go index bbaca7339179..458938518e76 100644 --- a/testbed/datasenders/opencensus.go +++ b/testbed/datasenders/opencensus.go @@ -23,7 +23,7 @@ type ocDataSender struct { func (ods *ocDataSender) fillConfig(cfg *opencensusexporter.Config) *opencensusexporter.Config { cfg.Endpoint = ods.GetEndpoint().String() - cfg.TLSSetting = configtls.TLSClientSetting{ + cfg.TLSSetting = configtls.ClientConfig{ Insecure: true, } return cfg diff --git a/testbed/go.mod b/testbed/go.mod index bbe175ef8a2b..2c8e6ef38574 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -33,31 +33,31 @@ require ( github.com/prometheus/prometheus v0.48.1 github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -214,20 +214,20 @@ require ( github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect @@ -258,7 +258,7 @@ require ( golang.org/x/term v0.18.0 // indirect golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.16.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/api v0.150.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index fe2194f020fa..a0265eaf9000 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -665,84 +665,84 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6 h1:DMOKDOm9pyMxV6YfRuNgFzmwx9Hf+9rt6+0xpA6KFag= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:HJxNlsE3XjuxJ3r+Mxvh0vBKHBlUS34CQ1ASuv3IuP8= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6 h1:m0/XnbEB5f5IIdyTkj838ws6YfFynFxHp5D13k9qPn4= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6 h1:auQln1XgD3GiH9gRvcFZvS/PTTJVVOTfUd31kDLRdBg= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6 h1:1JxwPk2IuZ4pdc4siguK/3jX+8ZYeXkIABVGSEVjIsc= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6 h1:hLLtlvYvL1j0P9uuOY2rC+hIFThpcY0+or40F0vDdN0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6 h1:y3tbnLhtVeidOc4TjPq1bTlIyTda5GzOQegpEQdil40= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6 h1:VP55Nh8JBZSZ08WaRfc0k1q0b+KhzcI6W5UXxIfTQJA= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6 h1:HFDIpif2wMOEA2kXgTUZy3nDhSm+w5xu5Fj00ejwpjc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6 h1:BcKr+l3pONaO9Q6sMqXdS16Zy14R2z/+lx2/6CXcthk= -go.opentelemetry.io/collector/connector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:EzHUhRh33xw/KmnBI0PHvrrI8Zr3cfK6KCr59riGjt0= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6 h1:xUKjw/BUUY+MMo2FR5ibKGq2uAZS72qgOotaj9WdpRA= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TjMxdMv90TzH6HjMJUg/uF2G+jrUOG1rkLZZqpiA3P0= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6 h1:wF6wlGx+CXujq8Lvtnbd03uHO5e3QT2RzownXPTnnnI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:swQIq8hlnQYRr7tiEc4z72PE573mnkiEFGMCdlK+Z2A= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6 h1:IlmU3X0cpnzc0DASb+rwRt5/FS94ZsRCVPsoUd2+zJQ= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:mMwdzs/CaxJJCYn3rqSZw4/Ckqh9tNfyIAW96TN3emo= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6 h1:1KKcYDYgf6xncUtccbEkCGSHjWLRkllB+N6hwZmpW7Q= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:g1X2187dRPxXcYsQYe6N7SYlxXSljGPjG8r8o5y3wmo= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6 h1:EdtaFPWHl7JD/KCJ/aNmWgc2pNC1zHDtjs4Fnas+cUk= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pQrKR/Aq1TNqNJOlVsGqIsqr7tNOsJl/VLnqnN+D8Z4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6 h1:4a6Dn5lQzh1y/8tVJeL5pnaoPPWS5oy+kT43zmltI6Q= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:iGUYh/dyMT3pkR6uXWm5NQseL3qdSc8KxP1sfR/xmPk= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6 h1:dolfHLRLfplskSHPwvx9jg0ih9JhWavHq+ARtK7tlPw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AI7e7+gKqACY6ak/bTLywzxPZrJnndTHGQRK073ejb8= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:Lk3Ho5HOAGrt22inmYoiUY4BCQrapYnleMYsvQ5soPU= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:61tvdN6sVMwtvnSiii463/BVS6/2xROO3cQCRI3RUbg= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6 h1:kl4/vAgdVOycOCF1jDPbUXdZ8EkIDEgmFU2/Akgg39I= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:TM0iDw+TINYMLYclaoAgtGKudMoun0zirQili7KZass= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6 h1:UImu7/4JA8k1JndMmfZpBGFCPKoHe0TEssf+NxrKnbM= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:Kj14Vn5nJE2T9PdH+p1skvrlbqTfrHoPOUfsCs2M+TU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6 h1:8TvjdA4BBiz3PclqsXCmyjCor4WaKsGhnkwuu4gkeug= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O6QcYBcMNcVN4FReBmvcn5unxpuf4hQswgYc0FuXeXo= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6 h1:wLnFcJSimh5/axOIYGssu09e/9m4oy8dkj9nfFS3QP8= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6 h1:FfrQEYZ674Iega6qLKRy8kKLPLfwMOeVGeWx66rNa80= -go.opentelemetry.io/collector/service v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:F70Z2AJkJ36zhM3p448Yarq5ePqv+IQqy00kbmGydqU= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:lFag1QoqEANT3KhVfKaT3J2RFFHwH6urC+ED7uI7vmE= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vltQMVWBhsB+5oChLlE77BqlHs54RS7oq4va4Gw8vzM= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:doCbNTc6uGPoH1azKROqg21Pq71IcJM1KvvVTPfM0uE= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/GGESGmyy/r2zTB2ogFuxwPGNRJjbiuPY6J02QiXf2Q= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ar/lke632VUrLX6/t9mjKE6QLnt4glhCKCkQvzN5SwY= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:mz2NEu4Dba2/t6MTPOjOOTgFXrmiqPQeShmQmwxrm30= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= @@ -1031,8 +1031,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/go.mod b/testbed/mockdatasenders/mockdatadogagentexporter/go.mod index d65842e72b69..deda0ac0e53d 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/go.mod +++ b/testbed/mockdatasenders/mockdatadogagentexporter/go.mod @@ -5,11 +5,11 @@ go 1.21 require ( github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02 github.com/tinylib/msgp v1.1.9 - go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 ) require ( @@ -40,18 +40,18 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/go.sum b/testbed/mockdatasenders/mockdatadogagentexporter/go.sum index a519a9642ef6..1fe222937ec6 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/go.sum +++ b/testbed/mockdatasenders/mockdatadogagentexporter/go.sum @@ -45,6 +45,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -104,40 +106,40 @@ github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37w github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6 h1:yaLqn47nYskiYqvIz+ixF4WgJCNmZYmvYgT1N79q2fc= -go.opentelemetry.io/collector v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:lNnB7h6qHClzeyZKauJdXB6wLhTq5sFvt1G70zTYmTs= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6 h1:hfSeafFTFnO+X0v9oDSnBQA8wKOYz99VfUSP/SE5cwk= -go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6 h1:7ObUwKMiL/gCFuTBLdBCwCDPKVx+Awv2kz0XV9PSd7k= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6 h1:AA/eiK/rFUYRhkpqGwYHJLO3LwBy9tw4rOgWxy/KQAU= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6 h1:BAxajIrLoPocBZGBRYk4reHz1SyTNzFXmjqDJNhyG4I= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6 h1:WKbHuoWXz9Y72MS7OgAMH/NibzFrpHYKQuHpx2EH5VA= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6 h1:HxhwEfAK3/8DIt+bjYcPkL9VrFTibOmpmHZOO0/buMs= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6 h1:6WZVo+mour549zDh0dw9iilTe0HOY75lyndo4IDKNPE= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6 h1:RNvLuqfx3Nj9ilv8Y1yjv9PU2OsSYE/pJrNV8nhMZd4= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6 h1:nsskiJcF5iL6gYZ/jjkeIShdQZMbJFwOnR5BqctrAiI= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6 h1:cbmJ4j8Pw68/v0Tx2J5y9CZmw2lSuPFJ9u98MI4QfLg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6 h1:ijKDfnFsN14BxY62hTAqlnlPHonMP48JkR1VszGvvMY= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/CrJEFoknTOx60Vcr59CaJ6EwZqct/D6dzZV3rtbS/4= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6 h1:GAYQIFEq/Yy5fK1I+Qlv17wRV6By7DdPCiZcaiQEyTA= -go.opentelemetry.io/collector/extension v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:/PxTeHkU+8Ebouf/7Nk5NH+akNVGrSVlnjlw2vXKR6E= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6 h1:yYfso4crpirLoWtzARCuNnQwJlrfwfUNkDKNpproXp8= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6 h1:WPX5pMQgNPvjLrtQ+XoBBsbyhy1m1JtYc1B/rIFhCnQ= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6 h1:YV+WmEZfM0wv4pUtj5uJsLgC1lHgGp8WKhzyNphyX9Y= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/collector/receiver v0.96.0 h1:OrlcuyFCBQpbWNb2klzTdz1ZXMk0acRDh7fbaQtP4eo= go.opentelemetry.io/collector/receiver v0.96.0/go.mod h1:fb5Vr2+tAkzB4qE6+lNaMsZwaeE8qZvG3IBdzK5hCRY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= diff --git a/testbed/testbed/receivers.go b/testbed/testbed/receivers.go index 37225fe1dc5d..faba37f87025 100644 --- a/testbed/testbed/receivers.go +++ b/testbed/testbed/receivers.go @@ -61,7 +61,7 @@ func (bor *BaseOTLPDataReceiver) Start(tc consumer.Traces, mc consumer.Metrics, factory := otlpreceiver.NewFactory() cfg := factory.CreateDefaultConfig().(*otlpreceiver.Config) if bor.exporterType == "otlp" { - cfg.GRPC.NetAddr = confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", bor.Port), Transport: "tcp"} + cfg.GRPC.NetAddr = confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", bor.Port), Transport: confignet.TransportTypeTCP} cfg.HTTP = nil } else { cfg.HTTP.Endpoint = fmt.Sprintf("127.0.0.1:%d", bor.Port) diff --git a/testbed/testbed/senders.go b/testbed/testbed/senders.go index 684763501004..8501f22b08f3 100644 --- a/testbed/testbed/senders.go +++ b/testbed/testbed/senders.go @@ -87,7 +87,7 @@ func (ods *otlpHTTPDataSender) fillConfig(cfg *otlphttpexporter.Config) *otlphtt cfg.RetryConfig.Enabled = false // Disable sending queue, we should push data from the caller goroutine. cfg.QueueConfig.Enabled = false - cfg.TLSSetting = configtls.TLSClientSetting{ + cfg.TLSSetting = configtls.ClientConfig{ Insecure: true, } cfg.Compression = ods.compression @@ -219,7 +219,7 @@ func (ods *otlpDataSender) fillConfig(cfg *otlpexporter.Config) *otlpexporter.Co cfg.RetryConfig.Enabled = false // Disable sending queue, we should push data from the caller goroutine. cfg.QueueConfig.Enabled = false - cfg.TLSSetting = configtls.TLSClientSetting{ + cfg.TLSSetting = configtls.ClientConfig{ Insecure: true, } return cfg