Merge pull request #6651 from microsoft/hanli-fixes-202205

wangmingliang-ms · web-flow · commit 59d7a68e625a · 2022-05-30T09:58:21.000+08:00
Fix miscellaneous bugs in end game
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/build.gradle b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/build.gradle
@@ -1,9 +1,14 @@
+apply plugin: "io.freefair.aspectj.post-compile-weaving"
+
+
 intellij {
 }
 
 dependencies {
     compile project(':azure-intellij-plugin-lib')
     compile project(':azure-intellij-resource-connector-lib')
+    compile 'com.microsoft.azure:azure-toolkit-common-lib'
+    aspect 'com.microsoft.azure:azure-toolkit-common-lib'
     compile 'com.microsoft.azure:azure-toolkit-ide-common-lib'
     compile 'com.microsoft.azure:azure-toolkit-ide-applicationinsights-lib:' + azureToolkitVersion
 }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/java/com/microsoft/azure/toolkit/intellij/applicationinsights/IntelliJApplicationInsightsActionsContributor.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/java/com/microsoft/azure/toolkit/intellij/applicationinsights/IntelliJApplicationInsightsActionsContributor.java
@@ -5,6 +5,7 @@
 
 package com.microsoft.azure.toolkit.intellij.applicationinsights;
 
+import com.azure.resourcemanager.applicationinsights.models.ApplicationInsightsComponent;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.microsoft.azure.toolkit.ide.applicationinsights.ApplicationInsightsActionsContributor;
 import com.microsoft.azure.toolkit.ide.common.IActionsContributor;
@@ -17,28 +18,34 @@
 import com.microsoft.azure.toolkit.lib.applicationinsights.ApplicationInsight;
 import com.microsoft.azure.toolkit.lib.applicationinsights.ApplicationInsightDraft;
 import com.microsoft.azure.toolkit.lib.applicationinsights.AzureApplicationInsights;
+import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azure.toolkit.lib.common.action.AzureActionManager;
 import com.microsoft.azure.toolkit.lib.common.model.AzResource;
+import com.microsoft.azure.toolkit.lib.common.model.Region;
+import com.microsoft.azure.toolkit.lib.common.model.Subscription;
 import com.microsoft.azure.toolkit.lib.common.operation.OperationBundle;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
+import com.microsoft.azure.toolkit.lib.common.utils.Utils;
+import com.microsoft.azure.toolkit.lib.resource.AzureResources;
 import com.microsoft.azure.toolkit.lib.resource.ResourceGroup;
