Fix Gradle Daemon process detection (#7524)

nikita-tkachenko-datadog · web-flow · commit b7907a264eda · 2024-08-29T09:41:37.000+02:00
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ProcessHierarchyUtils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ProcessHierarchyUtils.java
@@ -38,7 +38,11 @@ private static boolean isMavenParent() {
   }
 
   private static boolean isGradleDaemon() {
-    return ClassLoader.getSystemClassLoader().getResource("org/gradle/launcher/daemon/") != null;
+    return ClassLoader.getSystemClassLoader()
+                .getResource("org/gradle/launcher/daemon/bootstrap/GradleDaemon.class")
+            != null
+        // double-check this is not a Gradle Worker
+        && System.getProperties().getProperty("org.gradle.internal.worker.tmpdir") == null;
   }
 
   public static long getParentSessionId() {

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,11 @@ private static boolean isMavenParent() {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`private static boolean isGradleDaemon() {`
`41`		`- return ClassLoader.getSystemClassLoader().getResource("org/gradle/launcher/daemon/") != null;`
	`41`	`+ return ClassLoader.getSystemClassLoader()`
	`42`	`+ .getResource("org/gradle/launcher/daemon/bootstrap/GradleDaemon.class")`
	`43`	`+ != null`
	`44`	`+ // double-check this is not a Gradle Worker`
	`45`	`+ && System.getProperties().getProperty("org.gradle.internal.worker.tmpdir") == null;`
`42`	`46`	`}`
`43`	`47`
`44`	`48`	`public static long getParentSessionId() {`