Merge pull request #99 from christianhelle/development

Enable Error Logging to Azure Application Insights
christianhelle · Aug 31, 2022 · ade1a24 · ade1a24
2 parents 529ab53 + dfb0f88
commit ade1a24
Show file tree

Hide file tree

Showing 12 changed files with 92 additions and 15 deletions.
diff --git a/src/ReswCodeGen.sln b/src/ReswCodeGen.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28407.52
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.32804.182
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VSPackage", "VSPackage\VSPackage.csproj", "{05F77BFB-CE11-4948-8174-F938C5B7F31C}"
 EndProject

diff --git a/src/VSPackage.Tests/CSharpCodeGeneratorTests.cs b/src/VSPackage.Tests/CSharpCodeGeneratorTests.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using System.Linq;
 using ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -77,7 +76,7 @@ public void ClassNameEqualsFileNameWithoutExtension()
         [TestMethod]
         public void ResourceLoaderInitializedWithClassName()
         {
-            Assert.IsTrue(actual.Contains("new ResourceLoader(currentAssemblyName + \"/Resources\");"));
+            Assert.IsTrue(actual.Contains("ResourceLoader.GetForCurrentView(currentAssemblyName + \"/Resources\");"));
         }
 
         [TestMethod]

diff --git a/src/VSPackage.Tests/CSharpCodeGeneratorTestsInternal.cs b/src/VSPackage.Tests/CSharpCodeGeneratorTestsInternal.cs
@@ -63,7 +63,7 @@ public void ClassNameEqualsFileNameWithoutExtension()
         [TestMethod]
         public void ResourceLoaderInitializedWithClassName()
         {
-            Assert.IsTrue(actual.Contains("new ResourceLoader(currentAssemblyName + \"/Resources\");"));
+            Assert.IsTrue(actual.Contains("ResourceLoader.GetForCurrentView(currentAssemblyName + \"/Resources\");"));
         }
 
         [TestMethod]

diff --git a/src/VSPackage.Tests/VisualBasicCodeGeneratorInternalTests.cs b/src/VSPackage.Tests/VisualBasicCodeGeneratorInternalTests.cs
@@ -64,7 +64,7 @@ public void ClassNameEqualsFileNameWithoutExtension()
         [TestMethod]
         public void ResourceLoaderInitializedWithClassName()
         {
-            Assert.IsTrue(actual.Contains("New ResourceLoader(currentAssemblyName + \"/Resources\")"));
+            Assert.IsTrue(actual.Contains("ResourceLoader.GetForCurrentView(currentAssemblyName + \"/Resources\")"));
         }
 
         [TestMethod]

diff --git a/src/VSPackage.Tests/VisualBasicCodeGeneratorTests.cs b/src/VSPackage.Tests/VisualBasicCodeGeneratorTests.cs
@@ -71,7 +71,7 @@ public void ClassNameEqualsFileNameWithoutExtension()
         [TestMethod]
         public void ResourceLoaderInitializedWithClassName()
         {
-            Assert.IsTrue(actual.Contains("New ResourceLoader(currentAssemblyName + \"/Resources\")"));
+            Assert.IsTrue(actual.Contains("ResourceLoader.GetForCurrentView(currentAssemblyName + \"/Resources\")"));
         }
 
         [TestMethod]

diff --git a/src/VSPackage/CustomTool/AppInsightsClient.cs b/src/VSPackage/CustomTool/AppInsightsClient.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.ApplicationInsights;
+using Microsoft.ApplicationInsights.Extensibility;
+
+namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
+{
+    [ExcludeFromCodeCoverage]
+    public class AppInsightsClient
+    {
+        private readonly TelemetryClient telemetryClient = null;
+
+        public AppInsightsClient()
+        {
+            try
+            {
+                var configuration = TelemetryConfiguration.CreateDefault();
+                configuration.InstrumentationKey = "eba88f76-06da-4ef8-a0fe-162b1a70f871";
+                //// configuration.ConnectionString = "InstrumentationKey=eba88f76-06da-4ef8-a0fe-162b1a70f871;IngestionEndpoint=https://westeurope-5.in.applicationinsights.azure.com/;LiveEndpoint=https://westeurope.livediagnostics.monitor.azure.com/";
+
+                telemetryClient = new TelemetryClient(configuration);
+            }
+            catch (Exception ex1)
+            {
+                Trace.WriteLine(ex1);
+
+                try
+                {
+                    telemetryClient = new TelemetryClient();
+#pragma warning disable CS0618 // Type or member is obsolete
+                    telemetryClient.InstrumentationKey = "eba88f76-06da-4ef8-a0fe-162b1a70f871";
+#pragma warning restore CS0618 // Type or member is obsolete
+                }
+                catch (Exception ex2)
+                {
+                    Trace.WriteLine(ex2);
+                    return;
+                }
+            }
+
+            telemetryClient.Context.Session.Id = Guid.NewGuid().ToString();
+            telemetryClient.Context.Device.OperatingSystem = Environment.OSVersion.ToString();
+            telemetryClient.Context.Component.Version = GetType().Assembly.GetName().Version.ToString();
+        }
+
+        public static AppInsightsClient Instance { get; } = new AppInsightsClient();
+
+        public void TrackFeatureUsage(string featureName, params string[] tags)
+        {
+            telemetryClient?.TrackEvent(featureName);
+            telemetryClient?.Flush();
+        }
+
+        public void TrackError(Exception exception)
+        {
+            telemetryClient?.TrackException(exception);
+            telemetryClient?.Flush();
+        }
+    }
+}
diff --git a/src/VSPackage/CustomTool/ReswFileCSharpCodeGenerator.cs b/src/VSPackage/CustomTool/ReswFileCSharpCodeGenerator.cs
@@ -7,10 +7,10 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
     [Guid("98983F6D-BC77-46AC-BA5A-8D9E8763F0D2")]
     [ComVisible(true)]
     [ProvideObject(typeof(ReswFileCSharpCodeGenerator))]
