Do not include system-properties in test session command tag

nikita-tkachenko-datadog · nikita-tkachenko-datadog · commit 64b2c954f945 · 2024-06-13T17:22:55.000+02:00
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java
@@ -151,15 +151,6 @@ private static String recreateStartCommand(StartParameter startParameter, String
       }
     }
 
-    for (Map.Entry<String, String> e : startParameter.getSystemPropertiesArgs().entrySet()) {
-      String propertyKey = e.getKey();
-      String propertyValue = e.getValue();
-      command.append(" -D").append(propertyKey);
-      if (propertyValue != null && !propertyValue.isEmpty()) {
-        command.append('=').append(propertyValue);
-      }
-    }
-
     return command.toString();
   }
 
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleUtils.groovy b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleUtils.groovy
@@ -49,15 +49,6 @@ abstract class GradleUtils {
       }
     }
 
-    for (Map.Entry<String, String> e : startParameter.getSystemPropertiesArgs().entrySet()) {
-      String propertyKey = e.getKey()
-      String propertyValue = e.getValue()
-      command.append(" -D").append(propertyKey)
-      if (propertyValue != null && !propertyValue.isEmpty()) {
-        command.append('=').append(propertyValue)
-      }
-    }
-
     return command.toString()
   }
 
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java b/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java
@@ -104,7 +104,7 @@ public void afterProjectsRead(MavenSession session) {
         // otherwise reference to "@{argLine}" that we add when configuring tracer
         // might cause failure
         // (test executions config is changed even if auto configuration is disabled:
-        // for passing module and sesion IDs to child JVM)
+        // for passing module and session IDs to child JVM)
         projectProperties.setProperty("argLine", "");
       }
     }
diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java b/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java
@@ -4,7 +4,6 @@
 import java.lang.invoke.MethodHandle;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
 import org.apache.maven.BuildFailureException;
@@ -164,18 +163,6 @@ public static String getCommandLine(MavenSession session) {
       command.append(' ').append(goal);
     }
 
-    Properties userProperties = request.getUserProperties();
-    if (userProperties != null) {
-      for (Map.Entry<Object, Object> e : userProperties.entrySet()) {
-        command
-            .append(" -")
-            .append(CLIManager.SET_SYSTEM_PROPERTY)
-            .append(e.getKey())
-            .append('=')
-            .append(e.getValue());
-      }
-    }
-
     if (!request.getActiveProfiles().isEmpty()) {
       command.append(" -").append(CLIManager.ACTIVATE_PROFILES);
       Iterator<String> it = request.getActiveProfiles().iterator();

Original file line number	Diff line number	Diff line change
`@@ -151,15 +151,6 @@ private static String recreateStartCommand(StartParameter startParameter, String`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
`154`		`- for (Map.Entry<String, String> e : startParameter.getSystemPropertiesArgs().entrySet()) {`
`155`		`- String propertyKey = e.getKey();`
`156`		`- String propertyValue = e.getValue();`
`157`		`- command.append(" -D").append(propertyKey);`
`158`		`- if (propertyValue != null && !propertyValue.isEmpty()) {`
`159`		`- command.append('=').append(propertyValue);`
`160`		`- }`
`161`		`- }`
`162`		`-`
`163`	`154`	`return command.toString();`
`164`	`155`	`}`
`165`	`156`
Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,6 @@ abstract class GradleUtils {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`- for (Map.Entry<String, String> e : startParameter.getSystemPropertiesArgs().entrySet()) {`
`53`		`- String propertyKey = e.getKey()`
`54`		`- String propertyValue = e.getValue()`
`55`		`- command.append(" -D").append(propertyKey)`
`56`		`- if (propertyValue != null && !propertyValue.isEmpty()) {`
`57`		`- command.append('=').append(propertyValue)`
`58`		`- }`
`59`		`- }`
`60`		`-`
`61`	`52`	`return command.toString()`
`62`	`53`	`}`
`63`	`54`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public void afterProjectsRead(MavenSession session) {`
`104`	`104`	`// otherwise reference to "@{argLine}" that we add when configuring tracer`
`105`	`105`	`// might cause failure`
`106`	`106`	`// (test executions config is changed even if auto configuration is disabled:`
`107`		`- // for passing module and sesion IDs to child JVM)`
	`107`	`+ // for passing module and session IDs to child JVM)`
`108`	`108`	`projectProperties.setProperty("argLine", "");`
`109`	`109`	`}`
`110`	`110`	`}`