From 7fdb224bea642fba958485bea78925098ad58815 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Mon, 3 Mar 2025 14:32:51 +0100 Subject: [PATCH] Fix an NPE in Gradle Android instrumentation --- .../instrumentation/gradle/CiVisibilityGradleListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 750cb03e669..09d6506822a 100644 --- 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 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); }