Fix an NPE in Gradle Android instrumentation (#8484)

nikita-tkachenko-datadog · web-flow · commit 31fb3838381c · 2025-03-03T16:11:16.000Z
diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java
@@ -186,7 +186,7 @@ public void beforeExecute(TaskIdentity<?> taskIdentity) {
     Map<String, Object> inputProperties = task.getInputs().getProperties();
     BuildModuleLayout moduleLayout =
         (BuildModuleLayout) inputProperties.get(CiVisibilityPluginExtension.MODULE_LAYOUT_PROPERTY);
-    if (moduleLayout.getSourceSets().isEmpty()
+    if ((moduleLayout == null || moduleLayout.getSourceSets().isEmpty())
         && project.getExtensions().findByName("android") != null) {
       moduleLayout = AndroidGradleUtils.getAndroidModuleLayout(project, task);
     }

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public void beforeExecute(TaskIdentity<?> taskIdentity) {`
`186`	`186`	`Map<String, Object> inputProperties = task.getInputs().getProperties();`
`187`	`187`	`BuildModuleLayout moduleLayout =`
`188`	`188`	`(BuildModuleLayout) inputProperties.get(CiVisibilityPluginExtension.MODULE_LAYOUT_PROPERTY);`
`189`		`- if (moduleLayout.getSourceSets().isEmpty()`
	`189`	`+ if ((moduleLayout == null \|\| moduleLayout.getSourceSets().isEmpty())`
`190`	`190`	`&& project.getExtensions().findByName("android") != null) {`
`191`	`191`	`moduleLayout = AndroidGradleUtils.getAndroidModuleLayout(project, task);`
`192`	`192`	`}`