Couple more sub ids context (#1128)

* Couple more sub ids context

* Update azure utils package

* Remove extra linebreak

* Bump utils

* Use setAzureResourceIdTelemetryProperties

Author: nturinski

package-lock.json

@@ -905,8 +905,8 @@
         "@azure/arm-resources-profile-2020-09-01-hybrid": "^2.1.0",
         "@azure/ms-rest-js": "^2.7.0",
         "@microsoft/vscode-azext-azureauth": "^4.0.3",
-        "@microsoft/vscode-azext-azureutils": "^3.2.0",
-        "@microsoft/vscode-azext-utils": "^3.0.0",
+        "@microsoft/vscode-azext-azureutils": "^3.2.2",
+        "@microsoft/vscode-azext-utils": "^3.0.3",
         "buffer": "^6.0.3",
         "form-data": "^4.0.1",
         "jsonc-parser": "^2.2.1",

package.json

@@ -3,9 +3,8 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import { AzExtTreeItem, ContextValueFilter, ITreeItemPickerContext, PickTreeItemWithCompatibility } from "@microsoft/vscode-azext-utils";
+import { AzExtTreeItem, ContextValueFilter, ITreeItemPickerContext, PickTreeItemWithCompatibility, setAzureResourceIdTelemetryProperties } from "@microsoft/vscode-azext-utils";
 import { PickAppResourceOptions } from "@microsoft/vscode-azext-utils/hostapi";
-import { TelemetryTrustedValue } from "vscode";
 import { AzExtResourceType, getAzExtResourceType } from "../../../api/src/index";
 import { ext } from "../../extensionVariables";
 
@@ -18,8 +17,9 @@ export function createCompatibilityPickAppResource() {
             resourceTypes: convertAppResourceFilterToAzExtResourceType(options?.filter),
             childItemFilter: convertExpectedChildContextValueToContextValueFilter(options?.expectedChildContextValue)
         });
-
-        context.telemetry.properties.resourceId = result.id ? new TelemetryTrustedValue(result.id) : undefined;
+        if (result.id) {
+            setAzureResourceIdTelemetryProperties(context, result.id)
+        }
 
         try {
             // AzExtTreeItems throw when subscription is undefined. It's unlikely to happen here, but better safe than sorry.

src/api/compatibility/pickAppResource.ts

@@ -96,6 +96,10 @@ export class AzureResourceTreeDataProvider extends AzureResourceTreeDataProvider
                     if (tenantFiltedSubcriptions) {
                         return tenantFiltedSubcriptions.map(
                             subscription => {
+                                // for telemetry purposes, do not wait
+                                void callWithTelemetryAndErrorHandling('azureResourceGroups.getTenantFiltedSubcription', async (context: IActionContext) => {
+                                    context.telemetry.properties.subscriptionId = subscription.subscriptionId;
+                                });
                                 if (duplicates.includes(subscription)) {
                                     return new SubscriptionItem(
                                         {
@@ -121,6 +125,10 @@ export class AzureResourceTreeDataProvider extends AzureResourceTreeDataProvider
                     } else {
                         return subscriptions.map(
                             subscription => {
+                                // for telemetry purposes, do not wait
+                                void callWithTelemetryAndErrorHandling('azureResourceGroups.getSubscription', async (context: IActionContext) => {
+                                    context.telemetry.properties.subscriptionId = subscription.subscriptionId;
+                                });
                                 if (duplicates.includes(subscription)) {
                                     return new SubscriptionItem(
                                         {

src/tree/azure/AzureResourceTreeDataProvider.ts

@@ -44,6 +44,7 @@ export class SubscriptionItem implements ResourceGroupsItem {
     async getChildren(): Promise<ResourceGroupsItem[]> {
         return await callWithTelemetryAndErrorHandling('subscriptionItem.getChildren', async (context: IActionContext) => {
             const resources = await this.resourceProviderManager.getResources(this.subscription);
+            context.telemetry.properties.subscriptionId = this.subscription.subscriptionId;
             context.telemetry.measurements.resourceCount = resources.length;
 
             const groupBySetting = settingUtils.getWorkspaceSetting<string>('groupBy');