From 2e0f8aa1fd64fb78e04a672fe787596edc783572 Mon Sep 17 00:00:00 2001 From: Oskar Jung Date: Tue, 9 Jul 2024 09:20:21 +0200 Subject: [PATCH 1/2] Sanitize service env and version in SymbolSink We're matching RC tags with these tags, so they have to be sanitized the same way. https://github.com/DataDog/dd-trace-java/blob/65d7de13ac6a58d949af75fef4e9531bcaed5aab/remote-config/src/main/java/datadog/remoteconfig/PollerRequestFactory.java#L54-L57 --- .../src/main/java/com/datadog/debugger/sink/SymbolSink.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SymbolSink.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SymbolSink.java index 77652174166..04b7f46bb76 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SymbolSink.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SymbolSink.java @@ -45,8 +45,8 @@ public SymbolSink(Config config) { SymbolSink(Config config, BatchUploader symbolUploader) { this.serviceName = TagsHelper.sanitize(config.getServiceName()); - this.env = config.getEnv(); - this.version = config.getVersion(); + this.env = TagsHelper.sanitize(config.getEnv()); + this.version = TagsHelper.sanitize(config.getVersion()); this.symbolUploader = symbolUploader; byte[] eventContent = String.format( From b50a8e3018c8f22ec479bb1760c4e2aa2614ad92 Mon Sep 17 00:00:00 2001 From: Oskar Jung Date: Tue, 9 Jul 2024 09:22:06 +0200 Subject: [PATCH 2/2] Remove duplicate tests --- .../java/com/datadog/debugger/util/ClassNameFilteringTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassNameFilteringTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassNameFilteringTest.java index 841ae9ac338..fee1e0f5c57 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassNameFilteringTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ClassNameFilteringTest.java @@ -79,11 +79,9 @@ public void testIncludeSomeExcludeSome() { strings = { "java.FooBar", "org.junit.Test", - "org.junit.jupiter.api.Test", "akka.Actor", "cats.Functor", "org.junit.jupiter.api.Test", - "org.junit.jupiter.api.Test", "org.datadog.jmxfetch.FooBar" }) public void testExcludeDefaults(String input) {