Merge pull request #2223 from digma-ai/improve-build-time

improve build time

Author: shalom938

common-build-logic/src/main/kotlin/common/Common.kt

@@ -4,6 +4,18 @@ import org.gradle.api.Project
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformExtension
 
+//send -Pdigma-no-info-logging to silence some console logging, useful when debugging issues so the log is not too noisy.
+const val DIGMA_NO_INFO_LOGGING = "digma-no-info-logging"
+
+//use for messages we want to silence sometimes with DIGMA_NO_INFO_LOGGING
+fun Project.withSilenceLogging(consumer: () -> Unit){
+    if (!hasProperty(DIGMA_NO_INFO_LOGGING)) {
+        consumer.invoke()
+    }
+}
+
+
+
 fun properties(key: String, project: Project) = project.findProperty(key).toString()
 
 fun platformTypeProperty(project: Project) = project.findProperty("platformType") as IntelliJPlatformType

common-build-logic/src/main/kotlin/plugin-library.gradle.kts

@@ -1,5 +1,6 @@
 import common.logBuildProfile
 import common.logIntellijPlatformPlugin
+import common.withSilenceLogging
 
 plugins {
     id("digma-base")
@@ -25,8 +26,10 @@ dependencies {
 
 afterEvaluate {
     if (gradle.startParameter.taskNames.contains("buildPlugin")) {
-        logBuildProfile(project)
-        logIntellijPlatformPlugin(project, intellijPlatform)
+        withSilenceLogging {
+            logBuildProfile(project)
+            logIntellijPlatformPlugin(project, intellijPlatform)
+        }
     }
 }
 

common-build-logic/src/main/kotlin/plugin-project.gradle.kts

@@ -1,6 +1,8 @@
 import common.logBuildProfile
 import common.logIntellijPlatformPlugin
 import common.properties
+import common.withSilenceLogging
+import gradle.kotlin.dsl.accessors._44bd68d24449dd49451fa0f0c4976aa6.intellijPlatform
 
 plugins {
     id("digma-base")
@@ -25,8 +27,10 @@ intellijPlatform {
 
 afterEvaluate {
     if (gradle.startParameter.taskNames.contains("buildPlugin")) {
-        logBuildProfile(project)
-        logIntellijPlatformPlugin(project, intellijPlatform)
+        withSilenceLogging {
+            logBuildProfile(project)
+            logIntellijPlatformPlugin(project, intellijPlatform)
+        }
     }
 }
 

gradle.properties

@@ -30,10 +30,8 @@ pluginRepositoryUrl=https://github.com/digma-ai/digma-intellij-plugin.git
 kotlin.stdlib.default.dependency=false
 
 # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
-## todo: we have some tasks that are incompatible with configuration cache, injectPosthogTokenUrlTask and rider rd-gen tasks.
-## change to true to see the errors and fix
-org.gradle.configuration-cache = false
-org.gradle.configuration-cache.problems = warn
+#org.gradle.configuration-cache = false
+#org.gradle.configuration-cache.problems = warn
 
 # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
 org.gradle.caching = true

jvm-common/build.gradle.kts

@@ -2,6 +2,7 @@ import common.BuildProfiles
 import common.currentProfile
 import common.dynamicPlatformType
 import common.platformVersion
+import common.withSilenceLogging
 import de.undercouch.gradle.tasks.download.Download
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import java.util.Properties
@@ -69,7 +70,10 @@ tasks {
             )
         )
 
-        logger.lifecycle("${project.name}: jars to download $properties")
+        withSilenceLogging {
+            logger.lifecycle("${project.name}: jars to download $properties")
+        }
+
 
         dest(File(project.sourceSets.main.get().output.resourcesDir, "otelJars"))
         overwrite(false)

rider/build.gradle.kts

@@ -1,8 +1,10 @@
 import com.jetbrains.plugin.structure.base.utils.isFile
 import common.BuildProfiles
 import common.BuildProfiles.greaterThan
+import common.DIGMA_NO_INFO_LOGGING
 import common.currentProfile
 import common.withCurrentProfile
+import common.withSilenceLogging
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.jetbrains.intellij.platform.gradle.Constants
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
@@ -18,7 +20,7 @@ plugins {
 
 private val dotnetPluginId = "Digma.Rider.Plugin"
 private val buildConfiguration = "Debug"
-private val solutionFile = "$dotnetPluginId/Digma.Rider.Plugin.sln"
+private val solutionFile = "Digma.Rider.Plugin.sln"
 private val dotnetProjectDir = layout.projectDirectory.dir(dotnetPluginId)
 private val nugetConfigFile = dotnetProjectDir.file("nuget.config").asFile
 private val pluginPropsFile = dotnetProjectDir.file("Plugin.props").asFile
@@ -71,9 +73,11 @@ val riderSdkTestProjectFile by lazy {
 }
 
 project.afterEvaluate {
-    logger.lifecycle("Rider Sdk Path: $riderSdkPath")
-    logger.lifecycle("Rider Sdk project file: $riderSdkProjectFile")
-    logger.lifecycle("Rider Sdk test project file: $riderSdkTestProjectFile")
+    withSilenceLogging {
+        logger.lifecycle("Rider Sdk Path: $riderSdkPath")
+        logger.lifecycle("Rider Sdk project file: $riderSdkProjectFile")
+        logger.lifecycle("Rider Sdk test project file: $riderSdkTestProjectFile")
+    }
 }
 
 
@@ -111,7 +115,9 @@ tasks {
             </configuration>
             """.trimIndent()
 
-            logger.lifecycle("Writing nuget.config to $path, content $content")
+            withSilenceLogging {
+                logger.lifecycle("Writing nuget.config to $path, content $content")
+            }
             val bytes = content.toByteArray()
             nugetConfigFile.writeBytes(bytes)
         }
@@ -164,9 +170,9 @@ tasks {
         val tokens = mutableMapOf<String, String>()
 
         //up to p233 the version should be 4.0.0, and 4.3.0 after p233
-        val traceSourceVersion = if(project.currentProfile().profile.greaterThan(BuildProfiles.Profile.p233)){
+        val traceSourceVersion = if (project.currentProfile().profile.greaterThan(BuildProfiles.Profile.p233)) {
             "4.3.0"
-        }else{
+        } else {
             "4.0.0"
         }
 
@@ -188,7 +194,7 @@ tasks {
 
     //call prepare before loading the project to Rider
     val prepare by registering {
-        dependsOn(generateNuGetConfig, initPluginProps,initPluginTestProps, rdGen)
+        dependsOn(generateNuGetConfig, initPluginProps, initPluginTestProps, rdGen)
     }
 
 
@@ -219,24 +225,38 @@ tasks {
             //for diagnostics add argument "/v:diag"
 
             //about /r: in development we sometimes need to build with different profiles, for example 232 and then 241.
-            // sometimes the conpileDotnet task will fail and looks like its using the wrong assemblies. /r(estore) fixes it.
+            // sometimes the compileDotnet task will fail and looks like its using the wrong assemblies. /r(estore) fixes it.
+
+            withSilenceLogging {
+                logger.lifecycle("compileDotNet:Plugin.props: ${pluginPropsFile.readText()}")
+                logger.lifecycle("compileDotNet:nuget.config: ${nugetConfigFile.readText()}")
+            }
+
+            val argsList = mutableListOf(
+                "msbuild",
+                "/r",
+                "/p:Configuration=$buildConfiguration",
+                "/t:Rebuild",
+                "/nodeReuse:False",
+                "/fl",
+                "/bl:${project.layout.buildDirectory.get().asFile.absolutePath}/dotnet/msbuild.binlog"
+            )
+
+            if (project.hasProperty(DIGMA_NO_INFO_LOGGING)) {
+                argsList.add("-noConsoleLogger")
+            }
 
-            logger.lifecycle("compileDotNet:Plugin.props: ${pluginPropsFile.readText()}")
-            logger.lifecycle("compileDotNet:nuget.config: ${nugetConfigFile.readText()}")
+            argsList.add(solutionFile)
+
+            withSilenceLogging {
+                logger.lifecycle("dotnet args: [${argsList.joinToString(" ")}]")
+            }
 
             exec {
                 executable = "dotnet"
-                args = listOf(
-                    "msbuild",
-                    "/r",
-                    "/p:Configuration=$buildConfiguration",
-                    "/t:Clean;Restore;Rebuild",
-                    "/nodeReuse:False",
-                    "/fl",
-                    "/bl:${project.layout.buildDirectory.get().asFile.absolutePath}/dotnet/msbuild.binlog",
-                    solutionFile
-                )
-                workingDir = projectDir
+                args = argsList.toList()
+
+                workingDir = dotnetProjectDir.asFile
             }
         }
     }
@@ -284,7 +304,10 @@ val riderModel: Configuration by configurations.creating {
 artifacts {
     add(riderModel.name, provider {
         intellijPlatform.platformPath.resolve("lib/rd/rider-model.jar").also {
-            logger.lifecycle("rider-model.jar: $it")
+            withSilenceLogging {
+                logger.lifecycle("rider-model.jar: $it")
+            }
+
             check(it.isFile) {
                 "rider-model.jar is not found at $it"
             }