Merge pull request #11698 from yezhu6/yezhu/add-more-telemetry

Add more telemetry

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appmod/src/main/java/com/microsoft/azure/toolkit/intellij/appmod/common/AppModPluginInstaller.java

@@ -111,7 +111,7 @@ public static void showInstallConfirmation(@Nonnull Project project, boolean for
                     ? "To upgrade your apps, you'll need two plugins: GitHub Copilot and app modernization."
                     : "To migrate to Azure, you'll need two plugins: GitHub Copilot and app modernization.";
         }
-        
+        AppModUtils.logTelemetryEvent("plugin." + action + ".install-prompt-shown", Map.of("copilotInstalled", String.valueOf(copilotInstalled)));
         if (Messages.showOkCancelDialog(project, message, title, "Install", "Cancel", Messages.getQuestionIcon()) == Messages.OK) {
             log.info("[AppModPluginInstaller] User confirmed plugin installation for {}", action);
             AppModUtils.logTelemetryEvent("plugin." + action + ".install-confirmed");

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appmod/src/main/java/com/microsoft/azure/toolkit/intellij/appmod/javaupgrade/action/CveFixDependencyInProblemsViewAction.java

@@ -18,6 +18,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Map;
+
 import static com.microsoft.azure.toolkit.intellij.appmod.javaupgrade.utils.Constants.*;
 import static com.microsoft.azure.toolkit.intellij.appmod.javaupgrade.dao.VulnerabilityInfo.parseVulnerabilityDescription;
 
@@ -55,7 +57,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                                 vulnerabilityInfo.getDependencyCoordinate())
                 );
             }
-            AppModUtils.logTelemetryEvent("openCopilotChatForCveFixDependencyInProblemsViewAction");
+            AppModUtils.logTelemetryEvent("openCopilotChatForCveFixDependencyInProblemsViewAction", Map.of("appmodPluginInstalled", String.valueOf(AppModPluginInstaller.isAppModPluginInstalled())));
         } catch (Throwable ex) {
             log.error("Failed to open Copilot chat for CVE fix", ex.getMessage());
         }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appmod/src/main/java/com/microsoft/azure/toolkit/intellij/appmod/javaupgrade/action/CveFixInProblemsViewAction.java

