enable new extended observability wil feature flag

Author: shalom938

build.gradle.kts

@@ -255,7 +255,7 @@ tasks {
             // usually when developing and we want to test the plugin
             //see org.digma.intellij.plugin.idea.execution.OtelAgentPathProvider
             //don't forget to comment when done testing !
-            //"digma.agent.override.path" to "/home/shalom/workspace/digma/digma-agent/build/libs/digma-agent-1.0.2.jar"
+            //"digma.agent.override.path" to "/home/shalom/workspace/digma/digma-agent/build/libs/digma-agent-1.0.8-SNAPSHOT.jar"
             //"digma.otel.extension.override.path" to "/home/shalom/workspace/digma/otel-java-instrumentation/agent-extension/build/libs/digma-otel-agent-extension-0.8.12.jar"
             //can also change the url from where the jar is downloaded when IDE starts
             //"org.digma.otel.extensionUrl" to "some url

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

@@ -95,9 +95,10 @@ open class JavaParametersMerger(
     protected fun smartMergeJavaToolOptions(myJavaToolOptions: String, currentJavaToolOptions: String): String {
 
         //merge two java tool options strings. values from myJavaToolOptions override values from currentJavaToolOptions
+        //we want to preserve the order , existing java tool options properties should be first
 
-        val myOptions = javaToolOptionsToMap(myJavaToolOptions)
         val currentOptions = javaToolOptionsToMap(currentJavaToolOptions)
+        val myOptions = javaToolOptionsToMap(myJavaToolOptions)
 
         val result = mutableMapOf<String, String?>()
         result.putAll(currentOptions)

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

@@ -39,15 +39,27 @@ open class JavaToolOptionsBuilder(
     }
 
 
-    open fun withOtelAgent(useAgent: Boolean): JavaToolOptionsBuilder {
+    open fun withOtelAgent(useAgent: Boolean, parametersExtractor: ParametersExtractor): JavaToolOptionsBuilder {
 
         if (useAgent) {
             if (!otelAgentPathProvider.hasAgentPath()) {
-                throw JavaToolOptionsBuilderException("useAgent is true but can't find agent paths")
+                throw JavaToolOptionsBuilderException("useAgent is true but can't find agent or extension paths")
             }
+
+            val shouldUseDigmaAgent = parametersExtractor.extractEnvValue(USE_DIGMA_AGENT_PROP_NAME) == "true"
+            if (shouldUseDigmaAgent) {
+                if (!otelAgentPathProvider.hasDigmaAgentPath()) {
+                    throw JavaToolOptionsBuilderException("USE_DIGMA_AGENT is true but can't find digma agent paths")
+                }
+
+                javaToolOptions
+                    .append("-javaagent:${otelAgentPathProvider.digmaAgentPath}")
+                    .append(" ")
+
+                disableExtendedObservabilityExtension()
+            }
+
             javaToolOptions
-                .append("-javaagent:${otelAgentPathProvider.digmaAgentPath}")
-                .append(" ")
                 .append("-javaagent:${otelAgentPathProvider.otelAgentPath}")
                 .append(" ")
                 .append("-Dotel.javaagent.extensions=${otelAgentPathProvider.digmaExtensionPath}")
@@ -262,12 +274,9 @@ open class JavaToolOptionsBuilder(
 
 
     open fun build(): String {
-        disableExtendedObservabilityExtension()
         return javaToolOptions.toString()
     }
 
-    //todo: disabled in this branch because it uses Digma agent that injects @WithSpan instead of the
-    // digma-methods instrumentation module.
     private fun disableExtendedObservabilityExtension() {
         javaToolOptions
             .append("-Dotel.instrumentation.digma-methods.enabled=false")

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

@@ -76,7 +76,11 @@ class OtelAgentPathProvider(configuration: RunConfiguration) {
 
 
     fun hasAgentPath(): Boolean {
-        return otelAgentPath != null && digmaExtensionPath != null && digmaAgentPath != null
+        return otelAgentPath != null && digmaExtensionPath != null
+    }
+
+    fun hasDigmaAgentPath(): Boolean {
+        return digmaAgentPath != null
     }
 
 }

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

@@ -12,6 +12,10 @@ const val OTEL_SERVICE_NAME_PROP_NAME = "otel.service.name"
 
 const val DIGMA_MARKER = "-Dorg.digma.marker=true"
 
+//a feature flag to use digma agent for extended instrumentation instead of the otel extension module
+const val USE_DIGMA_AGENT_PROP_NAME = "USE_DIGMA_AGENT"
+
+
 /*
 DIGMA_OBSERVABILITY is an environment variable to forces observability when user executes an unsupported
  gradle task or maven goal. it should be used only for gradle or maven. it can not force observability for unknown

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

@@ -118,7 +118,7 @@ open class DefaultInstrumentationFlavor : BaseInstrumentationFlavor() {
             val isTest = isTest(instrumentationService, parametersExtractor, configuration, params)
 
             javaToolOptionsBuilder
-                .withOtelAgent(useOtelAgent())
+                .withOtelAgent(useOtelAgent(), parametersExtractor)
                 .withMockitoSupport(isTest)
                 .withServiceName(moduleResolver, parametersExtractor, serviceNameProvider)
                 .withExtendedObservability()