diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6a7c0fda935087..d4578e479ec784 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -580,7 +580,7 @@ /test/new-e2e/tests/process @DataDog/processes /test/new-e2e/tests/sysprobe-functional @DataDog/windows-kernel-integrations /test/new-e2e/tests/cws @DataDog/agent-security -/test/new-e2e/tests/agent-metric-logs @DataDog/agent-metrics-logs +/test/new-e2e/tests/agent-metrics-logs @DataDog/agent-metrics-logs /test/new-e2e/tests/windows @DataDog/windows-agent @DataDog/windows-kernel-integrations /test/new-e2e/tests/apm @DataDog/agent-apm /test/new-e2e/tests/remote-config @DataDog/remote-config diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3b5661fa487ca..5e12e7539dfc57 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -893,8 +893,29 @@ workflow: - !reference [.on_e2e_main_release_or_rc] - changes: paths: - # TODO: Add paths that should trigger tests for AML - test/new-e2e/tests/agent-metrics-logs/**/* + - cmd/agent/subcommands/dogstatsd*/* + - cmd/agent/subcommands/streamlogs/* + - cmd/dogstatsd/**/* + - comp/agent/jmxlogger/**/* + - comp/aggregator/**/* + - comp/collector/**/* + - comp/core/agenttelemetry/**/* + - comp/core/autodiscovery/providers/config_reader*.go + - comp/core/autodiscovery/providers/file*.go + - comp/forwarder/**/* + - comp/logs/**/* + - comp/serializer/compression/**/* + - pkg/aggregator/**/* + - pkg/collector/**/* + - pkg/commonchecks/**/* + - pkg/dogstatsd/**/* + - pkg/jmxfetch/**/* + - pkg/logs/**/* + - pkg/metrics/**/* + - pkg/persistentcache/**/* + - pkg/serializer/**/* + - rtloader/**/* compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916 .on_cws_or_e2e_changes: diff --git a/.gitlab/e2e/e2e.yml b/.gitlab/e2e/e2e.yml index cb1765c781b55c..f4d4d9b9eb99f3 100644 --- a/.gitlab/e2e/e2e.yml +++ b/.gitlab/e2e/e2e.yml @@ -261,8 +261,8 @@ new-e2e-aml: - !reference [.on_aml_or_e2e_changes] - !reference [.manual] variables: - TARGETS: ./tests/agent-metric-logs - TEAM: agent-metric-logs + TARGETS: ./tests/agent-metrics-logs + TEAM: agent-metrics-logs new-e2e-cws: extends: .new_e2e_template diff --git a/test/new-e2e/tests/agent-metric-logs/kindfilelogging/kind.go b/test/new-e2e/tests/agent-metrics-logs/kindfilelogging/kind.go similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/kindfilelogging/kind.go rename to test/new-e2e/tests/agent-metrics-logs/kindfilelogging/kind.go diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/k8s-logs/file_tailing_cca_off_test.go b/test/new-e2e/tests/agent-metrics-logs/log-agent/k8s-logs/file_tailing_cca_off_test.go similarity index 98% rename from test/new-e2e/tests/agent-metric-logs/log-agent/k8s-logs/file_tailing_cca_off_test.go rename to test/new-e2e/tests/agent-metrics-logs/log-agent/k8s-logs/file_tailing_cca_off_test.go index c5db1a47b1be26..5eb8d7ca4468c3 100644 --- a/test/new-e2e/tests/agent-metric-logs/log-agent/k8s-logs/file_tailing_cca_off_test.go +++ b/test/new-e2e/tests/agent-metrics-logs/log-agent/k8s-logs/file_tailing_cca_off_test.go @@ -19,7 +19,7 @@ import ( "github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e" "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments" - kindfilelogger "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/kindfilelogging" + kindfilelogger "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/kindfilelogging" ) type k8sCCAOffSuite struct { diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/k8s-logs/file_tailing_test.go b/test/new-e2e/tests/agent-metrics-logs/log-agent/k8s-logs/file_tailing_test.go similarity index 99% rename from test/new-e2e/tests/agent-metric-logs/log-agent/k8s-logs/file_tailing_test.go rename to test/new-e2e/tests/agent-metrics-logs/log-agent/k8s-logs/file_tailing_test.go index 024fc3790eba86..da139dc3a6bc67 100644 --- a/test/new-e2e/tests/agent-metric-logs/log-agent/k8s-logs/file_tailing_test.go +++ b/test/new-e2e/tests/agent-metrics-logs/log-agent/k8s-logs/file_tailing_test.go @@ -19,7 +19,7 @@ import ( "github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e" "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments" - kindfilelogger "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/kindfilelogging" + kindfilelogger "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/kindfilelogging" ) type k8sSuite struct { diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/k8s-logs/long_line_log.txt b/test/new-e2e/tests/agent-metrics-logs/log-agent/k8s-logs/long_line_log.txt similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/k8s-logs/long_line_log.txt rename to test/new-e2e/tests/agent-metrics-logs/log-agent/k8s-logs/long_line_log.txt diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/log-config/automulti.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/config/automulti.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/log-config/automulti.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/config/automulti.yaml diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/log-config/config.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/config/config.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/log-config/config.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/config/config.yaml diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/log-config/pattern.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/config/pattern.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/log-config/pattern.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/config/pattern.yaml diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/log-config/utf-16-be.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/config/utf-16-be.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/log-config/utf-16-be.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/config/utf-16-be.yaml diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/log-config/utf-16-le.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/config/utf-16-le.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/log-config/utf-16-le.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/config/utf-16-le.yaml diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/file_tailing_test.go b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/file_tailing_test.go similarity index 99% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/file_tailing_test.go rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/file_tailing_test.go index c6801c72d21b6c..691e3bf042b9d8 100644 --- a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/file_tailing_test.go +++ b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/file_tailing_test.go @@ -17,7 +17,7 @@ import ( "github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e" "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments" awshost "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments/aws/host" - "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/log-agent/utils" + "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/log-agent/utils" "github.com/DataDog/test-infra-definitions/components/datadog/agentparams" ) @@ -26,7 +26,7 @@ type LinuxFakeintakeSuite struct { e2e.BaseSuite[environments.Host] } -//go:embed log-config/config.yaml +//go:embed config/config.yaml var logConfig string const ( diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/multi_line_test.go b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/multi_line_test.go similarity index 98% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/multi_line_test.go rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/multi_line_test.go index 00c84bf744fdc4..1de8fd868ff194 100644 --- a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/multi_line_test.go +++ b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/multi_line_test.go @@ -18,13 +18,13 @@ import ( "github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e" "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments" awshost "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments/aws/host" - "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/log-agent/utils" + "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/log-agent/utils" ) -//go:embed log-config/automulti.yaml +//go:embed config/automulti.yaml var autoMultiLineConfig string -//go:embed log-config/pattern.yaml +//go:embed config/pattern.yaml var multiLineLogPatternConfig string const singleLineLog = "This is a single line log" diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/utf_test.go b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/utf_test.go similarity index 98% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/utf_test.go rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/utf_test.go index 40385162a0e10f..0e3f5dc5011af3 100644 --- a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/file-tailing/utf_test.go +++ b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/file-tailing/utf_test.go @@ -19,10 +19,10 @@ import ( "github.com/stretchr/testify/assert" ) -//go:embed log-config/utf-16-le.yaml +//go:embed config/utf-16-le.yaml var utfLittleEndianLogConfig []byte -//go:embed log-config/utf-16-be.yaml +//go:embed config/utf-16-be.yaml var utfBigEndianLogConfig []byte const utfservice = "utfservice" diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/journald_tailing_test.go b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/journald_tailing_test.go similarity index 99% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/journald_tailing_test.go rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/journald_tailing_test.go index c7bde32e5693e5..23aaedb2f92bdd 100644 --- a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/journald_tailing_test.go +++ b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/journald_tailing_test.go @@ -18,7 +18,7 @@ import ( "github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e" "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments" awshost "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments/aws/host" - "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/log-agent/utils" + "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/log-agent/utils" "github.com/DataDog/test-infra-definitions/components/datadog/agentparams" ) diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/log-config/exclude.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/log-config/exclude.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/log-config/exclude.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/log-config/exclude.yaml diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/log-config/include.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/log-config/include.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/log-config/include.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/log-config/include.yaml diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/log-config/journald.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/log-config/journald.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/log-config/journald.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/log-config/journald.yaml diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/log-config/logger-service.sh b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/log-config/logger-service.sh similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/log-config/logger-service.sh rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/log-config/logger-service.sh diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/log-config/python-script.sh b/test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/log-config/python-script.sh similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/linux-log/journald/log-config/python-script.sh rename to test/new-e2e/tests/agent-metrics-logs/log-agent/linux-log/journald/log-config/python-script.sh diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/listener/tcp_test.go b/test/new-e2e/tests/agent-metrics-logs/log-agent/listener/tcp_test.go similarity index 99% rename from test/new-e2e/tests/agent-metric-logs/log-agent/listener/tcp_test.go rename to test/new-e2e/tests/agent-metrics-logs/log-agent/listener/tcp_test.go index 83c89604b0ae2d..490026424b6314 100644 --- a/test/new-e2e/tests/agent-metric-logs/log-agent/listener/tcp_test.go +++ b/test/new-e2e/tests/agent-metrics-logs/log-agent/listener/tcp_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/log-agent/utils" + "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/log-agent/utils" "github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e" "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments" diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/listener/testdata/agent-logs-tcp-conf.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/listener/testdata/agent-logs-tcp-conf.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/listener/testdata/agent-logs-tcp-conf.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/listener/testdata/agent-logs-tcp-conf.yaml diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/listener/testdata/agent-logs-udp-conf.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/listener/testdata/agent-logs-udp-conf.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/listener/testdata/agent-logs-udp-conf.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/listener/testdata/agent-logs-udp-conf.yaml diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/listener/testdata/tcp-compose.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/listener/testdata/tcp-compose.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/listener/testdata/tcp-compose.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/listener/testdata/tcp-compose.yaml diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/listener/testdata/udp-compose.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/listener/testdata/udp-compose.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/listener/testdata/udp-compose.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/listener/testdata/udp-compose.yaml diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/utils/file_tailing_utils.go b/test/new-e2e/tests/agent-metrics-logs/log-agent/utils/file_tailing_utils.go similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/utils/file_tailing_utils.go rename to test/new-e2e/tests/agent-metrics-logs/log-agent/utils/file_tailing_utils.go diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/windows-log/file-tailing/file_tailing_test.go b/test/new-e2e/tests/agent-metrics-logs/log-agent/windows-log/file-tailing/file_tailing_test.go similarity index 99% rename from test/new-e2e/tests/agent-metric-logs/log-agent/windows-log/file-tailing/file_tailing_test.go rename to test/new-e2e/tests/agent-metrics-logs/log-agent/windows-log/file-tailing/file_tailing_test.go index f306ddc5952216..2f13e89793c072 100644 --- a/test/new-e2e/tests/agent-metric-logs/log-agent/windows-log/file-tailing/file_tailing_test.go +++ b/test/new-e2e/tests/agent-metrics-logs/log-agent/windows-log/file-tailing/file_tailing_test.go @@ -17,7 +17,7 @@ import ( "github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e" "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments" awshost "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments/aws/host" - "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/log-agent/utils" + "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/log-agent/utils" "github.com/DataDog/test-infra-definitions/components/datadog/agentparams" testos "github.com/DataDog/test-infra-definitions/components/os" "github.com/DataDog/test-infra-definitions/scenarios/aws/ec2" diff --git a/test/new-e2e/tests/agent-metric-logs/log-agent/windows-log/file-tailing/log-config/config.yaml b/test/new-e2e/tests/agent-metrics-logs/log-agent/windows-log/file-tailing/log-config/config.yaml similarity index 100% rename from test/new-e2e/tests/agent-metric-logs/log-agent/windows-log/file-tailing/log-config/config.yaml rename to test/new-e2e/tests/agent-metrics-logs/log-agent/windows-log/file-tailing/log-config/config.yaml