Adapt tests

Author: amarziali

dd-java-agent/instrumentation/tomcat-5.5/src/latestDepTest/groovy/TomcatServer.groovy

@@ -65,6 +65,7 @@ class TomcatServer implements WebsocketServer {
     port = server.service.findConnectors()[0].localPort
     assert port > 0
     if (Config.get().isExperimentalPropagateProcessTagsEnabled()) {
+      server.getEngine().setName("tomcat")
       def serverName = TraceUtils.normalizeTag(server.getEngine().getName())
       assert ProcessTags.getTagsAsStringList().containsAll(["server.type:tomcat", "server.name:" + serverName])
     } else {

dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java

@@ -11,6 +11,7 @@
 import com.datadog.debugger.probe.LogProbe;
 import com.datadog.debugger.sink.Snapshot;
 import com.squareup.moshi.JsonAdapter;
+import datadog.environment.JavaVirtualMachine;
 import datadog.trace.agent.test.utils.PortUtils;
 import datadog.trace.bootstrap.debugger.MethodLocation;
 import datadog.trace.bootstrap.debugger.ProbeId;
@@ -184,6 +185,9 @@ private JsonSnapshotSerializer.IntakeRequest doTestTracer(
     ProcessBuilder processBuilder = createProcessBuilder(logFilePath, "--server.port=" + httpPort);
     if (enableProcessTags) {
       processBuilder.environment().put("DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED", "true");
+    } else if (JavaVirtualMachine.isJavaVersion(21)) {
+      // disable explicitly since enable by default on 21
+      processBuilder.environment().put("DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED", "false");
     }
     targetProcess = processBuilder.start();
     // assert in logs app started

remote-config/remote-config-core/src/test/groovy/datadog/remoteconfig/PollerRequestFactoryTest.groovy

@@ -1,6 +1,7 @@
 package datadog.remoteconfig
 
 import com.squareup.moshi.Moshi
+import datadog.environment.JavaVirtualMachine
 import datadog.remoteconfig.tuf.RemoteConfigRequest
 import datadog.trace.api.ProcessTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
@@ -58,8 +59,11 @@ class PollerRequestFactoryTest extends DDSpecification {
 
   void 'remote config provides process tags when enabled  = #enabled'() {
     setup:
+    // to be changed when activated by default
     if (enabled) {
       injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true")
+    } else if (JavaVirtualMachine.isJavaVersion(21)) {
+      injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false")
     }
     ProcessTags.reset()
     PollerRequestFactory factory = new PollerRequestFactory(Config.get(), TRACER_VERSION, CONTAINER_ID, ENTITY_ID, INVALID_REMOTE_CONFIG_URL, null)