Merge pull request #2733 from digma-ai/performance-and-freeze-enhancements

Performance and freeze enhancements Closes #2704

Author: shalom938

.idea/codeStyles/Project.xml

@@ -5,7 +5,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PbuildProfile=p252 -x test" />
+      <option name="scriptParameters" value="-PbuildProfile=p252 -Pdigma-no-info-logging -x test" />
       <option name="taskDescriptions">
         <list />
       </option>

.run/Run IDEA Community - 2025.2.run.xml

@@ -5,7 +5,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PbuildWithRider=true -PbuildProfile=p252 -x test" />
+      <option name="scriptParameters" value="-PbuildWithRider=true -PbuildProfile=p252 -Pdigma-no-info-logging -x test" />
       <option name="taskDescriptions">
         <list />
       </option>

.run/Run Rider - 2025.2.run.xml

@@ -174,5 +174,6 @@ public interface AnalyticsProvider extends Closeable {
     DiscoveredDataResponse getDiscoveredData();
 
     SpanInfoByUid resolveSpanByUid(String uid);
+
     EnvironmentInfoByErrorId resolveEnvironmentByErrorId(String errorId);
 }

analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsProvider.java

@@ -252,7 +252,7 @@ tasks {
         //to upgrade gradle change the version here and run:
         //./gradlew wrapper --gradle-version 8.8
         //check that gradle/wrapper/gradle-wrapper.properties was changed
-        gradleVersion = "8.13"
+        gradleVersion = "8.14.1"
         distributionType = Wrapper.DistributionType.ALL
         distributionBase = Wrapper.PathBase.GRADLE_USER_HOME
         distributionPath = "wrapper/dists"

build.gradle.kts

@@ -16,7 +16,6 @@ dependencies {
     implementation("org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.6.0")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21")
     implementation("com.glovoapp.gradle:versioning:1.1.10")
-    implementation("de.undercouch:gradle-download-task:5.6.0")
 }
 
 

common-build-logic/build.gradle.kts

@@ -1,11 +1,16 @@
 package common
 
+import org.gradle.api.GradleException
 import org.gradle.api.Project
+import org.gradle.internal.cc.base.logger
 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"
+const val GENERATED_RESOURCES_DIR_NAME = "generated-resources"
+const val UI_VERSION_FILE_NAME = "ui-version"
+const val UI_BUNDLE_DIR_NAME = "$GENERATED_RESOURCES_DIR_NAME/ui-bundle"
 
 //use for messages we want to silence sometimes with DIGMA_NO_INFO_LOGGING
 fun Project.withSilenceLogging(consumer: () -> Unit){
@@ -52,3 +57,24 @@ fun logIntellijPlatformPlugin(project: Project, intellijPlatform: IntelliJPlatfo
 
 
 fun isWindows() = org.gradle.internal.os.OperatingSystem.current().isWindows
+
+
+fun <T> withRetry(
+    maxAttempts: Int = 3,
+    delayMillis: Long = 1000,
+    block: () -> T
+): T {
+    var lastError: Exception? = null
+    repeat(maxAttempts) { attempt ->
+        try {
+            return block()
+        } catch (e: Exception) {
+            lastError = e
+            logger.lifecycle("Retry $attempt failed: ${e.message}")
+            if (attempt < maxAttempts - 1) {
+                Thread.sleep(delayMillis * (attempt + 1)) // simple linear backoff
+            }
+        }
+    }
+    throw GradleException("Failed after $maxAttempts attempts", lastError)
+}

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

@@ -0,0 +1,48 @@
+package common
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
+import java.net.URI
+import java.util.Properties
+
+open class DownloadOtelJarsTask : DefaultTask() {
+
+    @InputFile
+    val propsFile = project.objects.fileProperty()
+
+    @OutputDirectory
+    val outputDir = project.objects.directoryProperty()
+
+    @TaskAction
+    fun downloadJars() {
+        val props = Properties().apply {
+            propsFile.get().asFile.inputStream().use { load(it) }
+        }
+
+        val nameMap = mapOf(
+            "otel-agent" to "opentelemetry-javaagent.jar",
+            "digma-extension" to "digma-otel-agent-extension.jar",
+            "digma-agent" to "digma-agent.jar"
+        )
+
+        val dir = outputDir.get().asFile
+        dir.mkdirs()
+
+        props.forEach { (key, value) ->
+            val finalName = nameMap[key] ?: throw GradleException("Unknown key in properties file: $key")
+            val url = value.toString()
+            val outputFile = dir.resolve(finalName)
+
+            logger.lifecycle("Downloading $url → ${outputFile.name}")
+            withRetry(maxAttempts = 3, delayMillis = 5_000) {
+                URI(url).toURL().openStream().use { input ->
+                    input.copyTo(outputFile.outputStream())
+                }
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,33 @@
+package common
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
+import java.net.URI
+
+open class DownloadUiBundle : DefaultTask() {
+
+    @InputFile
+    val uiVersionFile = project.objects.fileProperty()
+
+    @OutputDirectory
+    val outputDir = project.objects.directoryProperty()
+
+    @TaskAction
+    fun download() {
+        val uiVersion = uiVersionFile.get().asFile.readText().trim()
+        val url = "https://github.com/digma-ai/digma-ui/releases/download/v$uiVersion/dist-jetbrains-v$uiVersion.zip"
+        val fileName = "digma-ui-$uiVersion.zip"
+        val targetFile = outputDir.get().file(fileName).asFile
+
+        logger.lifecycle("Downloading $url → ${targetFile.name}")
+
+        withRetry(maxAttempts = 3, delayMillis = 5000) {
+            URI(url).toURL().openStream().use { input ->
+                input.copyTo(targetFile.outputStream())
+            }
+        }
+    }
+
+}

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

@@ -3,7 +3,6 @@ import common.properties
 
 plugins {
     id("java")
-    id("de.undercouch.download")
 }