From ecd93fb8b3433b4b2c1240d9924d14c1d1204025 Mon Sep 17 00:00:00 2001
From: Nikita Tkachenko
 <121111529+nikita-tkachenko-datadog@users.noreply.github.com>
Date: Fri, 14 Jun 2024 21:21:33 +0200
Subject: [PATCH] Do not include system-properties in test session command tag
 (#7187)

---
 .../gradle/CiVisibilityGradleListener.java          |  9 ---------
 .../gradle/legacy/GradleUtils.groovy                |  9 ---------
 .../maven3/MavenLifecycleParticipant.java           |  2 +-
 .../trace/instrumentation/maven3/MavenUtils.java    | 13 -------------
 4 files changed, 1 insertion(+), 32 deletions(-)

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
index 04fb13ba7b6..533f99f4e5c 100644
--- 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
index 99d0e7f265f..cd41ef7085d 100644
--- 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
index 25eefd47ebb..456d1b994bf 100644
--- 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
index 67f5950acd2..e82814ef5cb 100644
--- 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();