Merge pull request #2373 from digma-ai/reset-plugin

shalom938 · web-flow · commit 39b11e330cbb · 2024-08-07T10:56:56.000+03:00
reset user id Closes #2372
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -315,6 +315,12 @@ tasks {
             //"org.digma.otel.digmaAgentUrl" to "some url
 
         )
+
+        //to simulate external user
+//        environment(
+//            "devenv" to "notdigma"
+//        )
+
     }
 
 
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/settings/ProjectSettings.java b/ide-common/src/main/java/org/digma/intellij/plugin/settings/ProjectSettings.java
@@ -3,6 +3,7 @@
 import com.intellij.openapi.options.*;
 import com.intellij.openapi.util.NlsContexts;
 import org.digma.intellij.plugin.common.*;
+import org.digma.intellij.plugin.reset.ResetService;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -38,7 +39,8 @@ public JComponent getPreferredFocusedComponent() {
     @Override
     public boolean isModified() {
         SettingsState settings = SettingsState.getInstance();
-        return isApiUrlChanged(settings) ||
+        return mySettingsComponent.isResetPluginRequested() ||
+                isApiUrlChanged(settings) ||
                 isApiTokenChanged(settings) ||
                 isJaegerUrlChanged(settings) ||
                 isJaegerQueryUrlChanged(settings) ||
@@ -148,6 +150,10 @@ public void apply() throws ConfigurationException {
 
 
         updateSettingsAndFireChange();
+
+        if (mySettingsComponent.isResetPluginRequested()) {
+            ResetService.getInstance().resetUserId();
+        }
     }
 
 
@@ -175,6 +181,8 @@ private void updateSettingsAndFireChange() {
     @Override
     public void reset() {
         SettingsState settings = SettingsState.getInstance();
+        mySettingsComponent.resetResetPluginRequested();
+        mySettingsComponent.hidePluginResetWarning();
         mySettingsComponent.setApiUrl(settings.getApiUrl());
         mySettingsComponent.setApiToken(settings.getApiToken());
         mySettingsComponent.setJaegerUrl(settings.getJaegerUrl());
@@ -191,4 +199,11 @@ public void reset() {
     public void disposeUIResources() {
         mySettingsComponent = null;
     }
+
+    @Override
+    public void cancel() {
+        if (mySettingsComponent != null) {
+            mySettingsComponent.resetResetPluginRequested();
+        }
+    }
 }
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/settings/SettingsComponent.java b/ide-common/src/main/java/org/digma/intellij/plugin/settings/SettingsComponent.java
@@ -1,6 +1,7 @@
 package org.digma.intellij.plugin.settings;
 
-import com.intellij.openapi.ui.ComboBox;
+import com.intellij.icons.AllIcons;
+import com.intellij.openapi.ui.*;
 import com.intellij.ui.*;
 import com.intellij.ui.components.*;
 import com.intellij.ui.components.fields.ExpandableTextField;
@@ -27,6 +28,7 @@ class SettingsComponent {
     private static final List<String> ALLOW_HTTPS = Collections.singletonList("https");
     private static final List<String> ALLOW_HTTP_AND_HTTPS = Arrays.asList("http", "https");
 
+    private boolean resetPluginRequested = false;
 
     private final JPanel myMainPanel;
     private final JBTextField myApiUrlTextField = new JBTextField();
@@ -43,6 +45,8 @@ class SettingsComponent {
     private final ExpandableTextField extendedObservabilityTextFiled = new ExpandableTextField();
     private final ExpandableTextField extendedObservabilityExcludeTextField = new ExpandableTextField();
 
+    private final JBLabel pluginResetWarning = new JBLabel("Plugin will reset and IDE will restart when this dialog is confirmed. click cancel to cancel reset.");
+
     public SettingsComponent() {
 
         extendedObservabilityTextFiled.setToolTipText("package names in format 'my.pkg1;my.pkg2");
@@ -154,6 +158,7 @@ public boolean verify(JComponent input) {
         );
 
         var resetButton = new JButton("Reset to defaults");
+        resetButton.setToolTipText("<html><body>Reset the settings to initial defaults</body>");
         resetButton.addActionListener(e -> resetToDefaults());
 
 
@@ -174,6 +179,25 @@ public boolean verify(JComponent input) {
             }
         }
 
+
+        pluginResetWarning.setForeground(JBColor.RED);
+        pluginResetWarning.setVisible(false);
+        var resetPluginButton = new JButton("Reset plugin");
+        resetPluginButton.setToolTipText("<html><body>Reset plugin persistent properties to initial values to simulate fresh start</body>");
+        resetPluginButton.setVisible("true".equalsIgnoreCase(System.getProperty("org.digma.plugin.resetPlugin.enabled")));
+        resetPluginButton.addActionListener(e -> {
+            var confirmation = Messages.showYesNoDialog("Are you sure?\n(Plugin will reset and IDE will restart when the settings window is closed)", "Reset Confirmation", AllIcons.General.WarningDialog);
+            if (confirmation == 0) {
+                resetPluginRequested = true;
+                pluginResetWarning.setVisible(true);
+            } else {
+                resetPluginRequested = false;
+                pluginResetWarning.setVisible(false);
+            }
+        });
+
+
+
         myMainPanel = FormBuilder.createFormBuilder()
                 .addLabeledComponent(myUrlLabel, myApiUrlTextField, 1, false)
                 .addLabeledComponent(new JBLabel("Api token:"), myApiTokenTestField, 1, false)
@@ -188,6 +212,8 @@ public boolean verify(JComponent input) {
                 .addComponent(resetButton)
                 .addLabeledComponent(new JBLabel("User id"), userIdLabel)
                 .addLabeledComponent(new JBLabel("Backend version"), backendVersionLabel)
+                .addComponent(resetPluginButton)
+                .addComponent(pluginResetWarning)
                 .addComponentFillVertically(new JPanel(), 0)
                 .getPanel();
     }
@@ -313,9 +339,21 @@ public void setExtendedObservabilityExclude(@Nullable String extendedObservabili
     }
 
 
+    public boolean isResetPluginRequested() {
+        return resetPluginRequested;
+    }
+
+    public void resetResetPluginRequested() {
+        resetPluginRequested = false;
+    }
+
+
+
     private void resetToDefaults() {
         //create a new SettingsState object and use it for default startup values
         SettingsState settingsState = new SettingsState();
+        resetResetPluginRequested();
+        hidePluginResetWarning();
         this.setApiUrl(settingsState.getApiUrl());
         this.setApiToken(settingsState.getApiToken());
         this.setJaegerUrl(settingsState.getJaegerUrl());
@@ -328,4 +366,8 @@ private void resetToDefaults() {
 
         this.myEmbeddedJaegerMessage.setVisible(true);
     }
+
+    public void hidePluginResetWarning() {
+        this.pluginResetWarning.setVisible(false);
+    }
 }
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/persistence/PersistenceService.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/persistence/PersistenceService.kt
@@ -203,6 +203,10 @@ class PersistenceService {
         state.userEmail = userEmail
     }
 
+    fun nullifyUserEmail() {
+        state.userEmail = null
+    }
+
 
     fun getUserRegistrationEmail(): String? {
         return state.userRegistrationEmail
@@ -212,6 +216,10 @@ class PersistenceService {
         state.userRegistrationEmail = userRegistrationEmail
     }
 
+    fun nullifyUserRegistrationEmail() {
+        state.userRegistrationEmail = null
+    }
+
     fun getUserId(): String? {
         return state.userId
     }
@@ -220,6 +228,10 @@ class PersistenceService {
         state.userId = userId
     }
 
+    fun nullifyUserId() {
+        state.userId = null
+    }
+
     fun getLastInsightsEventTime(): String? {
         return state.lastInsightsEventTime
     }
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/ActivityMonitor.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/ActivityMonitor.kt
@@ -88,8 +88,6 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
     private var serverInfo: AboutResult? = null
     private val simpleEventInterceptor = SimpleEventInterceptor(project)
 
-    private val userId: String = UniqueGeneratedUserId.userId
-    private val isDevUser: Boolean = UniqueGeneratedUserId.isDevUser
     private var postHog: PostHog? = null
     private val settingsChangeTracker = SettingsChangeTracker()
 
@@ -173,7 +171,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
         mutableDetails["server.deploymentType"] = serverInfo?.deploymentType.toString()
 
         postHog?.capture(
-            userId,
+            UniqueGeneratedUserId.userId,
             eventName,
             mutableDetails
         )
@@ -183,7 +181,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
     fun registerFramework(framework: MonitoredFramework) {
         capture("framework detected", mapOf("framework.name" to framework.name))
         postHog?.set(
-            userId, mapOf(
+            UniqueGeneratedUserId.userId, mapOf(
                 "framework.last" to framework.name,
                 "framework.${framework.name}.last-seen" to Instant.now().toString()
             )
@@ -192,13 +190,13 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
 
     fun registerEmail(email: String, courseRequested: Boolean) {
         postHog?.identify(
-            userId, mapOf(
+            UniqueGeneratedUserId.userId, mapOf(
                 "email" to getEmailForEvent(),
                 INSTALL_STATUS_PROPERTY_NAME to getCurrentInstallStatus(),
                 "user_requested_course" to courseRequested.toString()
             )
         )
-        postHog?.alias(userId, email)
+        postHog?.alias(UniqueGeneratedUserId.userId, email)
     }
 
     fun registerCustomEvent(eventName: String, tags: Map<String, Any> = mapOf()) {
@@ -243,7 +241,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
             detailsToSend
         )
         postHog?.set(
-            userId, mapOf(
+            UniqueGeneratedUserId.userId, mapOf(
                 "last-user-action" to action,
                 "last-user-action-timestamp" to lastUserActionTimestamp.toString()
             )
@@ -320,7 +318,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
     fun registerFirstAssetsReceived() {
         capture("plugin first-assets")
         postHog?.set(
-            userId, mapOf(
+            UniqueGeneratedUserId.userId, mapOf(
                 "first-assets-timestamp" to Instant.now().toString()
             )
         )
@@ -365,7 +363,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
                 "ide.build" to ideBuildNumber,
                 "plugin.version" to pluginVersion,
                 "server.version" to serverInfo?.applicationVersion.toString(),
-                "user.type" to if (isDevUser) "internal" else "external"
+                "user.type" to if (UniqueGeneratedUserId.isDevUser) "internal" else "external"
             )
 
 
@@ -470,7 +468,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
                     "ide.build" to ideBuildNumber,
                     "plugin.version" to pluginVersion,
                     "server.version" to serverInfo?.applicationVersion.toString(),
-                    "user.type" to if (isDevUser) "internal" else "external",
+                    "user.type" to if (UniqueGeneratedUserId.isDevUser) "internal" else "external",
                     "frequency" to frequency.frequencySinceStart,
                     "frequency.since.minutes" to frequency.formatDurationToMinutes()
                 )
@@ -649,15 +647,15 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
 
     //todo: remove at some point
     fun registerFirstTimePluginLoaded() {
-        postHog?.capture(userId, "plugin first-loaded")
+        postHog?.capture(UniqueGeneratedUserId.userId, "plugin first-loaded")
     }
 
     fun registerFirstTimePluginLoadedNew() {
-        postHog?.capture(userId, "plugin first-init")
+        postHog?.capture(UniqueGeneratedUserId.userId, "plugin first-init")
     }
 
     fun registerPluginLoaded() {
-        postHog?.capture(userId, "plugin loaded")
+        postHog?.capture(UniqueGeneratedUserId.userId, "plugin loaded")
     }
 
     fun registerPluginUninstalled(): String {
@@ -678,12 +676,12 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
             )
         }
         postHog?.set(
-            userId, mapOf(
+            UniqueGeneratedUserId.userId, mapOf(
                 INSTALL_STATUS_PROPERTY_NAME to getCurrentInstallStatus(),
                 INSTALL_STATUS_PROPERTY_NAME + "_timestamp" to SessionMetadataProperties.getInstance().getCreatedAsString(CURRENT_INSTALL_STATUS_KEY)
             )
         )
-        return userId
+        return UniqueGeneratedUserId.userId
     }
 
     fun registerPluginDisabled(): String {
@@ -704,12 +702,12 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
             )
         }
         postHog?.set(
-            userId, mapOf(
+            UniqueGeneratedUserId.userId, mapOf(
                 INSTALL_STATUS_PROPERTY_NAME to getCurrentInstallStatus(),
                 INSTALL_STATUS_PROPERTY_NAME + "_timestamp" to SessionMetadataProperties.getInstance().getCreatedAsString(CURRENT_INSTALL_STATUS_KEY)
             )
         )
-        return userId
+        return UniqueGeneratedUserId.userId
     }
 
 
@@ -718,7 +716,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
         if (this.serverInfo != serverInfo) {
             this.serverInfo = serverInfo
             postHog?.set(
-                userId,
+                UniqueGeneratedUserId.userId,
                 mapOf(
                     "server.version" to serverInfo.applicationVersion,
                     "server.deploymentType" to (serverInfo.deploymentType ?: BackendDeploymentType.Unknown),
@@ -768,7 +766,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
 
     fun registerContainerEngine(containerPlatform: String) {
         postHog?.set(
-            userId,
+            UniqueGeneratedUserId.userId,
             mapOf("user.container-engine" to containerPlatform)
         )
     }
@@ -841,14 +839,14 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
         val isJcefSupported = JBCefApp.isSupported()
 
         postHog?.set(
-            userId,
+            UniqueGeneratedUserId.userId,
             mapOf(
                 "os.type" to osType,
                 "ide.name" to ideName,
                 "ide.version" to ideVersion,
                 "ide.build" to ideBuildNumber,
                 "plugin.version" to pluginVersion,
-                "user.type" to if (isDevUser) "internal" else "external",
+                "user.type" to if (UniqueGeneratedUserId.isDevUser) "internal" else "external",
                 "jcef.supported" to isJcefSupported,
                 INSTALL_STATUS_PROPERTY_NAME to getCurrentInstallStatus()
             )
@@ -887,7 +885,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
         )
 
         postHog?.identify(
-            userId,
+            UniqueGeneratedUserId.userId,
             mapOf(
                 LOAD_WARNING_APPEARED_PROPERTY_NAME + "_timestamp" to PersistenceService.getInstance().getLoadWarningAppearedTimestamp(),
                 "user_requested_course" to "false"
@@ -919,7 +917,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
         registerUserAction(eventName, eventDetails)
 
         postHog?.identify(
-            userId,
+            UniqueGeneratedUserId.userId,
             mapOf(
                 ENVIRONMENT_ADDED_PROPERTY_NAME + "_timestamp" to PersistenceService.getInstance().getEnvironmentAddedTimestamp(),
                 "user_requested_course" to "false"
@@ -951,7 +949,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
         )
 
         postHog?.identify(
-            userId,
+            UniqueGeneratedUserId.userId,
             mapOf(
                 JIRA_FIELD_COPIED_PROPERTY_NAME + "_timestamp" to PersistenceService.getInstance().getJiraFieldCopiedTimestamp(),
                 "user_requested_course" to "false"
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/reset/ResetService.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/reset/ResetService.kt

Original file line number	Diff line number	Diff line change
`@@ -315,6 +315,12 @@ tasks {`
`315`	`315`	`//"org.digma.otel.digmaAgentUrl" to "some url`
`316`	`316`
`317`	`317`	`)`
	`318`	`+`
	`319`	`+ //to simulate external user`
	`320`	`+// environment(`
	`321`	`+// "devenv" to "notdigma"`
	`322`	`+// )`
	`323`	`+`
`318`	`324`	`}`
`319`	`325`
`320`	`326`
Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,10 @@ class PersistenceService {`
`203`	`203`	`state.userEmail = userEmail`
`204`	`204`	`}`
`205`	`205`
	`206`	`+ fun nullifyUserEmail() {`
	`207`	`+ state.userEmail = null`
	`208`	`+ }`
	`209`	`+`
`206`	`210`
`207`	`211`	`fun getUserRegistrationEmail(): String? {`
`208`	`212`	`return state.userRegistrationEmail`
`@@ -212,6 +216,10 @@ class PersistenceService {`
`212`	`216`	`state.userRegistrationEmail = userRegistrationEmail`
`213`	`217`	`}`
`214`	`218`
	`219`	`+ fun nullifyUserRegistrationEmail() {`
	`220`	`+ state.userRegistrationEmail = null`
	`221`	`+ }`
	`222`	`+`
`215`	`223`	`fun getUserId(): String? {`
`216`	`224`	`return state.userId`
`217`	`225`	`}`
`@@ -220,6 +228,10 @@ class PersistenceService {`
`220`	`228`	`state.userId = userId`
`221`	`229`	`}`
`222`	`230`
	`231`	`+ fun nullifyUserId() {`
	`232`	`+ state.userId = null`
	`233`	`+ }`
	`234`	`+`
`223`	`235`	`fun getLastInsightsEventTime(): String? {`
`224`	`236`	`return state.lastInsightsEventTime`
`225`	`237`	`}`