Merge

Author: opoliarush

ide-common/src/main/java/org/digma/intellij/plugin/document/CodeLensProvider.java

@@ -169,7 +169,7 @@ private synchronized Set<CodeLens> buildCodeLens(@NotNull DocumentInfoContainer
         List<MethodWithCodeObjects> methods = new ArrayList<>();
 
         for (MethodInfo methodInfo : methodsInfo) {
-            List<String> relatedSpansCodeObjectIds = methodInfo.getSpans().stream().map(SpanInfo::getId).toList();
+            List<String> relatedSpansCodeObjectIds = methodInfo.getSpans().stream().map(SpanInfo::idWithType).toList();
             List<String> relatedEndpointCodeObjectIds = methodInfo.getEndpoints().stream().map(EndpointInfo::getId).toList();
 
             for (String id : methodInfo.allIdsWithType()) {

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)) {

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

@@ -10,7 +10,7 @@ import org.digma.intellij.plugin.errorreporting.ErrorReporter
 class ReloadAction : AnAction() {
     override fun actionPerformed(p0: AnActionEvent) {
         try {
-            service<ReloadService>().reloadAllProjects()
+            service<ReloadService>().reloadAllProjects(ReloadSource.RELOAD_ACTION)
         } catch (e: Throwable) {
             ErrorReporter.getInstance().reportError("ReloadAction.actionPerformed", e)
         }

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

@@ -157,7 +157,7 @@ class ReloadObserver(cs: CoroutineScope) {
                     )
                     componentDetails.graphicsDeviceList = currentGraphicsDeviceList
 
-                    service<ReloadService>().reload(project)
+                    service<ReloadService>().reload(project, ReloadSource.RELOAD_OBSERVER)
                 } else {
                     Log.log(
                         logger::trace,
@@ -179,7 +179,7 @@ class ReloadObserver(cs: CoroutineScope) {
                 )
                 componentDetails.displayMode = currentDisplayMode
 
-                service<ReloadService>().reload(project)
+                service<ReloadService>().reload(project, ReloadSource.RELOAD_OBSERVER)
             } else {
                 Log.log(logger::trace, "no graphics changes for component {} in project {}", componentName, project.name)
             }

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

@@ -9,11 +9,13 @@ import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.util.Disposer
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
+import org.apache.commons.codec.digest.DigestUtils
 import org.digma.intellij.plugin.common.DisposableAdaptor
 import org.digma.intellij.plugin.common.EDT
 import org.digma.intellij.plugin.common.isProjectValid
 import org.digma.intellij.plugin.errorreporting.ErrorReporter
 import org.digma.intellij.plugin.log.Log
+import org.digma.intellij.plugin.posthog.ActivityMonitor
 import org.digma.intellij.plugin.recentactivity.RecentActivityToolWindowShower
 import org.digma.intellij.plugin.ui.MainToolWindowCardsController
 import org.digma.intellij.plugin.ui.ToolWindowShower
@@ -45,11 +47,11 @@ class ReloadService : DisposableAdaptor {
     }
 
 
-    fun reloadAllProjects() {
+    fun reloadAllProjects(source: ReloadSource) {
         ProjectManager.getInstance().openProjects.forEach {
             try {
                 if (isProjectValid(it)) {
-                    reload(it)
+                    reload(it, source)
                 }
             } catch (e: Throwable) {
                 Log.warnWithException(logger, it, e, "error in reload for project {}", it)
@@ -58,7 +60,7 @@ class ReloadService : DisposableAdaptor {
         }
     }
 
-    fun reload(project: Project) {
+    fun reload(project: Project, source: ReloadSource) {
 
         Log.log(logger::trace, "Reload for project {} called", project.name)
 
@@ -83,17 +85,24 @@ class ReloadService : DisposableAdaptor {
             //run the whole project reload on EDT, it may cause a short freeze, but we are aware of that.
             //it is necessary for finding the selected editor
             EDT.ensureEDT {
-                reloadImpl(project)
+                reloadImpl(project, source)
             }
         }
     }
 
-    private fun reloadImpl(project: Project) {
+    private fun reloadImpl(project: Project, source: ReloadSource) {
 
         if (!isProjectValid(project)) {
             return
         }
 
+        ActivityMonitor.getInstance(project).registerCustomEvent(
+            "ReloadJcef", mapOf(
+                "source" to source.toString(),
+                "project.hash" to DigestUtils.md2Hex(project.name)
+            )
+        )
+
         Log.log(logger::trace, "Reloading jcef for project {}", project.name)
 
         EDT.ensureEDT {

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

@@ -0,0 +1,5 @@
+package org.digma.intellij.plugin.reload
+
+enum class ReloadSource {
+    RELOAD_ACTION,RELOAD_OBSERVER
+}

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()
     }
 
 }