Merge pull request #2615 from digma-ai/fix-linkage-error-in-otel-extension

fix-linkage-error-in-otel-extension

Author: shalom938

build.gradle.kts

@@ -322,7 +322,7 @@ tasks {
             //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-2.0.4.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"
+            //"digma.otel.extension.override.path" to "/home/shalom/workspace/digma/otel-java-instrumentation/agent-extension/build/libs/digma-otel-agent-extension-2.10.1.jar"
             //can also change the url from where the jar is downloaded when IDE starts
             //"org.digma.otel.extensionUrl" to "some url
             //"org.digma.otel.digmaAgentUrl" to "some url

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

@@ -61,8 +61,13 @@ open class JavaToolOptionsBuilder(
             javaToolOptions
                 .append("-javaagent:${otelAgentPathProvider.otelAgentPath}")
                 .append(" ")
-                .append("-Dotel.javaagent.extensions=${otelAgentPathProvider.digmaExtensionPath}")
-                .append(" ")
+
+            val useExtension: String? = System.getProperty("org.digma.plugin.useOtelExtension")
+            if (useExtension == null || useExtension == "true") {
+                javaToolOptions
+                    .append("-Dotel.javaagent.extensions=${otelAgentPathProvider.digmaExtensionPath}")
+                    .append(" ")
+            }
 
             withDigmaAgentDebug()
             withOtelTracesExporterOtlpEndpoint()

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.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-extension=https://github.com/digma-ai/otel-java-instrumentation/releases/download/v2.10.1/digma-otel-agent-extension.jar
 digma-agent=https://github.com/digma-ai/digma-agent/releases/download/v2.0.4/digma-agent.jar