From e3ba666344cf977829663e57570bc8ce0031ba48 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 2 Jul 2025 10:05:28 -0400 Subject: [PATCH 1/2] Revert "Update ddapm-test-agent from v1.11.0 to v1.24.1 (#9043)" This reverts commit 0f66a88142b6925d7fd37853d628393a8a6a4f93. --- .gitlab-ci.yml | 2 +- .../groovy/datadog/trace/TracerConnectionReliabilityTest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47c9b66df6d..1ee377164c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -521,7 +521,7 @@ muzzle-dep-report: CI_USE_TEST_AGENT: "true" CI_AGENT_HOST: local-agent services: - - name: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.24.1 + - name: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.11.0 alias: local-agent variables: LOG_LEVEL: "DEBUG" diff --git a/dd-trace-core/src/test/groovy/datadog/trace/TracerConnectionReliabilityTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/TracerConnectionReliabilityTest.groovy index c213bb6dc54..3ebe2a6ed4e 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/TracerConnectionReliabilityTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/TracerConnectionReliabilityTest.groovy @@ -116,7 +116,7 @@ class TracerConnectionReliabilityTest extends DDSpecification { def startTestAgentContainer() { //noinspection GrDeprecatedAPIUsage Use FixedHostPortGenericContainer against deprecation because we need to know the exposed to configure the tracer at start - def agentContainer = new FixedHostPortGenericContainer("ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.24.1") + def agentContainer = new FixedHostPortGenericContainer("ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.11.0") .withFixedExposedPort(agentContainerPort, DEFAULT_TRACE_AGENT_PORT) .withEnv("ENABLED_CHECKS", "trace_count_header,meta_tracer_version_header,trace_content_length") .waitingFor(Wait.forHttp("/test/traces")) From d902475f94b040b9a6eadc829ed2f7216b8c8f88 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 2 Jul 2025 10:23:14 -0400 Subject: [PATCH 2/2] Fixed spotless. --- internal-api/src/main/java/datadog/trace/api/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index cbaa3ceb925..6534d8f870c 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -65,7 +65,7 @@ import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_CLASSFILE_DUMP_ENABLED; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_ENABLED; -import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_HOIST_LOCALVARS_ENABLED; +import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_LOCALVAR_HOISTING_LEVEL; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_METRICS_ENABLED; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_POLL_INTERVAL; @@ -285,9 +285,9 @@ import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_ENABLED; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_EXCLUDE_FILES; -import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_HOIST_LOCALVARS_ENABLED; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_INCLUDE_FILES; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_INSTRUMENT_THE_WORLD; +import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_LOCALVAR_HOISTING_LEVEL; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_METRICS_ENABLED; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_POLL_INTERVAL;