+import com.microsoft.azure.toolkit.lib.resource.ResourceGroupDraft;
 
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
 
 public class IntelliJApplicationInsightsActionsContributor implements IActionsContributor {
     @Override
     public void registerHandlers(AzureActionManager am) {
         final BiPredicate<Object, AnActionEvent> condition = (r, e) -> r instanceof AzureApplicationInsights;
-        final BiConsumer<Object, AnActionEvent> handler = (c, e) -> CreateApplicationInsightsAction.create(e.getProject(), null);
+        final BiConsumer<Object, AnActionEvent> handler = (c, e) ->
+                CreateApplicationInsightsAction.create(e.getProject(), getDraftApplicationInsight(null));
         am.registerHandler(ResourceCommonActionsContributor.CREATE, condition, handler);
 
-        final BiConsumer<ResourceGroup, AnActionEvent> groupCreateAccountHandler = (r, e) -> {
-            final ApplicationInsightDraft draft = Azure.az(AzureApplicationInsights.class)
-                    .applicationInsights(r.getSubscriptionId()).create(AzResource.NONE.getName(), r.getName());
-            draft.setRegion(r.getRegion());
-            CreateApplicationInsightsAction.create(e.getProject(), draft);
-        };
+        final BiConsumer<ResourceGroup, AnActionEvent> groupCreateAccountHandler = (r, e) ->
+                CreateApplicationInsightsAction.create(e.getProject(), getDraftApplicationInsight(r));
         am.registerHandler(ApplicationInsightsActionsContributor.GROUP_CREATE_APPLICATIONINSIGHT, (r, e) -> true, groupCreateAccountHandler);
 
         final BiPredicate<AzResource<?, ?, ?>, AnActionEvent> connectCondition = (r, e) -> r instanceof ApplicationInsight;
@@ -51,6 +58,21 @@ public void registerHandlers(AzureActionManager am) {
         am.registerHandler(ResourceCommonActionsContributor.CONNECT, connectCondition, connectHandler);
     }
 
+    private static ApplicationInsightDraft getDraftApplicationInsight(@Nullable final ResourceGroup resourceGroup) {
+        final List<Subscription> selectedSubscriptions = Azure.az(AzureAccount.class).account().getSelectedSubscriptions();
+        if (selectedSubscriptions.size() == 0) {
+            return null;
+        }
+        final String timestamp = Utils.getTimestamp();
+        final Subscription subscription = selectedSubscriptions.get(0);
+        final Region region = Optional.ofNullable(resourceGroup).map(ResourceGroup::getRegion).orElse(null);
+        final String resourceGroupName = resourceGroup == null ? String.format("rg-%s", timestamp) : resourceGroup.getResourceGroupName();
+        final ApplicationInsightDraft applicationInsightDraft = Azure.az(AzureApplicationInsights.class).applicationInsights(subscription.getId())
+                .create(String.format("ai-%s", timestamp), resourceGroupName);
+        applicationInsightDraft.setRegion(region);
+        return applicationInsightDraft;
+    }
+
     @Override
     public int getOrder() {
         return ApplicationInsightsActionsContributor.INITIALIZE_ORDER + 1;
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/java/com/microsoft/azure/toolkit/intellij/applicationinsights/connection/ApplicationInsightsResourceDefinition.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/java/com/microsoft/azure/toolkit/intellij/applicationinsights/connection/ApplicationInsightsResourceDefinition.java
@@ -19,6 +19,7 @@
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.applicationinsights.ApplicationInsight;
 import com.microsoft.azure.toolkit.lib.applicationinsights.AzureApplicationInsights;
+import com.microsoft.azure.toolkit.lib.common.cache.Preload;
 import com.microsoft.intellij.CommonConst;
 import lombok.Getter;
 import org.apache.commons.io.FileUtils;
@@ -74,6 +75,7 @@ static class ApplicationInsightsAgentHolder {
         private static final File applicationInsightsLibrary =
                 new File(PluginManagerCore.getPlugin(PluginId.findId(CommonConst.PLUGIN_ID)).getPluginPath().toString(), "applicationinsights-agent.jar");
 
+        @Preload
         public static synchronized File getApplicationInsightsLibrary() {
             if (!applicationInsightsLibrary.exists()) {
                 try {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/java/com/microsoft/azure/toolkit/intellij/applicationinsights/creation/ApplicationInsightsCreationDialog.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/java/com/microsoft/azure/toolkit/intellij/applicationinsights/creation/ApplicationInsightsCreationDialog.java
@@ -15,13 +15,12 @@
 import com.microsoft.azure.toolkit.lib.applicationinsights.AzureApplicationInsights;
 import com.microsoft.azure.toolkit.lib.common.form.AzureForm;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
-import com.microsoft.azure.toolkit.lib.common.model.AzResource;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
 import com.microsoft.azure.toolkit.lib.resource.ResourceGroup;
-import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.Nonnull;
 import javax.swing.*;
 import java.awt.event.ItemEvent;
 import java.util.Arrays;
@@ -83,18 +82,17 @@ public ApplicationInsightDraft getValue() {
     }
 
     @Override
-    public void setValue(ApplicationInsightDraft data) {
-        final String resourceName = StringUtils.equals(data.getName(), AzResource.NONE.getName()) ? StringUtils.EMPTY : data.getName();
-        this.txtName.setValue(resourceName);
+    public void setValue(@Nonnull ApplicationInsightDraft data) {
+        this.txtName.setValue(data.getName());
         this.subscriptionComboBox.setValue(data.getSubscription());
-        // todo: @hanli support draft resource group
-        this.resourceGroupComboBox.setValue(data.getResourceGroup());
-        this.regionComboBox.setValue(data.getRegion());
+        // todo: @hanli refactor ai library to support get draft resource group
+        Optional.ofNullable(data.getResourceGroup()).ifPresent(resourceGroupComboBox::setValue);
+        Optional.ofNullable(data.getRegion()).ifPresent(regionComboBox::setValue);
     }
 
     @Override
     public List<AzureFormInput<?>> getInputs() {
-        return Arrays.asList(subscriptionComboBox, resourceGroupComboBox, txtName, regionComboBox);
+        return Arrays.asList(txtName, subscriptionComboBox, resourceGroupComboBox, regionComboBox);
     }
 
     private void onSubscriptionChanged(final ItemEvent e) {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/resources/icons/Microsoft.Insights/components/default.svg b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/resources/icons/Microsoft.Insights/components/default.svg
@@ -1,31 +1,4 @@
-<svg id="b6f6d99e-f330-481d-836f-ea58cc42217f" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
-  <defs>
-    <radialGradient id="a7a1c431-6c6d-4a8f-9a69-8da437e5b0c5" cx="9" cy="7.35" r="6.42" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#b77af4" />
-      <stop offset="0.21" stop-color="#b378f2" />
-      <stop offset="0.43" stop-color="#a672ed" />
-      <stop offset="0.65" stop-color="#9267e4" />
-      <stop offset="0.88" stop-color="#7559d8" />
-      <stop offset="1" stop-color="#624fd0" />
-    </radialGradient>
-    <linearGradient id="ec0c4f0d-5c8e-4882-96a1-89d61808eb49" x1="9.02" y1="3.91" x2="9.08" y2="11.49" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#f2f2f2" />
-      <stop offset="0.23" stop-color="#f1f1f2" stop-opacity="0.99" />
-      <stop offset="0.37" stop-color="#ededf1" stop-opacity="0.95" />
-      <stop offset="0.48" stop-color="#e7e5f0" stop-opacity="0.89" />
-      <stop offset="0.58" stop-color="#dedbee" stop-opacity="0.81" />
-      <stop offset="0.67" stop-color="#d3ceeb" stop-opacity="0.7" />
-      <stop offset="0.76" stop-color="#c4bee8" stop-opacity="0.57" />
-      <stop offset="0.84" stop-color="#b4abe5" stop-opacity="0.41" />
-      <stop offset="0.92" stop-color="#a095e1" stop-opacity="0.22" />
-      <stop offset="0.99" stop-color="#8b7ddc" stop-opacity="0.02" />
-      <stop offset="1" stop-color="#897bdc" stop-opacity="0" />
-    </linearGradient>
-  </defs>
-  <title>Icon-manage-310</title>
-  <path d="M10.23,17.39l.81-.87V14.2H7v2.32l.81.87A.32.32,0,0,0,8,17.5h2A.32.32,0,0,0,10.23,17.39Z" fill="#cecece" />
-  <path d="M9,.5A5.89,5.89,0,0,0,3.09,7.07c.27,2.47,2.62,3.62,3.29,6.75a.49.49,0,0,0,.47.38h4.3a.49.49,0,0,0,.47-.38c.67-3.13,3-4.28,3.29-6.75A5.89,5.89,0,0,0,9,.5ZM7,14.2" fill="url(#a7a1c431-6c6d-4a8f-9a69-8da437e5b0c5)" />
-  <path d="M11.46,3.79a1.4,1.4,0,0,0-1.35,1.44V6H8V5.23A1.41,1.41,0,0,0,6.59,3.79,1.4,1.4,0,0,0,5.24,5.23,1.41,1.41,0,0,0,6.59,6.68h.64v6a.36.36,0,0,0,.72,0v-6h2.16v6a.36.36,0,1,0,.72,0v-6h.63a1.4,1.4,0,0,0,1.35-1.45A1.4,1.4,0,0,0,11.46,3.79ZM7.23,6H6.55a.74.74,0,0,1-.68-.77.74.74,0,0,1,.68-.77.74.74,0,0,1,.68.77Zm4.28,0h-.68V5.19a.68.68,0,1,1,1.35,0A.73.73,0,0,1,11.51,6Z" fill="url(#ec0c4f0d-5c8e-4882-96a1-89d61808eb49)" />
-  <polygon points="6.96 15.8 11.04 15.01 11.04 14.56 6.96 15.36 6.96 15.8" fill="#999" />
-  <polygon points="11.04 16.11 11.04 15.67 6.96 16.48 6.96 16.52 7.27 16.86 11.04 16.11" fill="#999" />
-</svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.19802 14.9L10 14.1091V13H6V14.1091L6.80198 14.9C6.84988 14.9527 6.91651 14.9881 6.9901 15H8.9703C9.01369 14.9985 9.0563 14.9889 9.09547 14.9717C9.13465 14.9545 9.16955 14.9301 9.19802 14.9Z" fill="#9AA7B0" fill-opacity="0.8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 1.00025C7.29753 0.993302 6.60159 1.13295 5.95845 1.40991C5.31531 1.68687 4.7397 2.0948 4.26988 2.60658C3.80005 3.11836 3.44678 3.72227 3.23355 4.37816C3.02031 5.03405 2.95199 5.72691 3.03313 6.41068C3.14474 7.41112 3.72701 8.1486 4.35695 8.94646C5.00778 9.77077 5.7095 10.6595 5.99563 11.9693C5.99806 11.9797 6.00091 11.9899 6.00414 12H9.99586C9.9991 11.9899 10.0019 11.9797 10.0044 11.9693C10.2913 10.6558 10.9919 9.7657 11.6422 8.93939C12.268 8.14424 12.8474 7.40817 12.9669 6.41068C13.048 5.72691 12.9797 5.03405 12.7665 4.37816C12.5532 3.72227 12.1999 3.11836 11.7301 2.60658C11.2603 2.0948 10.6847 1.68687 10.0416 1.40991C9.39841 1.13295 8.70247 0.993302 8 1.00025ZM5 5C5 5.55228 5.44772 6 6 6V7V10H7V7H9V10H10V7V6C10.5523 6 11 5.55228 11 5C11 4.44772 10.5523 4 10 4C9.44771 4 9 4.44772 9 5V6H7V5C7 4.44772 6.55228 4 6 4C5.44772 4 5 4.44772 5 5Z" fill="#B99BF8"/>
+</svg>
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/resources/icons/Microsoft.Insights/components/failed.svg b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/resources/icons/Microsoft.Insights/components/failed.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.02746 13H6V14L7 15H8.75777C8.36658 14.4156 8.10865 13.7344 8.02746 13Z" fill="#9AA7B0" fill-opacity="0.8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.95845 1.40991C6.60159 1.13295 7.29753 0.993302 8 1.00025C8.70247 0.993302 9.39841 1.13295 10.0416 1.40991C10.6847 1.68687 11.2603 2.0948 11.7301 2.60658C12.1999 3.11836 12.5532 3.72227 12.7665 4.37816C12.9797 5.03405 13.048 5.72691 12.9669 6.41068C12.8947 7.01325 12.6547 7.52043 12.338 8.00287C11.4746 8.03342 10.6731 8.3072 10 8.75777V7V6C10.5523 6 11 5.55228 11 5C11 4.44772 10.5523 4 10 4C9.44772 4 9 4.44772 9 5V6H7V5C7 4.44772 6.55228 4 6 4C5.44772 4 5 4.44772 5 5C5 5.55228 5.44772 6 6 6V7V10H7V7H9V9.67133C8.47323 10.3223 8.12439 11.1232 8.02746 12H6.00414C6.00091 11.9899 5.99806 11.9797 5.99563 11.9693C5.7095 10.6595 5.00778 9.77077 4.35695 8.94646C3.72701 8.1486 3.14474 7.41112 3.03313 6.41068C2.95199 5.72691 3.02031 5.03405 3.23355 4.37816C3.44678 3.72227 3.80005 3.11836 4.26988 2.60658C4.7397 2.0948 5.31531 1.68687 5.95845 1.40991Z" fill="#B99BF8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.5 16C14.433 16 16 14.433 16 12.5C16 10.567 14.433 9 12.5 9C10.567 9 9 10.567 9 12.5C9 14.433 10.567 16 12.5 16ZM10.7322 11.4393L11.4393 10.7322L12.5 11.7929L13.5607 10.7323L14.2678 11.4394L13.2071 12.5L14.2678 13.5607L13.5607 14.2678L12.5 13.2071L11.4393 14.2678L10.7322 13.5607L11.7929 12.5L10.7322 11.4393Z" fill="#E05555"/>
+</svg>
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/resources/icons/Microsoft.Insights/components/running.svg b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/resources/icons/Microsoft.Insights/components/running.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 13H6V14L7 15H9L9.3535 14.6465C9.12642 14.1444 9 13.5869 9 13Z" fill="#9AA7B0" fill-opacity="0.8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.95845 1.40991C6.60159 1.13295 7.29753 0.993302 8 1.00025C8.70247 0.993302 9.39841 1.13295 10.0416 1.40991C10.6847 1.68687 11.2603 2.0948 11.7301 2.60658C12.1999 3.11836 12.5532 3.72227 12.7665 4.37816C12.9797 5.03405 13.048 5.72691 12.9669 6.41068C12.8474 7.40817 12.268 8.14424 11.6422 8.93939C11.5292 9.08291 11.4148 9.22835 11.3012 9.3776C10.2346 9.87868 9.42536 10.837 9.12602 12H6.00414C6.00091 11.9899 5.99806 11.9797 5.99563 11.9693C5.7095 10.6595 5.00778 9.77077 4.35695 8.94646C3.72701 8.1486 3.14474 7.41112 3.03313 6.41068C2.95199 5.72691 3.02031 5.03405 3.23355 4.37816C3.44678 3.72227 3.80005 3.11836 4.26988 2.60658C4.7397 2.0948 5.31531 1.68687 5.95845 1.40991ZM6 6C5.44772 6 5 5.55228 5 5C5 4.44772 5.44772 4 6 4C6.55228 4 7 4.44772 7 5V6H9V5C9 4.44772 9.44772 4 10 4C10.5523 4 11 4.44772 11 5C11 5.55228 10.5523 6 10 6V7V10H9V7H7V10H6V7V6Z" fill="#B99BF8"/>
+<path d="M16 13C16 14.6569 14.6569 16 13 16C11.3431 16 10 14.6569 10 13C10 11.3431 11.3431 10 13 10C14.6569 10 16 11.3431 16 13Z" fill="#62B543"/>
+</svg>
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/resources/icons/Microsoft.Insights/components/stopped.svg b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/resources/icons/Microsoft.Insights/components/stopped.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 13H9V15H7L6 14V13Z" fill="#9AA7B0" fill-opacity="0.8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.95845 1.40991C6.60159 1.13295 7.29753 0.993302 8 1.00025C8.70247 0.993302 9.39841 1.13295 10.0416 1.40991C10.6847 1.68687 11.2603 2.0948 11.7301 2.60658C12.1999 3.11836 12.5532 3.72227 12.7665 4.37816C12.9797 5.03405 13.048 5.72691 12.9669 6.41068C12.8474 7.40817 12.268 8.14424 11.6422 8.93939C11.6263 8.95956 11.6104 8.97976 11.5945 9H10V7V6C10.5523 6 11 5.55228 11 5C11 4.44772 10.5523 4 10 4C9.44772 4 9 4.44772 9 5V6H7V5C7 4.44772 6.55228 4 6 4C5.44772 4 5 4.44772 5 5C5 5.55228 5.44772 6 6 6V7V10H7V7H9V9V10V12H6.00414C6.00091 11.9899 5.99806 11.9797 5.99563 11.9693C5.7095 10.6595 5.00778 9.77077 4.35695 8.94646C3.72701 8.1486 3.14474 7.41112 3.03313 6.41068C2.95199 5.72691 3.02031 5.03405 3.23355 4.37816C3.44678 3.72227 3.80005 3.11836 4.26988 2.60658C4.7397 2.0948 5.31531 1.68687 5.95845 1.40991Z" fill="#B99BF8"/>
+<path d="M10 10H16V16H10V10Z" fill="#9AA7B0"/>
+</svg>
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/resources/icons/Microsoft.Insights/components/unknown.svg b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/resources/icons/Microsoft.Insights/components/unknown.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.875 16H14.125V14.75H12.875V16ZM13.5 8.5C12.837 8.5 12.2011 8.76339 11.7322 9.23223C11.2634 9.70107 11 10.337 11 11H12.25C12.25 10.312 12.813 9.75 13.5 9.75C14.188 9.75 14.75 10.313 14.75 11C14.75 12.25 12.875 12.094 12.875 14.125H14.125C14.125 12.719 16 12.562 16 11C16 10.337 15.7366 9.70107 15.2678 9.23223C14.7989 8.76339 14.163 8.5 13.5 8.5Z" fill="#AFB1B3"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 13H6V14L7 15H9L10 14V13Z" fill="#9AA7B0" fill-opacity="0.8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.95845 1.40991C6.60159 1.13295 7.29753 0.993302 8 1.00025C8.70247 0.993302 9.39841 1.13295 10.0416 1.40991C10.6847 1.68687 11.2603 2.0948 11.7301 2.60658C12.1999 3.11836 12.5532 3.72227 12.7665 4.37816C12.9797 5.03405 13.048 5.72691 12.9669 6.41068C12.9131 6.85947 12.7662 7.25534 12.564 7.62748C11.9872 7.78758 11.4558 8.09443 11.0251 8.52513C10.3687 9.1815 10 10.0717 10 11V11.9863C9.9987 11.9909 9.99732 11.9955 9.99586 12H6.00414C6.00091 11.9899 5.99806 11.9797 5.99563 11.9693C5.7095 10.6595 5.00778 9.77077 4.35695 8.94646C3.72701 8.1486 3.14474 7.41112 3.03313 6.41068C2.95199 5.72691 3.02031 5.03405 3.23355 4.37816C3.44678 3.72227 3.80005 3.11836 4.26988 2.60658C4.7397 2.0948 5.31531 1.68687 5.95845 1.40991ZM6 6C5.44772 6 5 5.55228 5 5C5 4.44772 5.44772 4 6 4C6.55228 4 7 4.44772 7 5V6H9V5C9 4.44772 9.44772 4 10 4C10.5523 4 11 4.44772 11 5C11 5.55228 10.5523 6 10 6V7V10H9V7H7V10H6V7V6Z" fill="#B99BF8"/>
+</svg>
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/resources/icons/Microsoft.Insights/default.svg b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/resources/icons/Microsoft.Insights/default.svg

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,14 @@`
	`1`	`+apply plugin: "io.freefair.aspectj.post-compile-weaving"`
	`2`	`+`
	`3`	`+`
`1`	`4`	`intellij {`
`2`	`5`	`}`
`3`	`6`
`4`	`7`	`dependencies {`
`5`	`8`	`compile project(':azure-intellij-plugin-lib')`
`6`	`9`	`compile project(':azure-intellij-resource-connector-lib')`
	`10`	`+ compile 'com.microsoft.azure:azure-toolkit-common-lib'`
	`11`	`+ aspect 'com.microsoft.azure:azure-toolkit-common-lib'`
`7`	`12`	`compile 'com.microsoft.azure:azure-toolkit-ide-common-lib'`
`8`	`13`	`compile 'com.microsoft.azure:azure-toolkit-ide-applicationinsights-lib:' + azureToolkitVersion`
`9`	`14`	`}`