Add missing properties for web app telemetry

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/WebAppRunState.java

@@ -37,10 +37,7 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 import static com.microsoft.intellij.ui.messages.AzureBundle.message;
 
@@ -131,7 +128,10 @@ protected void onSuccess(WebAppBase result, @NotNull RunProcessHandler processHa
 
     @Override
     protected Map<String, String> getTelemetryMap() {
-        return webAppSettingModel.getTelemetryProperties(Collections.EMPTY_MAP);
+        final Map<String, String> properties = new HashMap<>();
+        properties.put("artifactType", webAppConfiguration.getAzureArtifactType() == null ? null : webAppConfiguration.getAzureArtifactType().name());
+        properties.putAll(webAppSettingModel.getTelemetryProperties(Collections.EMPTY_MAP));
+        return properties;
     }
 
     @NotNull

Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/webapp/WebAppSettingModel.java

@@ -76,13 +76,14 @@ public Map<String, String> getTelemetryProperties(Map<String, String> properties
                 result.putAll(properties);
             }
             result.put(TelemetryConstants.RUNTIME, os == OperatingSystem.LINUX ?
-                    "linux-" + getLinuxRuntime().toString() : "windows-" + getWebContainer());
+                    "linux-" + getLinuxRuntime().toString() : "windows-" + getWebContainer() + jdkVersion == null ? "" : "-" + jdkVersion.toString());
             result.put(TelemetryConstants.WEBAPP_DEPLOY_TO_SLOT, String.valueOf(isDeployToSlot()));
             result.put(TelemetryConstants.SUBSCRIPTIONID, getSubscriptionId());
             result.put(TelemetryConstants.CREATE_NEWWEBAPP, String.valueOf(isCreatingNew()));
             result.put(TelemetryConstants.CREATE_NEWASP, String.valueOf(isCreatingAppServicePlan()));
             result.put(TelemetryConstants.CREATE_NEWRG, String.valueOf(isCreatingResGrp()));
             result.put(TelemetryConstants.FILETYPE, WebAppUtils.getFileType(getTargetName()));
+            result.put(TelemetryConstants.PRICING_TIER, pricing);
         } catch (final Exception ignore) {
         }
         return result;

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

@@ -197,6 +197,7 @@ public class TelemetryConstants {
     public static final String JAVA_APPNAME = "javaAppName";
     public static final String SIGNIN_METHOD = "signinMethod";
     public static final String AZURE_ENVIRONMENT = "azureEnvironment";
+    public static final String PRICING_TIER = "pricingTier";
 
     public static final Map<String, String> signInSPProp = new HashMap<>();
     public static final Map<String, String> signInDCProp = new HashMap<>();