bugfix/link on span modifies the active env (#387)

Author: arik-dig

model/src/main/kotlin/org/digma/intellij/plugin/model/rest/recentactivity/RecentActivityResult.kt

@@ -5,6 +5,12 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import org.digma.intellij.plugin.model.rest.insights.Duration
 import java.beans.ConstructorProperties
 
+/**
+ * Contracts Definition.
+ *
+ * @see [Contracts Definition](https://docs.google.com/document/d/10W8dJHXXxVXe2kI52NQjlu9LNsT4lp94AUogQ64IZ58)
+ */
+
 data class RecentActivityResult
 @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -64,7 +70,8 @@ data class RecentActivityEntrySpanPayload
 @JsonIgnoreProperties(ignoreUnknown = true)
 @ConstructorProperties("span")
 constructor(
-        val span: EntrySpan
+        val span: EntrySpan,
+        val environment: String,
 )
 
 data class RecentActivityEntrySpanForTracePayload

src/main/java/org/digma/intellij/plugin/toolwindow/DigmaBottomToolWindowFactory.java

@@ -27,18 +27,32 @@
 import org.digma.intellij.plugin.common.Backgroundable;
 import org.digma.intellij.plugin.common.CommonUtils;
 import org.digma.intellij.plugin.log.Log;
-import org.digma.intellij.plugin.model.rest.recentactivity.*;
+import org.digma.intellij.plugin.model.rest.recentactivity.RecentActivityEntrySpanForTracePayload;
+import org.digma.intellij.plugin.model.rest.recentactivity.RecentActivityEntrySpanPayload;
+import org.digma.intellij.plugin.model.rest.recentactivity.RecentActivityGoToSpanRequest;
+import org.digma.intellij.plugin.model.rest.recentactivity.RecentActivityGoToTraceRequest;
+import org.digma.intellij.plugin.model.rest.recentactivity.RecentActivityResponseEntry;
+import org.digma.intellij.plugin.model.rest.recentactivity.RecentActivityResult;
 import org.digma.intellij.plugin.psi.LanguageService;
 import org.digma.intellij.plugin.service.EditorService;
+import org.digma.intellij.plugin.ui.model.environment.EnvironmentsSupplier;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
 import java.util.List;
-import java.util.*;
+import java.util.Map;
 
-import static org.digma.intellij.plugin.toolwindow.ToolWindowUtil.*;
+import static org.digma.intellij.plugin.toolwindow.ToolWindowUtil.RECENT_ACTIVITY_GET_DATA;
+import static org.digma.intellij.plugin.toolwindow.ToolWindowUtil.RECENT_ACTIVITY_GO_TO_SPAN;
+import static org.digma.intellij.plugin.toolwindow.ToolWindowUtil.RECENT_ACTIVITY_GO_TO_TRACE;
+import static org.digma.intellij.plugin.toolwindow.ToolWindowUtil.RECENT_ACTIVITY_SET_DATA;
+import static org.digma.intellij.plugin.toolwindow.ToolWindowUtil.REQUEST_MESSAGE_TYPE;
 import static org.digma.intellij.plugin.ui.common.EnvironmentUtilKt.LOCAL_ENV;
+import static org.digma.intellij.plugin.ui.common.EnvironmentUtilKt.SUFFIX_OF_LOCAL;
 import static org.digma.intellij.plugin.ui.common.EnvironmentUtilKt.getSortedEnvironments;
 import static org.digma.intellij.plugin.ui.list.insights.JaegerUtilKt.openJaegerFromRecentActivity;
 
@@ -157,6 +171,11 @@ private boolean processRecentActivityGoToSpanRequest(RecentActivityEntrySpanPayl
                 LanguageService languageService = LanguageService.findLanguageServiceByMethodCodeObjectId(project, methodCodeObjectId);
                 Map<String, Pair<String, Integer>> workspaceUrisForMethodCodeObjectIds = languageService.findWorkspaceUrisForMethodCodeObjectIds(Collections.singletonList(methodCodeObjectId));
                 if (workspaceUrisForMethodCodeObjectIds.containsKey(methodCodeObjectId)) {
+                    // modifying the selected environment
+                    EnvironmentsSupplier environmentsSupplier = analyticsService.getEnvironment();
+                    String actualEnvName = adjustBackEnvNameIfNeeded(payload.getEnvironment());
+                    environmentsSupplier.setCurrent(actualEnvName);
+
                     Pair<String, Integer> result = workspaceUrisForMethodCodeObjectIds.get(methodCodeObjectId);
                     editorService.openWorkspaceFileInEditor(result.getFirst(), result.getSecond());
                     ToolWindow digmaLeftToolWindow = ToolWindowManager.getInstance(project).getToolWindow(DIGMA_LEFT_TOOL_WINDOW_NAME);
@@ -225,7 +244,14 @@ private List<RecentActivityResponseEntry> getEntriesWithAdjustedLocalEnvs(Recent
     }
 
     private String getAdjustedEnvName(String environment) {
-        return environment.toUpperCase().endsWith("["+ LOCAL_ENV + "]") ? LOCAL_ENV: environment;
+        return environment.toUpperCase().endsWith(SUFFIX_OF_LOCAL) ? LOCAL_ENV: environment;
+    }
+
+    private String adjustBackEnvNameIfNeeded(String environment) {
+        if (environment.equalsIgnoreCase(LOCAL_ENV)) {
+            return (localHostname + SUFFIX_OF_LOCAL).toUpperCase();
+        }
+        return environment;
     }
 
     private <T> T parseJsonToObject(String jsonString, Class<T> jcefMessageRequestClass) {

src/main/kotlin/org/digma/intellij/plugin/ui/common/EnvironmentUtil.kt

@@ -1,6 +1,7 @@
 package org.digma.intellij.plugin.ui.common
 
 const val LOCAL_ENV = "LOCAL"
+const val SUFFIX_OF_LOCAL = "[LOCAL]"
 
 fun getSortedEnvironments(
         envsList: List<String>,
@@ -31,7 +32,7 @@ fun getSortedEnvironments(
     return builtEnvs
 }
 fun isEnvironmentLocal(environment: String): Boolean {
-    return environment.endsWith("[$LOCAL_ENV]", true)
+    return environment.endsWith(SUFFIX_OF_LOCAL, true)
 }
 
 fun isLocalEnvironmentMine(environment: String, localHostname: String): Boolean {