Skip to content

Commit f53788a

Browse files
committed
fix-linkage-error-in-otel-extension
1 parent 9adcdba commit f53788a

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,8 @@ tasks {
322322
//see org.digma.intellij.plugin.idea.execution.OtelAgentPathProvider
323323
//don't forget to comment when done testing !
324324
//"digma.agent.override.path" to "/home/shalom/workspace/digma/digma-agent/build/libs/digma-agent-2.0.4.jar"
325-
//"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"
325+
"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"
326+
// "digma.otel.extension.override.path" to "/home/shalom/Downloads/digma-otel-agent-extension-old.jar"
326327
//can also change the url from where the jar is downloaded when IDE starts
327328
//"org.digma.otel.extensionUrl" to "some url
328329
//"org.digma.otel.digmaAgentUrl" to "some url

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,13 @@ open class JavaToolOptionsBuilder(
6161
javaToolOptions
6262
.append("-javaagent:${otelAgentPathProvider.otelAgentPath}")
6363
.append(" ")
64-
.append("-Dotel.javaagent.extensions=${otelAgentPathProvider.digmaExtensionPath}")
65-
.append(" ")
64+
65+
val useExtension: String? = System.getProperty("org.digma.plugin.useExtension")
66+
if (useExtension == null || useExtension == "true") {
67+
javaToolOptions
68+
.append("-Dotel.javaagent.extensions=${otelAgentPathProvider.digmaExtensionPath}")
69+
.append(" ")
70+
}
6671

6772
withDigmaAgentDebug()
6873
withOtelTracesExporterOtlpEndpoint()

0 commit comments

Comments
 (0)