From d5c0d06ebbe3747b7edb5e589f828577397e110e Mon Sep 17 00:00:00 2001 From: Pierre Gimalac Date: Fri, 6 Dec 2024 11:34:20 +0100 Subject: [PATCH] Fix comp/otelcol/collector-contrib module path (#31762) --- comp/otelcol/collector-contrib/impl/go.mod | 2 +- comp/otelcol/collector-contrib/impl/manifest.yaml | 2 +- tasks/unit_tests/testdata/collector/valid_datadog_manifest.yaml | 2 +- .../collector/valid_manifest_without_specified_version.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/comp/otelcol/collector-contrib/impl/go.mod b/comp/otelcol/collector-contrib/impl/go.mod index 2ca191c9c4ea0..d23c34cd7c2f2 100644 --- a/comp/otelcol/collector-contrib/impl/go.mod +++ b/comp/otelcol/collector-contrib/impl/go.mod @@ -1,6 +1,6 @@ // Code generated by "go.opentelemetry.io/collector/cmd/builder". DO NOT EDIT. -module github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib +module github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/impl go 1.22.0 diff --git a/comp/otelcol/collector-contrib/impl/manifest.yaml b/comp/otelcol/collector-contrib/impl/manifest.yaml index a5d48ed8eed80..6f878f6d19c84 100644 --- a/comp/otelcol/collector-contrib/impl/manifest.yaml +++ b/comp/otelcol/collector-contrib/impl/manifest.yaml @@ -3,7 +3,7 @@ connectors: v0.114.0 dist: description: Datadog OpenTelemetry Collector - module: github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib + module: github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/impl name: otelcol-contrib output_path: ./comp/otelcol/collector-contrib/impl version: 0.114.0 diff --git a/tasks/unit_tests/testdata/collector/valid_datadog_manifest.yaml b/tasks/unit_tests/testdata/collector/valid_datadog_manifest.yaml index 4a3a56caf12e3..0f12f2cc26ca1 100644 --- a/tasks/unit_tests/testdata/collector/valid_datadog_manifest.yaml +++ b/tasks/unit_tests/testdata/collector/valid_datadog_manifest.yaml @@ -1,6 +1,6 @@ --- dist: - module: github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib + module: github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/impl name: otelcol-contrib description: Valid (default) datadog converged Agent ocb manifest (should pass collector_tests.py) version: 0.114.0 diff --git a/tasks/unit_tests/testdata/collector/valid_manifest_without_specified_version.yaml b/tasks/unit_tests/testdata/collector/valid_manifest_without_specified_version.yaml index baa4486191d7f..7a11140cbb107 100644 --- a/tasks/unit_tests/testdata/collector/valid_manifest_without_specified_version.yaml +++ b/tasks/unit_tests/testdata/collector/valid_manifest_without_specified_version.yaml @@ -1,6 +1,6 @@ --- dist: - module: github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib + module: github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/impl name: otelcol-contrib description: valid manifest with minimum requirements and no version (should pass collector_tests.py) output_path: ./comp/otelcol/collector-contrib/impl