Merge pull request #5020 from microsoft/telemetry/background

Fix service name and operation name in background tasks

Author: Flanker32

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

@@ -116,17 +116,17 @@ protected void actionPerformed(NodeActionEvent e) {
                 runnable.run();
             }
         };
+        // TODO (Qianjin) : remove after migrate all telemetry data by @AzureOperation annotation.
+        final String actionName2 = Optional.ofNullable(action).map(AzureActionEnum::getName).orElse(null);
+        String realActionName = StringUtils.firstNonBlank(actionName, actionName2, "unknown").toLowerCase();
+        delegate = new DelegateActionListener.TelemetricActionListener(delegate, MODULE_NAME_TO_SERVICE_NAME_MAP.get(moduleName), realActionName);
         if (backgroundable) {
             delegate = new DelegateActionListener.BackgroundActionListener(delegate,
                     getProgressMessage(doingName), backgroundCancellable, backgroundConditionalModal);
         }
         if (promptable) {
             delegate = new DelegateActionListener.PromptActionListener(delegate, getPromptMessage(actionName));
         }
-        // TODO (Qianjin) : remove after migrate all telemetry data by @AzureOperation annotation.
-        final String actionName2 = Optional.ofNullable(action).map(AzureActionEnum::getName).orElse(null);
-        String realActionName = StringUtils.firstNonBlank(actionName, actionName2, "unknown").toLowerCase();
-        delegate = new DelegateActionListener.TelemetricActionListener(delegate, MODULE_NAME_TO_SERVICE_NAME_MAP.get(moduleName), realActionName);
         return delegate;
     }
 

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

@@ -6,6 +6,7 @@
 package com.microsoft.tooling.msservices.serviceexplorer;
 
 import com.google.common.base.Preconditions;
+import com.microsoft.azure.toolkit.lib.common.operation.IAzureOperationTitle;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azuretools.ActionConstants;
@@ -76,7 +77,12 @@ public void actionPerformed(NodeActionEvent e) {
                 }
             };
             final Object project = e.getAction().getNode().getProject();
-            AzureTask task = new AzureTask(project, progressMessage, cancellable, runnable);
+            AzureTask task = new AzureTask(project, new IAzureOperationTitle.Simple(progressMessage) {
+                @Override
+                public String getName() {
+                    return String.format("%s.%s", BackgroundActionListener.super.getServiceName(e), BackgroundActionListener.super.getOperationName(e));
+                }
+            }, cancellable, runnable);
             if (conditionalModal) {
                 AzureTaskManager.getInstance().runInModal(task);
             } else {
@@ -88,7 +94,7 @@ public void actionPerformed(NodeActionEvent e) {
 
     static final class PromptActionListener extends DelegateActionListener {
         private static final String PROMPT_TITLE = "Azure Explorer";
-        private static final String[] PROMPT_OPTIONS = new String[] {"Yes", "No"};
+        private static final String[] PROMPT_OPTIONS = new String[]{"Yes", "No"};
 
         private String promptMessage;