-    [CodeGeneratorRegistration(typeof(ReswFileCSharpCodeGenerator), 
-                               "C# ResW File Code Generator", 
-                               Guids.ReswFileCSharpCodeGenerator, 
-                               GeneratesDesignTimeSource = true, 
+    [CodeGeneratorRegistration(typeof(ReswFileCSharpCodeGenerator),
+                               "C# ResW File Code Generator",
+                               Guids.ReswFileCSharpCodeGenerator,
+                               GeneratesDesignTimeSource = true,
                                GeneratorRegKeyName = "ReswFileCodeGenerator")]
     public class ReswFileCSharpCodeGenerator : ReswFileCodeGenerator
     {
@@ -19,6 +19,8 @@ public ReswFileCSharpCodeGenerator()
         {
         }
 
+        protected override string GeneratorName => "C# ResW File Code Generator";
+
         public override int DefaultExtension(out string pbstrDefaultExtension)
         {
             pbstrDefaultExtension = ".cs";

diff --git a/src/VSPackage/CustomTool/ReswFileCSharpCodeGeneratorInternal.cs b/src/VSPackage/CustomTool/ReswFileCSharpCodeGeneratorInternal.cs
@@ -20,6 +20,8 @@ public ReswFileCSharpCodeGeneratorInternal()
         {
         }
 
+        protected override string GeneratorName => "C# ResW File Code Generator (Internal class)";
+
         public override int DefaultExtension(out string pbstrDefaultExtension)
         {
             pbstrDefaultExtension = ".cs";

diff --git a/src/VSPackage/CustomTool/ReswFileCodeGenerator.cs b/src/VSPackage/CustomTool/ReswFileCodeGenerator.cs
@@ -1,9 +1,7 @@
 using System;
-using System.CodeDom;
 using System.CodeDom.Compiler;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Windows.Forms;
 using Microsoft.VisualStudio.Shell.Interop;
 
@@ -15,6 +13,8 @@ public abstract class ReswFileCodeGenerator : IVsSingleFileGenerator
         private readonly CodeDomProvider codeDomProvider;
         private readonly TypeAttributes? classAccessibility;
 
+        protected abstract string GeneratorName { get; }
+
         protected ReswFileCodeGenerator(CodeDomProvider codeDomProvider, TypeAttributes? classAccessibility = null)
         {
             this.codeDomProvider = codeDomProvider;
@@ -43,9 +43,14 @@ public virtual int Generate(string wszInputFilePath,
             }
             catch (Exception e)
             {
+                AppInsightsClient.Instance.TrackError(e);
                 MessageBox.Show(e.Message, "Unable to generate code");
                 throw;
             }
+            finally
+            {
+                AppInsightsClient.Instance.TrackFeatureUsage(GeneratorName);
+            }
 
             return 0;
         }

diff --git a/src/VSPackage/CustomTool/ReswFileVisualBasicCodeGenerator.cs b/src/VSPackage/CustomTool/ReswFileVisualBasicCodeGenerator.cs
@@ -9,7 +9,7 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
     [ProvideObject(typeof(ReswFileVisualBasicCodeGenerator))]
     [CodeGeneratorRegistration(typeof(ReswFileVisualBasicCodeGenerator),
                                "Visual Basic ResW File Code Generator",
-                               Guids.ReswFileVisualBasicCodeGenerator, 
+                               Guids.ReswFileVisualBasicCodeGenerator,
                                GeneratesDesignTimeSource = true,
                                GeneratorRegKeyName = "ReswFileCodeGenerator")]
     public class ReswFileVisualBasicCodeGenerator : ReswFileCodeGenerator
@@ -19,6 +19,8 @@ public ReswFileVisualBasicCodeGenerator()
         {
         }
 
+        protected override string GeneratorName => "Visual Basic ResW File Code Generator";
+
         public override int DefaultExtension(out string pbstrDefaultExtension)
         {
             pbstrDefaultExtension = ".vb";

diff --git a/src/VSPackage/CustomTool/ReswFileVisualBasicCodeGeneratorInternal.cs b/src/VSPackage/CustomTool/ReswFileVisualBasicCodeGeneratorInternal.cs
@@ -20,6 +20,8 @@ public ReswFileVisualBasicCodeGeneratorInternal()
         {
         }
 
+        protected override string GeneratorName => "Visual Basic ResW File Code Generator (Internal class)";
+
         public override int DefaultExtension(out string pbstrDefaultExtension)
         {
             pbstrDefaultExtension = ".vb";

diff --git a/src/VSPackage/VSPackage.csproj b/src/VSPackage/VSPackage.csproj
@@ -75,6 +75,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CustomTool\AppInsightsClient.cs" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -93,7 +94,10 @@
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
   </ItemGroup>
-  <ItemGroup>    
+  <ItemGroup>
+    <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer">
+      <Version>2.10.0</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK">
       <Version>15.0.1</Version>
     </PackageReference>
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,8 @@ public ReswFileCSharpCodeGeneratorInternal() @@
             {
             }
+            protected override string GeneratorName => "C# ResW File Code Generator (Internal class)";
             public override int DefaultExtension(out string pbstrDefaultExtension)
             {
                 pbstrDefaultExtension = ".cs";
@@ Expand Down @@