From c04c866c41243aca1bbbfab47bc0a62434350d21 Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Wed, 5 Jun 2024 14:59:31 +0200 Subject: [PATCH] feat(ci): Add a new test to validate modules are correctly set in DEFAULT_MODULES (#26226) --- .gitlab/source_test/technical_linters.yml | 9 ++ comp/README.md | 2 +- comp/otelcol/provider/def/component.go | 2 + comp/otelcol/provider/impl/go.mod | 64 +++++++- comp/otelcol/provider/impl/go.sum | 169 +--------------------- comp/otelcol/provider/impl/provider.go | 6 +- tasks/go.py | 2 +- tasks/modules.py | 23 ++- 8 files changed, 106 insertions(+), 171 deletions(-) diff --git a/.gitlab/source_test/technical_linters.yml b/.gitlab/source_test/technical_linters.yml index d5963cf57835f..b4c771e8e9e89 100644 --- a/.gitlab/source_test/technical_linters.yml +++ b/.gitlab/source_test/technical_linters.yml @@ -15,3 +15,12 @@ lint_update_go: script: - source /root/.bashrc - inv -e linter.update-go + +validate_modules: + stage: source_test + image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES + tags: ["arch:amd64"] + needs: [] + script: + - source /root/.bashrc + - inv -e modules.validate diff --git a/comp/README.md b/comp/README.md index fbf352a4d4156..a6481ac17a99e 100644 --- a/comp/README.md +++ b/comp/README.md @@ -378,7 +378,7 @@ Package logsagentpipeline contains logs agent pipeline component ### [comp/otelcol/provider](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/otelcol/provider) - +Package provider TBD ## [comp/process](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/process) (Component Bundle) diff --git a/comp/otelcol/provider/def/component.go b/comp/otelcol/provider/def/component.go index ec59df2ddb224..dec91c8712be7 100644 --- a/comp/otelcol/provider/def/component.go +++ b/comp/otelcol/provider/def/component.go @@ -3,6 +3,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2024-present Datadog, Inc. +// Package provider TBD package provider import ( @@ -19,6 +20,7 @@ type Component interface { GetEnhancedConf() string } +// Requires TBD type Requires struct { URIs []string } diff --git a/comp/otelcol/provider/impl/go.mod b/comp/otelcol/provider/impl/go.mod index 320b69e5882b1..0f51950bad677 100644 --- a/comp/otelcol/provider/impl/go.mod +++ b/comp/otelcol/provider/impl/go.mod @@ -2,7 +2,66 @@ module github.com/DataDog/datadog-agent/comp/otelcol/provider/impl go 1.21.0 -replace github.com/DataDog/datadog-agent/comp/otelcol/provider/def => ../def +replace ( + github.com/DataDog/datadog-agent/cmd/agent/common/path => ../../../../cmd/agent/common/path + github.com/DataDog/datadog-agent/comp/core/config => ../../../core/config + github.com/DataDog/datadog-agent/comp/core/flare/builder => ../../../core/flare/builder + github.com/DataDog/datadog-agent/comp/core/flare/types => ../../../core/flare/types + github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface => ../../../core/hostname/hostnameinterface + github.com/DataDog/datadog-agent/comp/core/log => ../../../core/log + github.com/DataDog/datadog-agent/comp/core/secrets => ../../../core/secrets + github.com/DataDog/datadog-agent/comp/core/telemetry => ../../../core/telemetry + github.com/DataDog/datadog-agent/comp/def => ../../../def + github.com/DataDog/datadog-agent/comp/logs/agent/config => ../../../logs/agent/config + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline => ../../../otelcol/logsagentpipeline + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl => ../../../otelcol/logsagentpipeline/logsagentpipelineimpl + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter => ../../../otelcol/otlp/components/exporter/logsagentexporter + github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil => ../../otlp/testutil + github.com/DataDog/datadog-agent/comp/otelcol/provider/def => ../def + github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../pkg/collector/check/defaults + github.com/DataDog/datadog-agent/pkg/config/env => ../../../../pkg/config/env + github.com/DataDog/datadog-agent/pkg/config/logs => ../../../../pkg/config/logs + github.com/DataDog/datadog-agent/pkg/config/model => ../../../../pkg/config/model + github.com/DataDog/datadog-agent/pkg/config/setup => ../../../../pkg/config/setup + github.com/DataDog/datadog-agent/pkg/config/utils => ../../../../pkg/config/utils + github.com/DataDog/datadog-agent/pkg/logs/auditor => ../../../../pkg/logs/auditor + github.com/DataDog/datadog-agent/pkg/logs/client => ../../../../pkg/logs/client + github.com/DataDog/datadog-agent/pkg/logs/diagnostic => ../../../../pkg/logs/diagnostic + github.com/DataDog/datadog-agent/pkg/logs/message => ../../../../pkg/logs/message + github.com/DataDog/datadog-agent/pkg/logs/metrics => ../../../../pkg/logs/metrics + github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline + github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor + github.com/DataDog/datadog-agent/pkg/logs/sds => ../../../../pkg/logs/sds + github.com/DataDog/datadog-agent/pkg/logs/sender => ../../../../pkg/logs/sender + github.com/DataDog/datadog-agent/pkg/logs/sources => ../../../../pkg/logs/sources + github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface => ../../../../pkg/logs/status/statusinterface + github.com/DataDog/datadog-agent/pkg/logs/status/utils => ../../../../pkg/logs/status/utils + github.com/DataDog/datadog-agent/pkg/logs/util/testutils => ../../../../pkg/logs/util/testutils + github.com/DataDog/datadog-agent/pkg/obfuscate => ../../../../pkg/obfuscate + github.com/DataDog/datadog-agent/pkg/proto => ../../../../pkg/proto + github.com/DataDog/datadog-agent/pkg/remoteconfig/state => ../../../../pkg/remoteconfig/state + github.com/DataDog/datadog-agent/pkg/status/health => ../../../../pkg/status/health + github.com/DataDog/datadog-agent/pkg/telemetry => ../../../../pkg/telemetry + github.com/DataDog/datadog-agent/pkg/trace => ../../../../pkg/trace + github.com/DataDog/datadog-agent/pkg/util/backoff => ../../../../pkg/util/backoff + github.com/DataDog/datadog-agent/pkg/util/cgroups => ../../../../pkg/util/cgroups + github.com/DataDog/datadog-agent/pkg/util/executable => ../../../../pkg/util/executable + github.com/DataDog/datadog-agent/pkg/util/filesystem => ../../../../pkg/util/filesystem + github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../../pkg/util/fxutil + github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../../../pkg/util/hostname/validate + github.com/DataDog/datadog-agent/pkg/util/http => ../../../../pkg/util/http + github.com/DataDog/datadog-agent/pkg/util/log => ../../../../pkg/util/log + github.com/DataDog/datadog-agent/pkg/util/optional => ../../../../pkg/util/optional + github.com/DataDog/datadog-agent/pkg/util/pointer => ../../../../pkg/util/pointer + github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../../pkg/util/scrubber + github.com/DataDog/datadog-agent/pkg/util/startstop => ../../../../pkg/util/startstop + github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../../../pkg/util/statstracker + github.com/DataDog/datadog-agent/pkg/util/system => ../../../../pkg/util/system + github.com/DataDog/datadog-agent/pkg/util/system/socket => ../../../../pkg/util/system/socket + github.com/DataDog/datadog-agent/pkg/util/testutil => ../../../../pkg/util/testutil + github.com/DataDog/datadog-agent/pkg/util/winutil => ../../../../pkg/util/winutil + github.com/DataDog/datadog-agent/pkg/version => ../../../../pkg/version +) require ( github.com/DataDog/datadog-agent/comp/otelcol/provider/def v0.55.0-rc.1 @@ -129,6 +188,8 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect @@ -248,6 +309,7 @@ require ( google.golang.org/grpc v1.63.2 // indirect google.golang.org/protobuf v1.34.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect k8s.io/api v0.29.3 // indirect diff --git a/comp/otelcol/provider/impl/go.sum b/comp/otelcol/provider/impl/go.sum index ee982a9d73160..5b9800c595a2d 100644 --- a/comp/otelcol/provider/impl/go.sum +++ b/comp/otelcol/provider/impl/go.sum @@ -65,176 +65,13 @@ github.com/Code-Hex/go-generics-cache v1.3.1 h1:i8rLwyhoyhaerr7JpjtYjJZUcCbWOdiY github.com/Code-Hex/go-generics-cache v1.3.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4= github.com/DataDog/agent-payload/v5 v5.0.114 h1:qg3jfzz2/lOFKbFOw2yM6RM8eyMs4HlEGnyDBOTiYmY= github.com/DataDog/agent-payload/v5 v5.0.114/go.mod h1:COngtbYYCncpIPiE5D93QlXDH/3VAKk10jDNwGHcMRE= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.54.0-rc.2 h1:zstBgcSrx7CDSJ0c1XoM/EHJ1JSVj9kB4hddYUXdV1Y= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.54.0-rc.2/go.mod h1:OzCHQb5JUcN6AEfmBKcOh49gUAMx1/9X6NxT6o4dtOQ= -github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2 h1:4/DUwafQfm22WEPBCGGKi6MUx0rwdtnfa0zTgzp+658= -github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2/go.mod h1:LbleddShJeR8S1xHsXLtZmbpn6JMhoG7VY/LBtksdZU= -github.com/DataDog/datadog-agent/comp/core/config v0.55.0-rc.1/go.mod h1:gt9GvhFssWdNZjC4TXIz22gsbsau8VXcu2asLmAMumc= -github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.2 h1:RiFMD53ljS48608cix1N8lIJQtIHydiMsrEMivWDObQ= -github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.2/go.mod h1:aChd0OV9bB534m+H4IPglCAs441s/1R+Tau5USeSM+Q= -github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.2 h1:f0dipcaKjRA5u6lLhPSNlsGjhpWxVTal/1vdxXBsV80= -github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.2/go.mod h1:D0igo5ngQPY/+cGsISPF55i16aJohGWEDFsg7Q2L60w= -github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.55.0-rc.1/go.mod h1:RZLtLUCjd+jgSWftCkXdmovXPIHgVkthzxgUkM6JE1g= -github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.2 h1:6joRA4SDeZA7jDo7+Cq7Mp9EKYQnZ0bM5kALMfOO1/M= -github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.2/go.mod h1:N3cxpwkRVw6b8iHhUmouwkQBPZ0VN/U7mOiRy7at6TI= -github.com/DataDog/datadog-agent/comp/core/log v0.55.0-rc.1/go.mod h1:C+/mRvl/mTxeIfunTi0Ewgu9M0Gcxj9U3t3Con/UJSE= -github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 h1:Tn+qA5VFNfyAs0yQ8CsUJDY0Pa4+9naAWJKFe81p1SA= -github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2/go.mod h1:92+wAI5vl9wPnfp+jrnLy//3EJTS1bvhBuxq1m4Aq/c= -github.com/DataDog/datadog-agent/comp/core/secrets v0.55.0-rc.1/go.mod h1:Uc07mvltOnNupfEQ6oKx6xyAD42y/jg5MKXeI1Z3WoI= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 h1:0odA9OcmQr8XZz3xkiu8s31Rde/qSiL2OP4bhaBttYs= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2/go.mod h1:x4koIUY//d6cGvVOj1/tIMyESWQ5tH3b3CxmcTPQFK0= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.55.0-rc.1/go.mod h1:I+6KlIU8mWqUuEurIlSo3dhqKlhjD6ebi6N8LkMc4IY= -github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 h1:xtr40adL/F5iWf77MhhmnZLfqOqai+D9AHMSNjqlMC4= -github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2/go.mod h1:ts1c7j9tfa/BaoBH/gdQPt1LTeLeSh0b7IHMqm7ylDE= -github.com/DataDog/datadog-agent/comp/def v0.55.0-rc.1/go.mod h1:ts1c7j9tfa/BaoBH/gdQPt1LTeLeSh0b7IHMqm7ylDE= -github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 h1:NddpAQW0nzYw8mwpR190lO6HvKeNRxfjpfxu/Hz5AmU= -github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2/go.mod h1:WVb4u75zGHsHwT0t1DDF4T2P0YQRWxN3/J6oEx06RC8= -github.com/DataDog/datadog-agent/comp/logs/agent/config v0.55.0-rc.1/go.mod h1:4baIgX4dbLZ0J3eJ5s+a45m0H7oc+TRK/ljEYiEYEu8= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.54.0-rc.2 h1:5KQJQCNq/kvW8Qq6s7t8DVj2EcXu4WDwF1tHNkfiYRU= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.54.0-rc.2/go.mod h1:iU0DZ9fnqLJcZHe0oPCKDOhLXm0vPh4N6m3dhGkiyms= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.55.0-rc.1/go.mod h1:n0zb8Qmo29RacctoRR1W/Q9wDEXtHBTc9FpYAsj2KZA= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.54.0-rc.2.0.20240502211937-f7706eb2beae h1:c1zVXhhskNGmUA33dNy7soMTtq68zLF6DA7m0fJoGKQ= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.54.0-rc.2.0.20240502211937-f7706eb2beae/go.mod h1:+TrFnheW3cYqFLXVdZrALKK+InhsCZc6HKYHa1KZU4o= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.55.0-rc.1/go.mod h1:EWxFNT5Q5QZiaGPRdsz5j1M29fO/TKrcrryzSKTrOoI= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.54.0-rc.2 h1:O7/nbu8oMN5Z8A/F3zOCm8yO994VYhfY/56RluOUgTw= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.54.0-rc.2/go.mod h1:FxGAQZnkXWiIhZq4igdcqvWVYh4jkUdbKk5dhyF6Qwc= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.55.0-rc.1/go.mod h1:HecvHY9buj+mkcwgO6ivfgxXBmwXEor9Rx5gRtgDtkc= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.54.0-rc.2 h1:JA4zoEo/hohrmm5z7LxpqR1fckXQjBxgceS/0GiJB6s= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.54.0-rc.2/go.mod h1:Fdl0LbmF4wk9DfQ7TS8fGSQjH5PghDcwMSmrzPkblOc= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 h1:AD+nrrnWSpAW9xxX7z+t7h/cKmOVXwINEc0depOzA8A= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2/go.mod h1:Mpe5lBwTlmLsu1WwIx8uRbj+Bi8+9gW8rWDfXPRwQVQ= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.55.0-rc.1/go.mod h1:Mpe5lBwTlmLsu1WwIx8uRbj+Bi8+9gW8rWDfXPRwQVQ= -github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 h1:wgJSparAgPfljYX+0XUNXQ1BJuoOeXfUc78MOWO8HZs= -github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2/go.mod h1:2ZcR6RsatCnBvw/+rXfv3KWKlDOxp3Q4ejsI54wl1W4= -github.com/DataDog/datadog-agent/pkg/config/env v0.55.0-rc.1/go.mod h1:5wety/s70oOYoCQWnjzLYzpNIMwH3sscpXN6/MHggWA= -github.com/DataDog/datadog-agent/pkg/config/logs v0.54.0-rc.2 h1:PUDa68FqVH0LO+V66ZQJk4OKv0y/aLGArxXNqduTsGA= -github.com/DataDog/datadog-agent/pkg/config/logs v0.54.0-rc.2/go.mod h1:vMpwcy7j6u6+r+8QnskgZJDiZIHsvCVD3glug+/ruxg= -github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 h1:FeybZXu9KI5qlK4dye+K9+g7l7MFP5zZ7u+otjTUAlY= -github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2/go.mod h1:XejHqgbUwscccSBjfyetXQacdROzmaKRwqqpDsSSlVE= -github.com/DataDog/datadog-agent/pkg/config/model v0.55.0-rc.1/go.mod h1:6eiJL5RI43Ax8PqBnJfuD800ToaOqC6uPdeJc33mJHg= -github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 h1:7q2pSWtz3CgCOlN24uwrnV2W8QvuUuuDTu2eURGIChY= -github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2/go.mod h1:heLD1JdE0aHaNfqIHBCnj3rhK4OSiD3Y9DLQ2n7so/c= -github.com/DataDog/datadog-agent/pkg/config/setup v0.55.0-rc.1/go.mod h1:4Jiv7fUBE4U9osFFNGdRZpF8KNhB5vIzX3c6vmMEefc= -github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 h1:zN58fVlTPB2U/BoPsJWOu9TTmI4F1O5N797nwXaB78c= -github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2/go.mod h1:QTDS+0JS5NJqullxMoZGQ88++d64IbpLxiDbEeuz6JY= -github.com/DataDog/datadog-agent/pkg/config/utils v0.55.0-rc.1/go.mod h1:2jmmgL2ylaD8GsY48KLMYXYmFswZPCN84Y54XemGQsc= -github.com/DataDog/datadog-agent/pkg/logs/auditor v0.54.0-rc.2 h1:zp1+NKI7iEBKckl4bBRqIYCg0Syv7zpQgcPKQjd5YqE= -github.com/DataDog/datadog-agent/pkg/logs/auditor v0.54.0-rc.2/go.mod h1:IA3FueQKGk/o1pFrJOPBo3IJVjnuotcW3iA0yT82w/k= -github.com/DataDog/datadog-agent/pkg/logs/auditor v0.55.0-rc.1/go.mod h1:0wccJxu5c5Kc32YHDEWDBb2ezWdO35Df4qc6VJ12H30= -github.com/DataDog/datadog-agent/pkg/logs/client v0.54.0-rc.2 h1:nlr7m2Z8jCO6c3MendKWtLabsQq6ZccL2bQI+QptZTY= -github.com/DataDog/datadog-agent/pkg/logs/client v0.54.0-rc.2/go.mod h1:4iIG196TeFsDQDwinp4iRAI5j51wqMDsthXY9YsyCVE= -github.com/DataDog/datadog-agent/pkg/logs/client v0.55.0-rc.1/go.mod h1:hYykblPLrf6dz8+nPJvrCY7tMZyYoqP4iPEQY1LXGtY= -github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.54.0-rc.2 h1:4/5vuSwhnbVCjTPJCWO5bTRTvDjS7IHaDd2vaTvkeE0= -github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.54.0-rc.2/go.mod h1:MJzGw2LutMQ9CyPvQOlRUbRAFF11jIiMoCaGIIy4t6Y= -github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.55.0-rc.1/go.mod h1:dCamHnVINpyS/R/XtfA7pHwqMklGqduw1UjASEPxSmE= -github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2 h1:BTbXa8J+gt48Eu7IWuhkVDX7szorXmCdPG/3to2Ytlg= -github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2/go.mod h1:eNkJb+tSfhiO2pW0vYOjHF9yw2JfuMsEf3mLqo7o5dU= -github.com/DataDog/datadog-agent/pkg/logs/message v0.55.0-rc.1/go.mod h1:PwMcn0uzS+UmimjbSFGwJn3a5i/oBGlZTvO2V09LeQY= -github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.2 h1:HSeyYPlsEgwmjBz6FPwyAB/6XrRcB9jtB1tp4YZSPzQ= -github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.2/go.mod h1:E27lHPFMXkbhXyNtg8IkFJlHixJb3cxGZSqU/3ns/HA= -github.com/DataDog/datadog-agent/pkg/logs/metrics v0.55.0-rc.1/go.mod h1:ucPQaOAjSX6yOASrR00Id8ilAyO0vuJzy2PQ/XR49Oo= -github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.54.0-rc.2 h1:7B/CG2b0eba6Wka0u0Q8AzZCQ+0I68eTYjEw2K3dAOY= -github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.54.0-rc.2/go.mod h1:t6iDMgtmgkRmd5Cqc+4hHJR6U9iZ5W5qpc76NEwUnBM= -github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.55.0-rc.1/go.mod h1:zqABYO0aGeKgani98reQy6H+uPAszrw0mgEdymXqXHo= -github.com/DataDog/datadog-agent/pkg/logs/processor v0.54.0-rc.2 h1:I5vBT/CIOaHsYLo+wY8DrKXwTV0EoX0PpKKWAWiicC8= -github.com/DataDog/datadog-agent/pkg/logs/processor v0.54.0-rc.2/go.mod h1:gZ5IS9S80+0UvDecfZiShVNBVyc988JKHi5yfJk7glI= -github.com/DataDog/datadog-agent/pkg/logs/processor v0.55.0-rc.1/go.mod h1:Kc+3GbIkt0SdCAQJkvCAfJux3fugLPjODRx5dpQTtd4= -github.com/DataDog/datadog-agent/pkg/logs/sds v0.54.0-rc.2 h1:Opwv1vPxLjhmaVPeCCQyxmtlc1MFjetWXHRTleEnn4o= -github.com/DataDog/datadog-agent/pkg/logs/sds v0.54.0-rc.2/go.mod h1:37nUzn7steJV5WpWJkgGMWjMhWgLaZQbZ87f3F5l6mU= -github.com/DataDog/datadog-agent/pkg/logs/sds v0.55.0-rc.1/go.mod h1:VnPL5g6o1/QPzZClAZiqIRWc84llOJlg83ffBxRTEpQ= -github.com/DataDog/datadog-agent/pkg/logs/sender v0.54.0-rc.2 h1:/sl2QN3BsGXu90HusCoxNMnEOzvrHl/2iTYkNxTNcjg= -github.com/DataDog/datadog-agent/pkg/logs/sender v0.54.0-rc.2/go.mod h1:zKKiDzoorTU17AdQlnSBBPf6SRnz61R4A/5vsFyS3YY= -github.com/DataDog/datadog-agent/pkg/logs/sender v0.55.0-rc.1/go.mod h1:cG57yVLMR2cP5VKx/6PKwVEAg1PuqBOSOSPTMo+jwo4= -github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 h1:78sVZ1REHkumIiBMlyP0pNDajnQnaiI2s5wxE0JBkp0= -github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2/go.mod h1:PuhaHIzZkjUT49ThC52vwwjhKkrcYeMcEf3g+8+L4sY= -github.com/DataDog/datadog-agent/pkg/logs/sources v0.55.0-rc.1/go.mod h1:EZHNUv8uGZHmntKLIlYQctMP6FcZGBkc7fiCnNDNVkg= -github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.2 h1:6LHQTaUpi3iBAoZM/LCU28rIcKawWNjmu7xMPBsq9dE= -github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.2/go.mod h1:xsyGZLKEr6dZaJlC9QWuyYVXqMnHRwZzn641O3bfB98= -github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.55.0-rc.1/go.mod h1:xsyGZLKEr6dZaJlC9QWuyYVXqMnHRwZzn641O3bfB98= -github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 h1:/HtnVRLrPP9UePdV/EJAI8QnPzFvcHsAKGPiH9o+Yds= -github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2/go.mod h1:TsFFZ6y2/brcnkXLZhfp0k2xrewdyqhXnjxVpkOWIvE= -github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.55.0-rc.1/go.mod h1:TsFFZ6y2/brcnkXLZhfp0k2xrewdyqhXnjxVpkOWIvE= -github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.54.0-rc.2 h1:RsEDTibPQS7wV3zWv5AUGd/Oz7RTMSYJfGybCw3SIdg= -github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.54.0-rc.2/go.mod h1:0EgE2Hrx/DJoNX5urcLbSG48HTocpZoJu/VJuxCXQAI= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.54.0-rc.2 h1:WQf8jfvdd/uGmWT534yCfekam56JaCA2CgBbw78iwGg= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.54.0-rc.2/go.mod h1:4/9D8y6pQo5a/Tg8GAQN8SaRIRWxxyl5QHzPRuu8D0k= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.55.0-rc.1/go.mod h1:/C99KWKukVnTtIiYCQ55izSNDQceREb8vSPa3zUn6jc= -github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.2 h1:q2uNV6g78k2+XNXeI145aNuk7Cl6g4VHJCxDXndBOb0= -github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.2/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= -github.com/DataDog/datadog-agent/pkg/proto v0.55.0-rc.1/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.2 h1:h77s0Zqx062vah5Hi7ZptUVN1hzR8bm2Y4LY7NK/Zys= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.2/go.mod h1:3yFk56PJ57yS1GqI9HAsS4PSlAeGCC9RQA7jxKzYj6g= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.55.0-rc.1/go.mod h1:3yFk56PJ57yS1GqI9HAsS4PSlAeGCC9RQA7jxKzYj6g= -github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.2 h1:vzC0z5qAWY5VgI0EP2zKjM/Ctk7cUy3qtQeCccQ0HUc= -github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.2/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= -github.com/DataDog/datadog-agent/pkg/status/health v0.55.0-rc.1/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= -github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 h1:SRaK1biPvgBmxf3Z8WJTBgQ1Xh58aeCxaatv+94BvzU= -github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2/go.mod h1:furcAv6kSCXE2pvzKoCWLTpZdhubYdgL7TWKiCa69ss= -github.com/DataDog/datadog-agent/pkg/telemetry v0.55.0-rc.1/go.mod h1:FDlOEAtIViBeeYcuVv0T8ppVC0c9jy1Mt/PB+jb18z8= -github.com/DataDog/datadog-agent/pkg/trace v0.54.0-rc.2 h1:g2JDelLh8f6Qq8JVLlzqfiQZAAaYKrsu6c+RmK2ZH1k= -github.com/DataDog/datadog-agent/pkg/trace v0.54.0-rc.2/go.mod h1:LuLA46YyE2a6DqQbwuLk01uPowPwNnDxK1YZHiAycDk= -github.com/DataDog/datadog-agent/pkg/trace v0.55.0-rc.1/go.mod h1:6wJdvaXmZwx+3HNG1N9a/WwG79KL1oni4RKd03osaRI= -github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2 h1:teuC17Wi6b5ZzrcfiVJQOUfOBj+5lg/GckH7JdO932M= -github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= -github.com/DataDog/datadog-agent/pkg/util/backoff v0.55.0-rc.1/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.54.0-rc.2 h1:T20oFAgu4cv+hl2YI+2bVKFOVX0eWkypkw4Nb606IRg= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.54.0-rc.2/go.mod h1:cdA45eLn/INJjrKKVXEJaW6Bi5+fRHK5/EVjs8kyU/0= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.55.0-rc.1/go.mod h1:8dj7lSQ6cWV1T75KIuJvp4Wo6YBwH37jfQh2ATr1B5g= -github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 h1:IU8J+sbu/h89a8FeZIARZMpd/FTA+e7FjQL/CpqCTzg= -github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2/go.mod h1:hUJvBzOKfasYzSvlar10ZkrB8I1CR8PhtyGxmlMv/cU= -github.com/DataDog/datadog-agent/pkg/util/executable v0.55.0-rc.1/go.mod h1:hUJvBzOKfasYzSvlar10ZkrB8I1CR8PhtyGxmlMv/cU= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 h1:WJ6/MdKomEMJAYokscHzr0XWFL75JRVmNG7NiUtWSQY= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2/go.mod h1:sekjZce1cZpwgrhX8PkvN5gW7oUqPvoRylhRenaiOWk= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.55.0-rc.1/go.mod h1:twAjqKWafQCkoRmRDwOkcsLHfJBIkI+L7h1kk9I+f2E= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 h1:UuZHx5Yp6/5edMsMeyioo+sMWtxTceGcOMLgevUMjc8= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2/go.mod h1:P/F0RM5UxORm9NwbSoDg1vSM7CktJk93RKEnv90LcEM= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.55.0-rc.1/go.mod h1:XY/OrvXQz2I3Rm5HhMTNbRQSzuCwzm12QmC38kml8ZA= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 h1:jOnI/mNrw1D6uvaJXQ+kfelFWBi3iJ0TJP/T/tFPnSc= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2/go.mod h1:BH83pCt0bigyc/za7oEOjrAsgKvkGnLqFBuoiG2xrgk= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.55.0-rc.1/go.mod h1:av0TNa41q5kOZv2aXTWlvx/xxxge/+5t8ALbpcnTD/g= -github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2 h1:99FVBATt2waBWx/62bf/tuWhDbDrzLNRHDEVzJo7KBI= -github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2/go.mod h1:1j0dOvuhb84wvK3ovv7aU5B66uOhqfrUQgEvMvP/zj0= -github.com/DataDog/datadog-agent/pkg/util/http v0.55.0-rc.1/go.mod h1:hP/R64m59QSl/ViZUWJBozkQwBJgP9K5UYfh4lDglGY= -github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 h1:lGzFC0Z5x+7AIBZLTuddIlqVDildeCIkCoYrRKN9m5c= -github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2/go.mod h1:JKcYAEB5CUEJahd8+AnVSMZZSu39+A08MV8kkN8bF5g= -github.com/DataDog/datadog-agent/pkg/util/log v0.55.0-rc.1/go.mod h1:b9MG140twXN70TS4ZkTiaYoNnmA3v02yTwbDrHTsJ5E= -github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 h1:pEG4POKCcyUCWs/UJtOOqanZN4sT9Po1em6Mz1DYZZ8= -github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2/go.mod h1:wa1JIWnzo9EvOBwzDOeff8HeqgOq9JQANRb99/nKg3A= -github.com/DataDog/datadog-agent/pkg/util/optional v0.55.0-rc.1/go.mod h1:wa1JIWnzo9EvOBwzDOeff8HeqgOq9JQANRb99/nKg3A= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 h1:uOWu0ogy4Tc9iC88hi6DOj06yNEx1+ZeJqNxAcVmdxs= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2/go.mod h1:ahpEhdpkifOLy0/XLHas+SseEmMQnwMgV1CMVkSuXL0= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.55.0-rc.1/go.mod h1:ahpEhdpkifOLy0/XLHas+SseEmMQnwMgV1CMVkSuXL0= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 h1:fry41RlKHqKZ6zGO7/OUg+Xw0lE5ug4v8tRTXKvY8eI= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2/go.mod h1:8ASCNWHQtcmUedxL+WjbCPSIcGIM8LeVzil7JCzx0js= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.55.0-rc.1/go.mod h1:8ASCNWHQtcmUedxL+WjbCPSIcGIM8LeVzil7JCzx0js= -github.com/DataDog/datadog-agent/pkg/util/startstop v0.54.0-rc.2 h1:Awe5b5LM9FcfN2l2rdVO8J+HO1TomQjYY5GJiWy+2mQ= -github.com/DataDog/datadog-agent/pkg/util/startstop v0.54.0-rc.2/go.mod h1:F9ysDtw4BnbZIuKdwOdiHranjG9QMv2o7PMVreIhFzI= -github.com/DataDog/datadog-agent/pkg/util/startstop v0.55.0-rc.1/go.mod h1:F9ysDtw4BnbZIuKdwOdiHranjG9QMv2o7PMVreIhFzI= -github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 h1:XT18D09fgmR/zAXohxT3GzIFpBAF8QVGbT2wOZxeylI= -github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2/go.mod h1:KkiJi2f4mcxAJA00ArYw4zTfs0oWMU1bNXqKhymRVZg= -github.com/DataDog/datadog-agent/pkg/util/statstracker v0.55.0-rc.1/go.mod h1:KkiJi2f4mcxAJA00ArYw4zTfs0oWMU1bNXqKhymRVZg= -github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 h1:lqVyg/T0/Zp0c3d674AqWatVzNHANjk5D+DqLCsKG3M= -github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2/go.mod h1:tFnWoJc1PTJko6nuIoW/7wN+Z7hKCNbiors0yrbPG2U= -github.com/DataDog/datadog-agent/pkg/util/system v0.55.0-rc.1/go.mod h1:DfFOg3l7ZjcmSQHipqCurJBrYydnWWEoCxua4ITl52Y= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 h1:biij/19GbVAE3iGtE395Fiyh/mt9f4BmriqTigTQ2sE= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2/go.mod h1:RKqan/bns7z9tqZBWSkshY1e6VisZJaU0b/XQcIDyAQ= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.55.0-rc.1/go.mod h1:RKqan/bns7z9tqZBWSkshY1e6VisZJaU0b/XQcIDyAQ= -github.com/DataDog/datadog-agent/pkg/util/testutil v0.54.0-rc.2 h1:J2jg1CkRYCk1A6fqM9V84RyD/zII+G6QjD/GUxIqgj0= -github.com/DataDog/datadog-agent/pkg/util/testutil v0.54.0-rc.2/go.mod h1:AyiUcueiQeqBXn60wbVOo3dPYRDNg0Gsfh/GkhatyxE= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 h1:WoLFsyqDdpTKLKXZVu1NxAhNMDlMancX5PajSa3smd0= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2/go.mod h1:e5gR7/XjZnG3S9AS0AWtUR+1LcFDWxuNaA9XsHECCrc= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.55.0-rc.1/go.mod h1:9g5pMF0cqdMfEjBDP7aPLOfHy3Q4nWsiNrAC+j/p0Wc= -github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 h1:NCLYXvORUPxCTnqaU0FhrF2tk5aZgPNtXGXYlbJWEt0= -github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2/go.mod h1:EHeMJExE74SMdRoRCEuLOxbRgjfQwCVngMqFBiz1VN8= -github.com/DataDog/datadog-agent/pkg/version v0.55.0-rc.1/go.mod h1:EHeMJExE74SMdRoRCEuLOxbRgjfQwCVngMqFBiz1VN8= github.com/DataDog/datadog-api-client-go/v2 v2.25.0 h1:9Zq42D6M3U///VDxjx2SS1g+EW55WhZYZFHtzM+cO4k= github.com/DataDog/datadog-api-client-go/v2 v2.25.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= github.com/DataDog/datadog-go/v5 v5.5.0 h1:G5KHeB8pWBNXT4Jtw0zAkhdxEAWSpWH00geHI6LDrKU= github.com/DataDog/datadog-go/v5 v5.5.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe h1:efzxujZ7VHWFxjmWjcJyUEpPrN8qdiZPYb+dBw547Wo= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe/go.mod h1:TX7CTOQ3LbQjfAi4SwqUoR5gY1zfUk7VRBDTuArjaDc= -github.com/DataDog/go-sqllexer v0.0.9 h1:Cx2Cu1S0hfj4coCCA8hzjM9+UNFRkcu1avIV//RU5Qw= -github.com/DataDog/go-sqllexer v0.0.9/go.mod h1:nB4Ea2YNsqMwtbWMc4Fm/oP98IIrSPapqwOwPioMspY= +github.com/DataDog/go-sqllexer v0.0.12 h1:ncvAr5bbwtc7JMezzcU2379oKz1oHhRF1hkR6BSvhqM= github.com/DataDog/go-sqllexer v0.0.12/go.mod h1:KwkYhpFEVIq+BfobkTC1vfqm4gTi65skV/DpDBXtexc= github.com/DataDog/go-tuf v1.1.0-0.5.2 h1:4CagiIekonLSfL8GMHRHcHudo1fQnxELS9g4tiAupQ4= github.com/DataDog/go-tuf v1.1.0-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= @@ -254,8 +91,7 @@ github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.16.0 h1:BdfRSuCoHyKa github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.16.0/go.mod h1:6eYyd+lJYH+uRuZqhyW/u+9ykaXBWetDGj44+txz6jU= github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1w5Z8= github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= -github.com/DataDog/viper v1.13.4 h1:0SrZc3zvMAGgVKg96uP4DEJb13lK2Is9a4go7IIcFSE= -github.com/DataDog/viper v1.13.4/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.5 h1:SZMcyMknYQN2jRY/40A16gUXexlNJOI8sDs1cWZnI64= github.com/DataDog/viper v1.13.5/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= @@ -553,6 +389,7 @@ github.com/hashicorp/consul/api v1.28.2 h1:mXfkRHrpHN4YY3RqL09nXU1eHKLNiuAN4kHvD github.com/hashicorp/consul/api v1.28.2/go.mod h1:KyzqzgMEya+IZPcD65YFoOVAgPpbfERu4I/tzG6/ueE= github.com/hashicorp/cronexpr v1.1.2 h1:wG/ZYIKT+RT3QkOdgYc+xsKWVRgnxJ1OJtjjy84fJ9A= github.com/hashicorp/cronexpr v1.1.2/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= diff --git a/comp/otelcol/provider/impl/provider.go b/comp/otelcol/provider/impl/provider.go index f2a04036b8998..8a16015ded51f 100644 --- a/comp/otelcol/provider/impl/provider.go +++ b/comp/otelcol/provider/impl/provider.go @@ -3,6 +3,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2024-present Datadog, Inc. +// Package providerimpl TBD package providerimpl import ( @@ -34,7 +35,7 @@ type confDump struct { var _ otelcol.ConfigProvider = (*configProvider)(nil) -// currently only supports a single URI in the uris slice, and this URI needs to be a file path. +// NewConfigProvider currently only supports a single URI in the uris slice, and this URI needs to be a file path. func NewConfigProvider(reqs provider.Requires) (provider.Component, error) { ocp, err := otelcol.NewConfigProvider(newDefaultConfigProviderSettings(reqs.URIs)) if err != nil { @@ -95,6 +96,7 @@ func (cp *configProvider) Get(ctx context.Context, factories otelcol.Factories) return conf, nil } +// nolint: deadcode, unused func (cp *configProvider) addProvidedConf(conf *otelcol.Config) error { bytesConf, err := confToString(conf) if err != nil { @@ -105,6 +107,7 @@ func (cp *configProvider) addProvidedConf(conf *otelcol.Config) error { return nil } +// nolint: deadcode, unused func (cp *configProvider) addEnhancedConf(conf *otelcol.Config) error { bytesConf, err := confToString(conf) if err != nil { @@ -136,6 +139,7 @@ func (cp *configProvider) GetEnhancedConf() string { // sensitive fields. // Note: Currently not supported until the following upstream PR: // https://github.com/open-telemetry/opentelemetry-collector/pull/10139 is merged. +// nolint: deadcode, unused func confToString(conf *otelcol.Config) (string, error) { cfg := confmap.New() err := cfg.Marshal(conf) diff --git a/tasks/go.py b/tasks/go.py index ff4da70637c45..6ff575a6a250a 100644 --- a/tasks/go.py +++ b/tasks/go.py @@ -346,7 +346,7 @@ def reset(ctx): @task -def check_go_mod_replaces(_ctx): +def check_go_mod_replaces(_): errors_found = set() for mod in DEFAULT_MODULES.values(): go_sum = os.path.join(mod.full_path(), "go.sum") diff --git a/tasks/modules.py b/tasks/modules.py index 9abeba86fff0e..d45afe697fc14 100644 --- a/tasks/modules.py +++ b/tasks/modules.py @@ -3,7 +3,7 @@ import sys from contextlib import contextmanager -from invoke import Context, task +from invoke import Context, Exit, task from tasks.libs.common.color import color_message @@ -174,6 +174,8 @@ def dependency_path(self, agent_version): "comp/otelcol/otlp/components/statsprocessor", independent=True ), "comp/otelcol/otlp/testutil": GoModule("comp/otelcol/otlp/testutil", independent=True), + "comp/otelcol/provider/def": GoModule("comp/otelcol/provider/def", independent=True), + "comp/otelcol/provider/impl": GoModule("comp/otelcol/provider/impl", independent=True), "comp/serializer/compression": GoModule("comp/serializer/compression", independent=True), "internal/tools": GoModule("internal/tools", condition=lambda: False, should_tag=False), "internal/tools/independent-lint": GoModule( @@ -356,3 +358,22 @@ def for_each(ctx: Context, cmd: str, skip_untagged: bool = False): continue with ctx.cd(mod.full_path()): ctx.run(cmd) + + +@task +def validate(_: Context, fail_fast: bool = False): + """ + Test if every module was properly added in the DEFAULT_MODULES list. + """ + missing_modules = [] + for module in DEFAULT_MODULES.values(): + for dependency in module.dependencies: + if dependency not in DEFAULT_MODULES: + if fail_fast: + raise Exit(f"{color_message('ERROR', 'red')}: {module.path} depends on missing {dependency}") + missing_modules.append((module, dependency)) + if missing_modules: + message = f"{color_message('ERROR', 'red')}: some modules are missing from DEFAULT_MODULES\n" + for module, dependency in missing_modules: + message += f" {module.path} depends on missing {dependency}\n" + raise Exit(message)