From 7276cfaccfe1086bb6670cb2e423fafa20f1c784 Mon Sep 17 00:00:00 2001 From: Jade Guiton Date: Fri, 17 Oct 2025 18:06:30 +0200 Subject: [PATCH 1/4] [chore] Move Datadog E2E tests and examples --- .chloggen/config.yaml | 2 +- .github/CODEOWNERS | 1 - .github/ISSUE_TEMPLATE/beta_stability.yaml | 2 +- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- .github/ISSUE_TEMPLATE/feature_request.yaml | 2 +- .github/ISSUE_TEMPLATE/other.yaml | 2 +- .github/ISSUE_TEMPLATE/unmaintained.yaml | 2 +- .github/component_labels.txt | 2 +- .../examples/batch-memory.yaml | 0 .../examples/collector-metrics.yaml | 0 .../datadogexporter}/examples/collector.yaml | 0 .../examples/docker-stats.yaml | 0 .../examples/host-metadata.yaml | 0 .../examples/host-metrics.yaml | 0 .../examples/k8s-chart/configmap.yaml | 0 .../examples/k8s-chart/daemonset.yaml | 0 .../examples/k8s-chart/deployment.yaml | 0 .../examples/k8s-chart/k8s-values.yaml | 0 .../examples/k8s-chart/roles.yaml | 0 .../examples/k8s-chart/serviceaccount.yaml | 0 .../datadogexporter}/examples/kafka.yaml | 0 .../datadogexporter}/examples/logs.yaml | 0 .../datadogexporter}/examples/ootb-ec2.yaml | 0 .../datadogexporter}/examples/otlp.yaml | 0 .../examples/trace-metrics.yaml | 0 internal/datadog/e2e/Makefile | 1 + internal/{ => datadog}/e2e/examples_test.go | 9 +-- internal/{ => datadog}/e2e/go.mod | 80 +++++++++---------- internal/{ => datadog}/e2e/go.sum | 0 internal/{ => datadog}/e2e/metadata.yaml | 0 internal/e2e/Makefile | 1 - internal/tidylist/tidylist.txt | 2 +- versions.yaml | 2 +- 33 files changed, 54 insertions(+), 56 deletions(-) rename {internal/e2e => exporter/datadogexporter}/examples/batch-memory.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/collector-metrics.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/collector.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/docker-stats.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/host-metadata.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/host-metrics.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/k8s-chart/configmap.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/k8s-chart/daemonset.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/k8s-chart/deployment.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/k8s-chart/k8s-values.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/k8s-chart/roles.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/k8s-chart/serviceaccount.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/kafka.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/logs.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/ootb-ec2.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/otlp.yaml (100%) rename {internal/e2e => exporter/datadogexporter}/examples/trace-metrics.yaml (100%) create mode 100644 internal/datadog/e2e/Makefile rename internal/{ => datadog}/e2e/examples_test.go (95%) rename internal/{ => datadog}/e2e/go.mod (94%) rename internal/{ => datadog}/e2e/go.sum (100%) rename internal/{ => datadog}/e2e/metadata.yaml (100%) delete mode 100644 internal/e2e/Makefile diff --git a/.chloggen/config.yaml b/.chloggen/config.yaml index eee4316e81eae..26fbb63aca09c 100644 --- a/.chloggen/config.yaml +++ b/.chloggen/config.yaml @@ -127,8 +127,8 @@ components: - internal/common - internal/coreinternal - internal/datadog + - internal/datadog/e2e - internal/docker - - internal/e2e - internal/exp/metrics - internal/filter - internal/grpcutil diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 93ade7ef6cca6..b633f0a986b92 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -140,7 +140,6 @@ internal/common/ @open-telemetry internal/coreinternal/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers internal/datadog/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd @IbraheemA @jackgopack4 internal/docker/ @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy -internal/e2e/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd @IbraheemA internal/exp/metrics/ @open-telemetry/collector-contrib-approvers @RichieSams @tombrk internal/filter/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers internal/grpcutil/ @open-telemetry/collector-contrib-approvers @jmacd @moh-osman3 @lquerel diff --git a/.github/ISSUE_TEMPLATE/beta_stability.yaml b/.github/ISSUE_TEMPLATE/beta_stability.yaml index 0fcac1a031cd6..c635a4ae7ddc2 100644 --- a/.github/ISSUE_TEMPLATE/beta_stability.yaml +++ b/.github/ISSUE_TEMPLATE/beta_stability.yaml @@ -138,8 +138,8 @@ body: - internal/common - internal/core - internal/datadog + - internal/datadog/e2e - internal/docker - - internal/e2e - internal/exp/metrics - internal/filter - internal/grpcutil diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index c6a4169080354..3203e7f025a31 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -141,8 +141,8 @@ body: - internal/common - internal/core - internal/datadog + - internal/datadog/e2e - internal/docker - - internal/e2e - internal/exp/metrics - internal/filter - internal/grpcutil diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 50946f751bffd..fd5892ff2147d 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -135,8 +135,8 @@ body: - internal/common - internal/core - internal/datadog + - internal/datadog/e2e - internal/docker - - internal/e2e - internal/exp/metrics - internal/filter - internal/grpcutil diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml index 2e4a967f2a51c..a98b87c927037 100644 --- a/.github/ISSUE_TEMPLATE/other.yaml +++ b/.github/ISSUE_TEMPLATE/other.yaml @@ -135,8 +135,8 @@ body: - internal/common - internal/core - internal/datadog + - internal/datadog/e2e - internal/docker - - internal/e2e - internal/exp/metrics - internal/filter - internal/grpcutil diff --git a/.github/ISSUE_TEMPLATE/unmaintained.yaml b/.github/ISSUE_TEMPLATE/unmaintained.yaml index f6727cb344533..34851a15c303e 100644 --- a/.github/ISSUE_TEMPLATE/unmaintained.yaml +++ b/.github/ISSUE_TEMPLATE/unmaintained.yaml @@ -140,8 +140,8 @@ body: - internal/common - internal/core - internal/datadog + - internal/datadog/e2e - internal/docker - - internal/e2e - internal/exp/metrics - internal/filter - internal/grpcutil diff --git a/.github/component_labels.txt b/.github/component_labels.txt index 743a8dd331fa4..a170011c8c0d5 100644 --- a/.github/component_labels.txt +++ b/.github/component_labels.txt @@ -120,8 +120,8 @@ internal/collectd internal/collectd internal/common internal/common internal/coreinternal internal/core internal/datadog internal/datadog +internal/datadog/e2e internal/datadog/e2e internal/docker internal/docker -internal/e2e internal/e2e internal/exp/metrics internal/exp/metrics internal/filter internal/filter internal/grpcutil internal/grpcutil diff --git a/internal/e2e/examples/batch-memory.yaml b/exporter/datadogexporter/examples/batch-memory.yaml similarity index 100% rename from internal/e2e/examples/batch-memory.yaml rename to exporter/datadogexporter/examples/batch-memory.yaml diff --git a/internal/e2e/examples/collector-metrics.yaml b/exporter/datadogexporter/examples/collector-metrics.yaml similarity index 100% rename from internal/e2e/examples/collector-metrics.yaml rename to exporter/datadogexporter/examples/collector-metrics.yaml diff --git a/internal/e2e/examples/collector.yaml b/exporter/datadogexporter/examples/collector.yaml similarity index 100% rename from internal/e2e/examples/collector.yaml rename to exporter/datadogexporter/examples/collector.yaml diff --git a/internal/e2e/examples/docker-stats.yaml b/exporter/datadogexporter/examples/docker-stats.yaml similarity index 100% rename from internal/e2e/examples/docker-stats.yaml rename to exporter/datadogexporter/examples/docker-stats.yaml diff --git a/internal/e2e/examples/host-metadata.yaml b/exporter/datadogexporter/examples/host-metadata.yaml similarity index 100% rename from internal/e2e/examples/host-metadata.yaml rename to exporter/datadogexporter/examples/host-metadata.yaml diff --git a/internal/e2e/examples/host-metrics.yaml b/exporter/datadogexporter/examples/host-metrics.yaml similarity index 100% rename from internal/e2e/examples/host-metrics.yaml rename to exporter/datadogexporter/examples/host-metrics.yaml diff --git a/internal/e2e/examples/k8s-chart/configmap.yaml b/exporter/datadogexporter/examples/k8s-chart/configmap.yaml similarity index 100% rename from internal/e2e/examples/k8s-chart/configmap.yaml rename to exporter/datadogexporter/examples/k8s-chart/configmap.yaml diff --git a/internal/e2e/examples/k8s-chart/daemonset.yaml b/exporter/datadogexporter/examples/k8s-chart/daemonset.yaml similarity index 100% rename from internal/e2e/examples/k8s-chart/daemonset.yaml rename to exporter/datadogexporter/examples/k8s-chart/daemonset.yaml diff --git a/internal/e2e/examples/k8s-chart/deployment.yaml b/exporter/datadogexporter/examples/k8s-chart/deployment.yaml similarity index 100% rename from internal/e2e/examples/k8s-chart/deployment.yaml rename to exporter/datadogexporter/examples/k8s-chart/deployment.yaml diff --git a/internal/e2e/examples/k8s-chart/k8s-values.yaml b/exporter/datadogexporter/examples/k8s-chart/k8s-values.yaml similarity index 100% rename from internal/e2e/examples/k8s-chart/k8s-values.yaml rename to exporter/datadogexporter/examples/k8s-chart/k8s-values.yaml diff --git a/internal/e2e/examples/k8s-chart/roles.yaml b/exporter/datadogexporter/examples/k8s-chart/roles.yaml similarity index 100% rename from internal/e2e/examples/k8s-chart/roles.yaml rename to exporter/datadogexporter/examples/k8s-chart/roles.yaml diff --git a/internal/e2e/examples/k8s-chart/serviceaccount.yaml b/exporter/datadogexporter/examples/k8s-chart/serviceaccount.yaml similarity index 100% rename from internal/e2e/examples/k8s-chart/serviceaccount.yaml rename to exporter/datadogexporter/examples/k8s-chart/serviceaccount.yaml diff --git a/internal/e2e/examples/kafka.yaml b/exporter/datadogexporter/examples/kafka.yaml similarity index 100% rename from internal/e2e/examples/kafka.yaml rename to exporter/datadogexporter/examples/kafka.yaml diff --git a/internal/e2e/examples/logs.yaml b/exporter/datadogexporter/examples/logs.yaml similarity index 100% rename from internal/e2e/examples/logs.yaml rename to exporter/datadogexporter/examples/logs.yaml diff --git a/internal/e2e/examples/ootb-ec2.yaml b/exporter/datadogexporter/examples/ootb-ec2.yaml similarity index 100% rename from internal/e2e/examples/ootb-ec2.yaml rename to exporter/datadogexporter/examples/ootb-ec2.yaml diff --git a/internal/e2e/examples/otlp.yaml b/exporter/datadogexporter/examples/otlp.yaml similarity index 100% rename from internal/e2e/examples/otlp.yaml rename to exporter/datadogexporter/examples/otlp.yaml diff --git a/internal/e2e/examples/trace-metrics.yaml b/exporter/datadogexporter/examples/trace-metrics.yaml similarity index 100% rename from internal/e2e/examples/trace-metrics.yaml rename to exporter/datadogexporter/examples/trace-metrics.yaml diff --git a/internal/datadog/e2e/Makefile b/internal/datadog/e2e/Makefile new file mode 100644 index 0000000000000..bdd863a203be8 --- /dev/null +++ b/internal/datadog/e2e/Makefile @@ -0,0 +1 @@ +include ../../../Makefile.Common diff --git a/internal/e2e/examples_test.go b/internal/datadog/e2e/examples_test.go similarity index 95% rename from internal/e2e/examples_test.go rename to internal/datadog/e2e/examples_test.go index 3e8d329da8877..a4e410f4080ae 100644 --- a/internal/e2e/examples_test.go +++ b/internal/datadog/e2e/examples_test.go @@ -1,12 +1,11 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package e2e // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/e2e" +package e2e // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog/e2e" import ( "os" "path/filepath" - "strings" "testing" "github.com/stretchr/testify/require" @@ -39,7 +38,7 @@ import ( func TestExamples(t *testing.T) { factories := newTestComponents(t) - const folder = "./examples" + const folder = "../../../exporter/datadogexporter/examples" files, err := os.ReadDir(folder) require.NoError(t, err) for _, f := range files { @@ -61,8 +60,8 @@ func TestExamples(t *testing.T) { }) } - const chartConfigFile = "./examples/k8s-chart/configmap.yaml" - t.Run(strings.TrimPrefix(chartConfigFile, "./examples/"), func(t *testing.T) { + const chartConfigFile = folder + "/k8s-chart/configmap.yaml" + t.Run("k8s-chart/configmap.yaml", func(t *testing.T) { var out struct { Kind string `yaml:"kind"` Data struct { diff --git a/internal/e2e/go.mod b/internal/datadog/e2e/go.mod similarity index 94% rename from internal/e2e/go.mod rename to internal/datadog/e2e/go.mod index 3afc5550042dd..299f7d6e8b98f 100644 --- a/internal/e2e/go.mod +++ b/internal/datadog/e2e/go.mod @@ -1,4 +1,4 @@ -module github.com/open-telemetry/opentelemetry-collector-contrib/internal/e2e +module github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog/e2e go 1.24.0 @@ -501,80 +501,80 @@ require ( sigs.k8s.io/yaml v1.6.0 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor => ../../processor/k8sattributesprocessor +replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor => ../../../processor/k8sattributesprocessor -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil => ../pdatautil +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil => ../../pdatautil -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../../pkg/core/xidutils -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor => ../../processor/deltatocumulativeprocessor +replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor => ../../../processor/deltatocumulativeprocessor -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../../pkg/pdatautil -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../datadog +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../datadog -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver => ../../receiver/filelogreceiver +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver => ../../../receiver/filelogreceiver -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver => ../../receiver/dockerstatsreceiver +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver => ../../../receiver/dockerstatsreceiver -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor => ../../processor/transformprocessor +replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor => ../../../processor/transformprocessor -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => ../../pkg/stanza +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => ../../../pkg/stanza -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders => ../metadataproviders +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders => ../../metadataproviders -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => ../k8sconfig +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => ../../k8sconfig -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter => ../../exporter/datadogexporter +replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter => ../../../exporter/datadogexporter -replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../extension/storage +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../../extension/storage -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl => ../../pkg/ottl +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl => ../../../pkg/ottl -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../../pkg/pdatatest -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => ../../pkg/experimentalmetricmetadata +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => ../../../pkg/experimentalmetricmetadata -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker => ../docker +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker => ../../docker -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => ../../receiver/prometheusreceiver +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => ../../../receiver/prometheusreceiver -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite => ../../pkg/translator/prometheusremotewrite +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite => ../../../pkg/translator/prometheusremotewrite -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => ../../pkg/resourcetotelemetry +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => ../../../pkg/resourcetotelemetry -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => ../../pkg/translator/prometheus +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => ../../../pkg/translator/prometheus -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling => ../../pkg/sampling +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling => ../../../pkg/sampling -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../../pkg/golden -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog => ../../pkg/datadog +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog => ../../../pkg/datadog -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv => ../gopsutilenv +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv => ../../gopsutilenv -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics => ../exp/metrics +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics => ../../exp/metrics -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../common +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../common -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => ../../processor/resourcedetectionprocessor +replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => ../../../processor/resourcedetectionprocessor -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters => ../../pkg/winperfcounters +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters => ../../../pkg/winperfcounters -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter => ../filter +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter => ../../filter -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil => ../aws/ecsutil +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil => ../../aws/ecsutil -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver => ../../receiver/hostmetricsreceiver +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver => ../../../receiver/hostmetricsreceiver -replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector => ../../connector/datadogconnector +replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector => ../../../connector/datadogconnector -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor => ../../processor/tailsamplingprocessor +replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor => ../../../processor/tailsamplingprocessor -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../exporter/prometheusremotewriteexporter +replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../../exporter/prometheusremotewriteexporter -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor => ../../processor/probabilisticsamplerprocessor +replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor => ../../../processor/probabilisticsamplerprocessor -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest => ../../pkg/xk8stest +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest => ../../../pkg/xk8stest -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../coreinternal +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../coreinternal diff --git a/internal/e2e/go.sum b/internal/datadog/e2e/go.sum similarity index 100% rename from internal/e2e/go.sum rename to internal/datadog/e2e/go.sum diff --git a/internal/e2e/metadata.yaml b/internal/datadog/e2e/metadata.yaml similarity index 100% rename from internal/e2e/metadata.yaml rename to internal/datadog/e2e/metadata.yaml diff --git a/internal/e2e/Makefile b/internal/e2e/Makefile deleted file mode 100644 index ded7a36092dc3..0000000000000 --- a/internal/e2e/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.Common diff --git a/internal/tidylist/tidylist.txt b/internal/tidylist/tidylist.txt index f323aaf731e82..90af21eabaf61 100644 --- a/internal/tidylist/tidylist.txt +++ b/internal/tidylist/tidylist.txt @@ -195,7 +195,7 @@ processor/resourcedetectionprocessor processor/transformprocessor receiver/dockerstatsreceiver receiver/filelogreceiver -internal/e2e +internal/datadog/e2e internal/kubelet internal/sqlquery internal/tools diff --git a/versions.yaml b/versions.yaml index 64786c8e610f4..cb3489e3dfea4 100644 --- a/versions.yaml +++ b/versions.yaml @@ -138,8 +138,8 @@ module-sets: - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal - github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog/e2e - github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/e2e - github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter - github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv From ae3b9fefe23bf200fff260feea004d37683f9a60 Mon Sep 17 00:00:00 2001 From: Jade Guiton Date: Thu, 23 Oct 2025 12:36:49 +0200 Subject: [PATCH 2/4] make genlabels --- .github/component_labels.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/component_labels.txt b/.github/component_labels.txt index 5fa6c0ec2771a..4b1618b81b0b8 100644 --- a/.github/component_labels.txt +++ b/.github/component_labels.txt @@ -121,7 +121,6 @@ internal/collectd internal/collectd internal/common internal/common internal/coreinternal internal/core internal/datadog internal/datadog -internal/datadog/e2e internal/datadog/e2e internal/docker internal/docker internal/exp/metrics internal/exp/metrics internal/filter internal/filter From f2f6e6fb84a8d5130485136b1080b198526257f4 Mon Sep 17 00:00:00 2001 From: Jade Guiton Date: Thu, 23 Oct 2025 14:15:13 +0200 Subject: [PATCH 3/4] make gencodeowners --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4be6d84c988d3..ddfe38cb261f2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -140,6 +140,7 @@ internal/collectd/ @open-telemetry internal/common/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers internal/coreinternal/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers internal/datadog/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd @IbraheemA @jackgopack4 +internal/datadog/e2e/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd @IbraheemA internal/docker/ @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy internal/exp/metrics/ @open-telemetry/collector-contrib-approvers @RichieSams internal/filter/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers From 425774ffbd4a5e962c4ec28cc3662a343ec81c18 Mon Sep 17 00:00:00 2001 From: Jade Guiton Date: Thu, 23 Oct 2025 14:54:58 +0200 Subject: [PATCH 4/4] make genlabels again? --- .github/component_labels.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/component_labels.txt b/.github/component_labels.txt index 4b1618b81b0b8..5fa6c0ec2771a 100644 --- a/.github/component_labels.txt +++ b/.github/component_labels.txt @@ -121,6 +121,7 @@ internal/collectd internal/collectd internal/common internal/common internal/coreinternal internal/core internal/datadog internal/datadog +internal/datadog/e2e internal/datadog/e2e internal/docker internal/docker internal/exp/metrics internal/exp/metrics internal/filter internal/filter