Merge pull request #2604 from digma-ai/upgrade-otel-agent

upgrade otel agent Closes #2602

Author: shalom938

build.gradle.kts

@@ -246,10 +246,6 @@ tasks {
 
 
     wrapper {
-        //todo: gradle 8.10.1 has a bug
-        // see https://github.com/gradle/gradle/issues/30497
-        // see https://github.com/gradle/gradle/issues/30472
-        // upgrade to 8.10.2 when its released
         //to upgrade gradle change the version here and run:
         //./gradlew wrapper --gradle-version 8.8
         //check that gradle/wrapper/gradle-wrapper.properties was changed

jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/execution/JavaToolOptionsBuilder.kt

@@ -299,20 +299,19 @@ open class JavaToolOptionsBuilder(
     open fun build(): String {
 
         //always disable extended observability extension because we changed to digma-agent
-        disableExtendedObservabilityExtension()
+        //disableExtendedObservabilityExtension()
 
         return javaToolOptions.toString()
     }
 
 
-    private fun disableExtendedObservabilityExtension() {
-        //todo: need to disable the extended observability extension completely in the otel agent extension
-        // project after some time that we use digma-agent and all users upgraded the plugin.
-        // can't disable it yet because some users may still use older version of the plugin and are using extended observability.
-        javaToolOptions
-            .append("-Dotel.instrumentation.digma-methods.enabled=false")
-            .append(" ")
-    }
+//don't need to disable digma-methods, it is not included in the extension anymore
+//    private fun disableExtendedObservabilityExtension() {
+//        // can't disable it yet because some users may still use older version of the plugin and are using extended observability.
+//        javaToolOptions
+//            .append("-Dotel.instrumentation.digma-methods.enabled=false")
+//            .append(" ")
+//    }
 
 
     open fun getExporterUrl(): String {

jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/execution/OTELJarProvider.kt

@@ -8,16 +8,12 @@ import java.io.FileOutputStream
 import java.net.URL
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
-import java.util.Properties
 import java.util.concurrent.locks.ReentrantLock
 import kotlin.io.path.deleteIfExists
 
 private const val JARS_DIR_PREFIX = "digma-otel-jars"
 private const val RESOURCE_LOCATION = "otelJars"
 
-private const val OTEL_AGENT_JAR_PROP_NAME = "otel-agent"
-private const val DIGMA_EXTENSION_JAR_PROP_NAME = "digma-extension"
-private const val DIGMA_AGENT_JAR_PROP_NAME = "digma-agent"
 private const val OTEL_AGENT_JAR_NAME = "opentelemetry-javaagent.jar"
 private const val DIGMA_AGENT_EXTENSION_JAR_NAME = "digma-otel-agent-extension.jar"
 private const val DIGMA_AGENT_JAR_NAME = "digma-agent.jar"
@@ -49,19 +45,16 @@ class OTELJarProvider {
 
     private val downloadDir: File = File(System.getProperty("java.io.tmpdir"), JARS_DIR_PREFIX)
 
-    private val jarsUrls = Properties()
-
     private val lock = ReentrantLock(true)
 
 
     init {
 
-        jarsUrls.load(this::class.java.getResourceAsStream("/jars-urls.properties"))
-
         //unpack and download on service initialization.
         //will happen per IDE session
         Thread {
-            unpackFilesAndDownloadLatest()
+            unpackFiles()
+            downloadCustomJars()
         }.start()
     }
 
@@ -114,8 +107,8 @@ class OTELJarProvider {
 
         Log.log(logger::info, "otel jars do not exists, unpacking..")
 
-        unpackFilesAndDownloadLatest()
-
+        unpackFiles()
+        downloadCustomJars()
     }
 
     private fun filesExist(): Boolean {
@@ -126,7 +119,7 @@ class OTELJarProvider {
     }
 
 
-    private fun unpackFilesAndDownloadLatest() {
+    private fun unpackFiles() {
 
         Log.log(logger::info, "unpacking otel agent jars")
 
@@ -148,8 +141,6 @@ class OTELJarProvider {
                 Log.warnWithException(logger, e, "could not unpack otel jars, hopefully download will succeed.")
             }
         }
-
-        tryDownloadLatest()
     }
 
 
@@ -167,22 +158,28 @@ class OTELJarProvider {
     }
 
 
-    private fun tryDownloadLatest() {
+    private fun downloadCustomJars() {
 
-        Log.log(logger::info, "trying to download latest otel jars")
+        Log.log(logger::info, "trying to download custom otel jars")
 
         val runnable = Runnable {
 
             try {
-                val otelUrl = System.getProperty("org.digma.otel.agentUrl", jarsUrls.getProperty(OTEL_AGENT_JAR_PROP_NAME))
-                val extensionUrl = System.getProperty("org.digma.otel.extensionUrl", jarsUrls.getProperty(DIGMA_EXTENSION_JAR_PROP_NAME))
-                val digmaAgentUrl = System.getProperty("org.digma.otel.digmaAgentUrl", jarsUrls.getProperty(DIGMA_AGENT_JAR_PROP_NAME))
 
-                downloadAndCopyJar(URL(otelUrl), getOtelAgentJar())
-                downloadAndCopyJar(URL(extensionUrl), getDigmaAgentExtensionJar())
-                downloadAndCopyJar(URL(digmaAgentUrl), getDigmaAgentJar())
+                System.getProperty("org.digma.otel.agentUrl")?.let {
+                    downloadAndCopyJar(URL(it), getOtelAgentJar())
+                }
+
+                System.getProperty("org.digma.otel.extensionUrl")?.let {
+                    downloadAndCopyJar(URL(it), getDigmaAgentExtensionJar())
+                }
+
+                System.getProperty("org.digma.otel.digmaAgentUrl")?.let {
+                    downloadAndCopyJar(URL(it), getDigmaAgentJar())
+                }
+
             } catch (e: Exception) {
-                Log.warnWithException(logger, e, "could not download latest otel jars")
+                Log.warnWithException(logger, e, "could not download custom otel jars")
             }
         }
 

jvm-common/src/main/resources/jars-urls.properties

@@ -1,3 +1,3 @@
-otel-agent=https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.1.0/opentelemetry-javaagent.jar
-digma-extension=https://github.com/digma-ai/otel-java-instrumentation/releases/latest/download/digma-otel-agent-extension.jar
-digma-agent=https://github.com/digma-ai/digma-agent/releases/latest/download/digma-agent.jar
+otel-agent=https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.10.0/opentelemetry-javaagent.jar
+digma-extension=https://github.com/digma-ai/otel-java-instrumentation/releases/download/v2.10.0/digma-otel-agent-extension.jar
+digma-agent=https://github.com/digma-ai/digma-agent/releases/download/v2.0.2/digma-agent.jar