Skip to content

Do not include system-properties in test session command tag #7187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikita-tkachenko-datadog merged 1 commit into from
Jun 14, 2024
Merged

Do not include system-properties in test session command tag #7187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions ...adle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
9 changes: 0 additions & 9 deletions ...ion/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleUtils.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down
2 changes: 1 addition & 1 deletion ...n-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", "");
}
}
Expand Down
13 changes: 0 additions & 13 deletions ...umentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down