From 6d959747bf87964b65dd4b3892800b2ada26ff8a Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Mon, 28 Jul 2025 12:59:24 -0400 Subject: [PATCH 1/2] Use mirrored agent image --- .gitlab-ci.yml | 2 +- .../src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce41c759069..7beb9eb4d7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -601,7 +601,7 @@ agent_integration_tests: GRADLE_TARGET: "traceAgentTest" CACHE_TYPE: "base" services: - - name: datadog/agent:7.34.0 + - name: registry.ddbuild.io/images/mirror/datadog/agent:7.40.1 alias: local-agent variables: DD_APM_ENABLED: "true" diff --git a/dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy b/dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy index 7d0fc3cfd0d..f31db6c8452 100644 --- a/dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy +++ b/dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy @@ -18,7 +18,7 @@ abstract class AbstractTraceAgentTest extends DDSpecification { and we use 'testcontainers' for this. */ if ("true" != System.getenv("CI")) { - agentContainer = new GenericContainer("datadog/agent:7.34.0") + agentContainer = new GenericContainer("datadog/agent:7.40.1") .withEnv(["DD_APM_ENABLED": "true", "DD_BIND_HOST" : "0.0.0.0", "DD_API_KEY" : "invalid_key_but_this_is_fine", From fe103ee98d1687ed8d3d0fee9b4738f7de835048 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Mon, 28 Jul 2025 14:45:10 -0400 Subject: [PATCH 2/2] new agent version fails if hostname is not set --- .gitlab-ci.yml | 1 + .../src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7beb9eb4d7b..3cefab38d24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -606,6 +606,7 @@ agent_integration_tests: variables: DD_APM_ENABLED: "true" DD_BIND_HOST: "0.0.0.0" + DD_HOSTNAME: "local-agent" DD_API_KEY: "invalid_key_but_this_is_fine" test_base: diff --git a/dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy b/dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy index f31db6c8452..f2fe38cc18d 100644 --- a/dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy +++ b/dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy @@ -22,6 +22,7 @@ abstract class AbstractTraceAgentTest extends DDSpecification { .withEnv(["DD_APM_ENABLED": "true", "DD_BIND_HOST" : "0.0.0.0", "DD_API_KEY" : "invalid_key_but_this_is_fine", + "DD_HOSTNAME" : "doesnotexist", "DD_LOGS_STDOUT": "yes"]) .withExposedPorts(datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_AGENT_PORT) .withStartupTimeout(Duration.ofSeconds(120))