Merge pull request #5013 from microsoft/mysql/telemetry

Fix telemetries for Azure MySQL support

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/mysql/action/MySQLConnectToServerAction.java

@@ -9,6 +9,7 @@
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.project.Project;
 import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
+import com.microsoft.azuretools.ActionConstants;
 import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.intellij.actions.AzureSignInAction;
 import com.microsoft.intellij.AzurePlugin;
@@ -61,6 +62,16 @@ public void actionPerformed(NodeActionEvent e) {
         });
     }
 
+    @Override
+    protected String getServiceName(NodeActionEvent event) {
+        return ActionConstants.parse(ActionConstants.MySQL.CONNECT_TO_SERVER).getServiceName();
+    }
+
+    @Override
+    protected String getOperationName(NodeActionEvent event) {
+        return ActionConstants.parse(ActionConstants.MySQL.CONNECT_TO_SERVER).getOperationName();
+    }
+
     private void doActionPerformed(NodeActionEvent e, boolean isLoggedIn, Project project) {
         try {
             if (!isLoggedIn ||

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/mysql/AzureMySQLService.java

@@ -14,8 +14,11 @@
 import com.microsoft.azuretools.ActionConstants;
 import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.azuretools.core.mvp.model.mysql.MySQLMvpModel;
-import com.microsoft.azuretools.telemetrywrapper.Operation;
-import com.microsoft.azuretools.telemetrywrapper.TelemetryManager;
+import com.microsoft.azuretools.telemetry.TelemetryConstants;
+import com.microsoft.azuretools.telemetrywrapper.*;
+
+import java.util.Collections;
+import java.util.Map;
 
 public class AzureMySQLService {
     private static final AzureMySQLService instance = new AzureMySQLService();
@@ -36,10 +39,11 @@ public Server createMySQL(final AzureMySQLConfig config) {
         final Operation operation = TelemetryManager.createOperation(ActionConstants.MySQL.CREATE);
         try {
             operation.start();
-            String subscrptionId = config.getSubscription().subscriptionId();
+            final String subscriptionId = config.getSubscription().subscriptionId();
+            EventUtil.logEvent(EventType.info, operation, Collections.singletonMap(TelemetryConstants.SUBSCRIPTIONID, subscriptionId));
             // create resource group if necessary.
             if (config.getResourceGroup() instanceof Draft) {
-                Azure azure = AuthMethodManager.getInstance().getAzureClient(subscrptionId);
+                Azure azure = AuthMethodManager.getInstance().getAzureClient(subscriptionId);
                 ResourceGroup newResourceGroup = azure.resourceGroups().define(config.getResourceGroup().name()).withRegion(config.getRegion()).create();
                 config.setResourceGroup(newResourceGroup);
             }
@@ -48,13 +52,14 @@ public Server createMySQL(final AzureMySQLConfig config) {
             parameters.withAdministratorLogin(config.getAdminUsername())
                     .withAdministratorLoginPassword(String.valueOf(config.getPassword()))
                     .withVersion(config.getVersion());
-            Server server = MySQLMvpModel.create(subscrptionId, config.getResourceGroup().name(), config.getServerName(), config.getRegion(), parameters);
+            Server server = MySQLMvpModel.create(subscriptionId, config.getResourceGroup().name(), config.getServerName(), config.getRegion(), parameters);
             // update access from azure services
-            MySQLMvpModel.FirewallRuleMvpModel.updateAllowAccessFromAzureServices(subscrptionId, server, config.isAllowAccessFromAzureServices());
+            MySQLMvpModel.FirewallRuleMvpModel.updateAllowAccessFromAzureServices(subscriptionId, server, config.isAllowAccessFromAzureServices());
             // update access from local machine
-            MySQLMvpModel.FirewallRuleMvpModel.updateAllowAccessToLocalMachine(subscrptionId, server, config.isAllowAccessFromLocalMachine());
+            MySQLMvpModel.FirewallRuleMvpModel.updateAllowAccessToLocalMachine(subscriptionId, server, config.isAllowAccessFromLocalMachine());
             return server;
         } catch (final RuntimeException e) {
+            EventUtil.logError(operation, ErrorType.systemError, e, null, null);
             throw e;
         } finally {
             operation.complete();

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/mysql/MySQLNode.java

@@ -11,6 +11,8 @@
 import com.microsoft.azuretools.ActionConstants;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
 import com.microsoft.azuretools.core.mvp.model.mysql.MySQLMvpModel;
+import com.microsoft.azuretools.telemetry.TelemetryConstants;
+import com.microsoft.azuretools.telemetry.TelemetryProperties;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 import com.microsoft.tooling.msservices.serviceexplorer.AzureActionEnum;
 import com.microsoft.tooling.msservices.serviceexplorer.AzureIconSymbol;
@@ -22,9 +24,11 @@
 import com.microsoft.tooling.msservices.serviceexplorer.Sortable;
 import lombok.Getter;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
-public class MySQLNode extends Node {
+public class MySQLNode extends Node implements TelemetryProperties {
 
     private static final ServerState SERVER_UPDATING = ServerState.fromString("Updating");
 
@@ -123,4 +127,8 @@ private void showProperties() {
         DefaultLoader.getUIHelper().openMySQLPropertyView(MySQLNode.this);
     }
 
+    @Override
+    public Map<String, String> toProperties() {
+        return Collections.singletonMap(TelemetryConstants.SUBSCRIPTIONID, this.subscriptionId);
+    }
 }