@@ -19,6 +19,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Map;
+
 import static com.microsoft.azure.toolkit.intellij.appmod.javaupgrade.utils.Constants.*;
 
 /**
@@ -46,7 +48,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                     project,
                     SCAN_AND_RESOLVE_CVES_PROMPT
             );
-            AppModUtils.logTelemetryEvent("openCopilotChatForCveFixInProblemsViewAction");
+            AppModUtils.logTelemetryEvent("openCopilotChatForCveFixInProblemsViewAction", Map.of("appmodPluginInstalled", String.valueOf(AppModPluginInstaller.isAppModPluginInstalled())));
         } catch (Throwable ex) {
             log.error("Failed to open Copilot chat for CVE fix", ex.getMessage());
         }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appmod/src/main/java/com/microsoft/azure/toolkit/intellij/appmod/javaupgrade/action/CveFixIntentionAction.java

@@ -22,6 +22,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Map;
+
 import static com.microsoft.azure.toolkit.intellij.appmod.javaupgrade.utils.Constants.SCAN_AND_RESOLVE_CVES_PROMPT;
 import static com.microsoft.azure.toolkit.intellij.appmod.javaupgrade.utils.Constants.SCAN_AND_RESOLVE_CVES_WITH_COPILOT_DISPLAY_NAME;
 
@@ -106,7 +108,7 @@ public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws
             // Try to extract dependency information from the current context
             final String prompt = buildPromptFromContext();
             JavaVersionNotificationService.getInstance().openCopilotChatWithPrompt(project, prompt);
-            AppModUtils.logTelemetryEvent("openCveFixCopilotChatFromIntentionAction");
+            AppModUtils.logTelemetryEvent("openCveFixCopilotChatFromIntentionAction", Map.of("AppModPluginInstalled", String.valueOf(AppModPluginInstaller.isAppModPluginInstalled())));
         } catch (Throwable e) {
             log.error("Failed to invoke CveFixIntentionAction: ", e);
         }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appmod/src/main/java/com/microsoft/azure/toolkit/intellij/appmod/javaupgrade/action/JavaUpgradeContextMenuAction.java

@@ -17,6 +17,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Map;
+
 import static com.microsoft.azure.toolkit.intellij.appmod.common.AppModPluginInstaller.TO_INSTALL_APP_MODE_PLUGIN;
 import static com.microsoft.azure.toolkit.intellij.appmod.common.AppModPluginInstaller.isAppModPluginInstalled;
 import static com.microsoft.azure.toolkit.intellij.appmod.javaupgrade.utils.Constants.UPGRADE_JAVA_AND_FRAMEWORK_PROMPT;
@@ -58,7 +60,7 @@ public void update(@NotNull AnActionEvent e) {
                 e.getPresentation().setText(e.getPresentation().getText() + TO_INSTALL_APP_MODE_PLUGIN);
             }
             if (visible){
-                AppModUtils.logTelemetryEvent("showJavaUpgradeContextMenuAction");
+                AppModUtils.logTelemetryEvent("showJavaUpgradeContextMenuAction", Map.of("appmodPluginInstalled", String.valueOf(isAppModPluginInstalled())));
             }
             e.getPresentation().setEnabledAndVisible(visible);
         } catch (Throwable ex) {
@@ -80,7 +82,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
 
             // Open Copilot chat with the upgrade prompt
             JavaVersionNotificationService.getInstance().openCopilotChatWithPrompt(project, prompt);
-            AppModUtils.logTelemetryEvent("openJavaUpgradeCopilotChatFromContextMenu");
+            AppModUtils.logTelemetryEvent("openJavaUpgradeCopilotChatFromContextMenu", Map.of("appmodPluginInstalled", String.valueOf(isAppModPluginInstalled())));
         } catch (Throwable ex) {
             // Log error but do not crash
             log.error("Failed to perform Java upgrade action from context menu", ex);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appmod/src/main/java/com/microsoft/azure/toolkit/intellij/appmod/javaupgrade/action/JavaUpgradeQuickFix.java

@@ -15,6 +15,9 @@
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+
 import static com.microsoft.azure.toolkit.intellij.appmod.javaupgrade.utils.Constants.UPGRADE_JAVA_FRAMEWORK_PROMPT;
 
 /**
@@ -53,7 +56,7 @@ public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descri
         try {
             String prompt = buildPromptForIssue(issue);
             JavaVersionNotificationService.getInstance().openCopilotChatWithPrompt(project, prompt);
-            AppModUtils.logTelemetryEvent("openCopilotChatForJavaUpgradeQuickFix");
+            AppModUtils.logTelemetryEvent("openCopilotChatForJavaUpgradeQuickFix", Map.of("appmodPluginInstalled", String.valueOf(AppModPluginInstaller.isAppModPluginInstalled())));
         } catch (Throwable ex) {
             log.error("Failed to apply Java upgrade quick fix", ex);
         }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appmod/src/main/java/com/microsoft/azure/toolkit/intellij/appmod/javaupgrade/service/JavaVersionNotificationService.java

@@ -26,6 +26,7 @@
 import static com.microsoft.azure.toolkit.intellij.appmod.javaupgrade.service.JavaUpgradeIssuesDetectionService.*;
 import java.lang.reflect.Method;
 
+import com.microsoft.azure.toolkit.lib.common.telemetry.AzureTelemeter;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 import lombok.extern.slf4j.Slf4j;
@@ -402,6 +403,7 @@ private boolean tryReflectionCopilotCall(@Nonnull Project project, @Nonnull Stri
                     return Unit.INSTANCE;
                 };
                 queryMethod.invoke(service, DataContext.EMPTY_CONTEXT, queryBuilder);
+                AppModUtils.logTelemetryEvent("openCopilotChatForJavaUpgrade", Map.of("javaupgrade.prompt", prompt));
                 return true;
             }
         } catch (Exception e) {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/java/com/microsoft/azure/toolkit/intellij/common/utils/JdkUtils.java

@@ -108,7 +108,7 @@ public static Integer getJdkLanguageLevel(Sdk jdk) {
                 final String versionStr = matcher.group(0);
                 try {
                     return JavaVersion.parse(versionStr).feature;
-                } catch (IllegalArgumentException e) {
+                } catch (Exception e) {
                     // Invalid Java version format (e.g., Python version like "3.12.10")
                     return null;
                 }