Merge pull request #2513 from digma-ai/always-add-digma-agent-to-javatooloptions

always-add-digma-agent-to-javatooloptions

Author: shalom938

ide-common/src/main/kotlin/org/digma/intellij/plugin/common/ProjectUtils.kt

@@ -7,7 +7,7 @@ import com.intellij.openapi.wm.IdeFocusManager
 
 fun findActiveProject(): Project? {
 
-    //best effort to find aa active project
+    //best effort to find an active project
 
     var project = ProjectUtil.getActiveProject()
     if (project == null || !isProjectValid(project)) {

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

@@ -48,27 +48,23 @@ open class JavaToolOptionsBuilder(
                 throw JavaToolOptionsBuilderException("useAgent is true but can't find agent or extension paths")
             }
 
-            if (isExtendedObservabilityConfigured()) {
-
-                if (!otelAgentPathProvider.hasDigmaAgentPath()) {
-                    throw JavaToolOptionsBuilderException("can't find digma-agent path")
-                }
-
-                javaToolOptions
-                    .append("-javaagent:${otelAgentPathProvider.digmaAgentPath}")
-                    .append(" ")
-
-                withDigmaAgentDebug()
+            if (!otelAgentPathProvider.hasDigmaAgentPath()) {
+                throw JavaToolOptionsBuilderException("can't find digma-agent path")
+            }
 
+            //digma agent must be before otel agent in the command line
+            javaToolOptions
+                .append("-javaagent:${otelAgentPathProvider.digmaAgentPath}")
+                .append(" ")
 
-            }
 
             javaToolOptions
                 .append("-javaagent:${otelAgentPathProvider.otelAgentPath}")
                 .append(" ")
                 .append("-Dotel.javaagent.extensions=${otelAgentPathProvider.digmaExtensionPath}")
                 .append(" ")
 
+            withDigmaAgentDebug()
             withOtelTracesExporterOtlpEndpoint()
         }
 
@@ -326,7 +322,7 @@ open class JavaToolOptionsBuilder(
 
     @Suppress("MemberVisibilityCanBePrivate")
     fun isExtendedObservabilityConfigured(): Boolean {
-        return !SettingsState.getInstance().extendedObservability.isNullOrBlank()
+        return SettingsState.getInstance().extendedObservability.isNullOrBlank().not()
     }
 
 }