Fix service and operation name for file explorer

Author: Flanker32

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/appservice/file/AppServiceFileNode.java

@@ -17,6 +17,7 @@
 import com.microsoft.azuretools.telemetry.AppInsightsConstants;
 import com.microsoft.azuretools.telemetry.TelemetryConstants;
 import com.microsoft.azuretools.telemetry.TelemetryProperties;
+import com.microsoft.azuretools.telemetrywrapper.EventUtil;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 import com.microsoft.tooling.msservices.serviceexplorer.AzureRefreshableNode;
 import com.microsoft.tooling.msservices.serviceexplorer.Node;
@@ -64,17 +65,19 @@ private void download() {
     @Override
     @AzureOperation(name = "appservice|file.refresh", params = {"this.file.getName()"}, type = AzureOperation.Type.ACTION)
     protected void refreshItems() {
-        if (this.file.getType() != AppServiceFile.Type.DIRECTORY) {
-            return;
-        }
-        this.fileService.getFilesInDirectory(this.file.getPath()).stream()
-                        .map(file -> new AppServiceFileNode(file, this, fileService))
-                        .forEach(this::addChildNode);
+        executeWithTelemetryWrapper(TelemetryConstants.REFRESH_FILE, () -> {
+            if (this.file.getType() != AppServiceFile.Type.DIRECTORY) {
+                return;
+            }
+            this.fileService.getFilesInDirectory(this.file.getPath()).stream()
+                    .map(file -> new AppServiceFileNode(file, this, fileService))
+                    .forEach(this::addChildNode);
+        });
     }
 
     @AzureOperation(name = "appservice|file.open", params = {"this.file.getName()"}, type = AzureOperation.Type.ACTION)
     private void open(final Object context) {
-        DefaultLoader.getIdeHelper().openAppServiceFile(this.file, context);
+        executeWithTelemetryWrapper(TelemetryConstants.OPEN_FILE, () -> DefaultLoader.getIdeHelper().openAppServiceFile(this.file, context));
     }
 
     @Override
@@ -116,4 +119,13 @@ public String getServiceName() {
     public Map<String, String> toProperties() {
         return Collections.singletonMap(AppInsightsConstants.SubscriptionId, Utils.getSubscriptionId(file.getApp().id()));
     }
+
+    // todo: replace with AzureOperation when custom properties is supported for AzureOperation
+    private void executeWithTelemetryWrapper(final String operationName, Runnable runnable) {
+        EventUtil.executeWithLog(getServiceName(), operationName, operation -> {
+            operation.trackProperty(TelemetryConstants.SUBSCRIPTIONID, Utils.getSubscriptionId(file.getApp().id()));
+            runnable.run();
+        });
+    }
+
 }

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/appservice/file/AppServiceUserFilesRootNode.java

@@ -15,6 +15,7 @@
 import com.microsoft.azuretools.telemetry.AppInsightsConstants;
 import com.microsoft.azuretools.telemetry.TelemetryConstants;
 import com.microsoft.azuretools.telemetry.TelemetryProperties;
+import com.microsoft.azuretools.telemetrywrapper.EventUtil;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 import com.microsoft.tooling.msservices.serviceexplorer.AzureRefreshableNode;
 import com.microsoft.tooling.msservices.serviceexplorer.Node;
@@ -51,10 +52,13 @@ public void removeNode(final String sid, final String name, Node node) {
     @Override
     @AzureOperation(name = "appservice|file.list", params = {"this.app.name()"}, type = AzureOperation.Type.ACTION)
     protected void refreshItems() {
-        final AppServiceFileService service = this.getFileService();
-        service.getFilesInDirectory(getRootPath()).stream()
-               .map(file -> new AppServiceFileNode(file, this, service))
-               .forEach(this::addChildNode);
+        EventUtil.executeWithLog(getServiceName(), TelemetryConstants.LIST_FILE, operation -> {
+            operation.trackProperty(TelemetryConstants.SUBSCRIPTIONID, subscriptionId);
+            final AppServiceFileService service = this.getFileService();
+            service.getFilesInDirectory(getRootPath()).stream()
+                    .map(file -> new AppServiceFileNode(file, this, service))
+                    .forEach(this::addChildNode);
+        });
     }
 
     @NotNull

Utils/azuretools-core/src/com/microsoft/azuretools/telemetry/TelemetryConstants.java

@@ -185,6 +185,10 @@ public class TelemetryConstants {
     public static final String SHOW_WHATS_NEW = "show-whats-new";
     public static final String UNHANDLED_EXCEPTION = "unhandled-exception";
 
+    public static final String LIST_FILE = "list-file";
+    public static final String REFRESH_FILE = "refresh-file";
+    public static final String OPEN_FILE = "open-file";
+
     // property name
     public static final String WEBAPP_DEPLOY_TO_SLOT = "webappDeployToSlot";
     public static final String RUNTIME = "runtime";