ILogger - Exception.Message is populated as ExceptionTelemetry.Messag…

…e, Bump version (#282) * ILogger - If an exception is passed to log, then Exception.Message is populated as ExceptionTelemetry.Message. Bump version
microsoft · May 1, 2019 · 9056a89 · 9056a89
1 parent 471b47b
commit 9056a89
Show file tree

Hide file tree

Showing 22 changed files with 48 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Changelog 
+### Version 2.10.0-beta4
+- Update Base SDK to version 2.10.0-beta4
+- [ILogger - If an exception is passed to log, then Exception.Message is populated as ExceptionTelemetry.Message. If TrackExceptionsAsExceptionTelemetry is false, then Exception.Message is stored as custom property "ExceptionMessage"](https://github.com/Microsoft/ApplicationInsights-dotnet-logging/pull/282)
+
 ### Version 2.9.1
 - Update Base SDK to version 2.9.1
 

diff --git a/GlobalStaticVersion.props b/GlobalStaticVersion.props
@@ -6,9 +6,9 @@
       Update for every public release. 
     -->
     <SemanticVersionMajor>2</SemanticVersionMajor>
-    <SemanticVersionMinor>9</SemanticVersionMinor>
-    <SemanticVersionPatch>1</SemanticVersionPatch>
-    <PreReleaseMilestone></PreReleaseMilestone>
+    <SemanticVersionMinor>10</SemanticVersionMinor>
+    <SemanticVersionPatch>0</SemanticVersionPatch>
+    <PreReleaseMilestone>beta4</PreReleaseMilestone>
     <!-- 
       Date when Semantic Version was changed. 
       Update for every public release.

diff --git a/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj b/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj
@@ -38,7 +38,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/EtwCollector/EtwCollector.csproj b/src/EtwCollector/EtwCollector.csproj
@@ -51,7 +51,7 @@
     <PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="1.0.41" />
   </ItemGroup>
 

diff --git a/src/EventSourceListener/EventSourceListener.csproj b/src/EventSourceListener/EventSourceListener.csproj
@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/EventSourceListener/Properties/AssemblyInfo.cs b/src/EventSourceListener/Properties/AssemblyInfo.cs
@@ -23,7 +23,7 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("a539bb1d-29ff-48e8-8d6e-dfcc543dc2b4")]
 
-[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.EventSourceListener.Tests, PublicKey=" + AssemblyInfo.PublicKey)]
+[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.EventSourceListener.NetCoreApp10.Tests, PublicKey=" + AssemblyInfo.PublicKey)]
 
 internal static class AssemblyInfo
 {

diff --git a/src/ILogger/ApplicationInsightsLogger.cs b/src/ILogger/ApplicationInsightsLogger.cs
@@ -86,16 +86,22 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
                         formatter(state, exception),
                         ApplicationInsightsLogger.GetSeverityLevel(logLevel));
                     this.PopulateTelemetry(traceTelemetry, state, eventId);
+                    if (exception != null)
+                    {
+                        traceTelemetry.Properties.Add("ExceptionMessage", exception.Message);
+                    }
+
                     this.telemetryClient.TrackTrace(traceTelemetry);
                 }
                 else
                 {
                     ExceptionTelemetry exceptionTelemetry = new ExceptionTelemetry(exception)
                     {
-                        Message = formatter(state, exception),
+                        Message = exception.Message,
                         SeverityLevel = ApplicationInsightsLogger.GetSeverityLevel(logLevel),
                     };
 
+                    exceptionTelemetry.Properties.Add("FormattedMessage", formatter(state, exception));
                     this.PopulateTelemetry(exceptionTelemetry, state, eventId);
                     this.telemetryClient.TrackException(exceptionTelemetry);
                 }

diff --git a/src/ILogger/ILogger.csproj b/src/ILogger/ILogger.csproj
@@ -41,7 +41,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Log4NetAppender/Log4NetAppender.csproj b/src/Log4NetAppender/Log4NetAppender.csproj
@@ -42,7 +42,7 @@
     <PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">

diff --git a/src/NLogTarget/NLogTarget.csproj b/src/NLogTarget/NLogTarget.csproj
@@ -42,7 +42,7 @@
     <PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">

diff --git a/src/TraceListener/TraceListener.csproj b/src/TraceListener/TraceListener.csproj
@@ -40,7 +40,7 @@
     <PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">

diff --git a/...nosticSourceListener.netcoreapp10.Tests/DiagnosticSourceListener.netcoreapp1.Tests.csproj b/...nosticSourceListener.netcoreapp10.Tests/DiagnosticSourceListener.netcoreapp1.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RootNamespace>Microsoft.ApplicationInsights.DiagnosticSourceListener.Tests</RootNamespace>
-    <AssemblyName>Microsoft.ApplicationInsights.DiagnosticSourceListener.Tests</AssemblyName>
+    <AssemblyName>Microsoft.ApplicationInsights.DiagnosticSourceListener.NetCoreApp10.Tests</AssemblyName>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/EtwCollector.Net451.Tests/EtwCollector.Net451.Tests.csproj b/test/EtwCollector.Net451.Tests/EtwCollector.Net451.Tests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="1.0.41" />
     <ProjectReference Include="..\..\src\EtwCollector\EtwCollector.csproj" />
     <Reference Include="System.Net.Http" />

diff --git a/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj b/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj
@@ -6,7 +6,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ApplicationInsights.EventSourceListener.Tests</RootNamespace>
-    <AssemblyName>Microsoft.ApplicationInsights.EventSourceListener.Tests</AssemblyName>
+    <AssemblyName>Microsoft.ApplicationInsights.EventSourceListener.NetCoreApp10.Tests</AssemblyName>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <FileAlignment>512</FileAlignment>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/ILogger.NetStandard.Tests/ILoggerIntegrationTests.cs b/test/ILogger.NetStandard.Tests/ILoggerIntegrationTests.cs
@@ -39,7 +39,7 @@ public void ApplicationInsightsLoggerIsInvokedWhenUsingILogger()
             ILogger<ILoggerIntegrationTests> testLogger = serviceProvider.GetRequiredService<ILogger<ILoggerIntegrationTests>>();
 
             testLogger.LogInformation("Testing");
-            testLogger.LogError(new Exception("TestException"), "Exception");
+            testLogger.LogError(new Exception("ExceptionMessage"), "LoggerMessage");
             testLogger.LogInformation(new EventId(100, "TestEvent"), "TestingEvent");
             testLogger.LogCritical("Critical");
             testLogger.LogTrace("Trace");
@@ -65,7 +65,8 @@ public void ApplicationInsightsLoggerIsInvokedWhenUsingILogger()
             Assert.AreEqual(SeverityLevel.Verbose, (itemsReceived[6] as TraceTelemetry).SeverityLevel);
 
             Assert.AreEqual("Testing", (itemsReceived[0] as TraceTelemetry).Message);
-            Assert.AreEqual("Exception", (itemsReceived[1] as ExceptionTelemetry).Message);
+            Assert.AreEqual("ExceptionMessage", (itemsReceived[1] as ExceptionTelemetry).Message);
+            Assert.AreEqual("LoggerMessage", (itemsReceived[1] as ExceptionTelemetry).Properties["FormattedMessage"]);
             Assert.AreEqual("TestingEvent", (itemsReceived[2] as TraceTelemetry).Message);
             Assert.AreEqual("Critical", (itemsReceived[3] as TraceTelemetry).Message);
             Assert.AreEqual("Trace", (itemsReceived[4] as TraceTelemetry).Message);
@@ -92,13 +93,14 @@ public void ApplicationInsightsLoggerLogsExceptionAsExceptionWhenSwitchIsTrue()
             ILogger<ILoggerIntegrationTests> testLogger = serviceProvider.GetRequiredService<ILogger<ILoggerIntegrationTests>>();
 
             testLogger.LogInformation("Testing");
-            testLogger.LogError(new Exception("TestException"), "Exception");
+            testLogger.LogError(new Exception("ExceptionMessage"), "LoggerMessage");
 
             Assert.IsInstanceOfType(itemsReceived[0], typeof(TraceTelemetry));
             Assert.IsInstanceOfType(itemsReceived[1], typeof(ExceptionTelemetry));
 
             Assert.AreEqual("Testing", (itemsReceived[0] as TraceTelemetry).Message);
-            Assert.AreEqual("Exception", (itemsReceived[1] as ExceptionTelemetry).Message);
+            Assert.AreEqual("ExceptionMessage", (itemsReceived[1] as ExceptionTelemetry).Message);
+            Assert.AreEqual("LoggerMessage", (itemsReceived[1] as ExceptionTelemetry).Properties["FormattedMessage"]);
         }
 
         /// <summary>
@@ -119,7 +121,7 @@ public void ApplicationInsightsLoggerLogsExceptionAsTraceWhenSwitchIsFalse()
             ILogger<ILoggerIntegrationTests> testLogger = serviceProvider.GetRequiredService<ILogger<ILoggerIntegrationTests>>();
 
             testLogger.LogInformation("Testing");
-            testLogger.LogError(new Exception("TestException"), "Exception");
+            testLogger.LogError(new Exception("ExceptionMessage"), "LoggerMessage");
 
             Assert.IsInstanceOfType(itemsReceived[0], typeof(TraceTelemetry));
             Assert.IsInstanceOfType(itemsReceived[1], typeof(TraceTelemetry));
@@ -128,7 +130,9 @@ public void ApplicationInsightsLoggerLogsExceptionAsTraceWhenSwitchIsFalse()
             Assert.AreEqual("Testing", (itemsReceived[0] as TraceTelemetry).Message);
 
             Assert.AreEqual(SeverityLevel.Error, (itemsReceived[1] as TraceTelemetry).SeverityLevel);
-            Assert.AreEqual("Exception", (itemsReceived[1] as TraceTelemetry).Message);
+            Assert.AreEqual("LoggerMessage", (itemsReceived[1] as TraceTelemetry).Message);
+
+            Assert.AreEqual("ExceptionMessage", (itemsReceived[1] as TraceTelemetry).Properties["ExceptionMessage"]);
         }
 
         /// <summary>
@@ -154,7 +158,7 @@ public void ApplicationInsightsLoggerAddsScopeWhenSwitchIsTrue()
                 using (testLogger.BeginScope<IReadOnlyCollection<KeyValuePair<string, object>>>(new Dictionary<string, object> { { "Key", "Value" } }))
                 {
                     testLogger.LogInformation("Testing");
-                    testLogger.LogError(new Exception("TestException"), "Exception");
+                    testLogger.LogError(new Exception("ExceptionMessage"), "LoggerMessage");
                 }
             }
 
@@ -165,7 +169,7 @@ public void ApplicationInsightsLoggerAddsScopeWhenSwitchIsTrue()
             Assert.AreEqual("Value", (itemsReceived[1] as ISupportProperties).Properties["Key"]);
 
             Assert.AreEqual("Testing", (itemsReceived[0] as TraceTelemetry).Message);
-            Assert.AreEqual("Exception", (itemsReceived[1] as ExceptionTelemetry).Message);
+            Assert.AreEqual("ExceptionMessage", (itemsReceived[1] as ExceptionTelemetry).Message);
         }
 
         /// <summary>
@@ -191,7 +195,7 @@ public void ApplicationInsightsLoggerDoesNotAddScopeWhenSwitchIsFalse()
                 using (testLogger.BeginScope<IReadOnlyCollection<KeyValuePair<string, object>>>(new Dictionary<string, object> { { "Key", "Value" } }))
                 {
                     testLogger.LogInformation("Testing");
-                    testLogger.LogError(new Exception("TestException"), "Exception");
+                    testLogger.LogError(new Exception("ExceptionMessage"), "LoggerMessage");
                 }
             }
 
@@ -202,7 +206,7 @@ public void ApplicationInsightsLoggerDoesNotAddScopeWhenSwitchIsFalse()
             Assert.IsFalse((itemsReceived[1] as ISupportProperties).Properties.ContainsKey("Key"));
 
             Assert.AreEqual("Testing", (itemsReceived[0] as TraceTelemetry).Message);
-            Assert.AreEqual("Exception", (itemsReceived[1] as ExceptionTelemetry).Message);
+            Assert.AreEqual("ExceptionMessage", (itemsReceived[1] as ExceptionTelemetry).Message);
         }
 
         /// <summary>

diff --git a/test/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj b/test/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
     <PackageReference Include="log4net" Version="2.0.7" />
     <ProjectReference Include="..\..\src\Log4NetAppender\Log4NetAppender.csproj" />
     <Reference Include="System.Net.Http" />

diff --git a/test/Log4NetAppender.NetCoreApp10.Tests/Log4NetAppender.NetCoreApp10.Tests.csproj b/test/Log4NetAppender.NetCoreApp10.Tests/Log4NetAppender.NetCoreApp10.Tests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
     <PackageReference Include="log4net" Version="2.0.8" />
     <ProjectReference Include="..\..\src\Log4NetAppender\Log4NetAppender.csproj" />
   </ItemGroup>

diff --git a/test/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj b/test/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
     <PackageReference Include="NLog" Version="4.4.12" />
     <ProjectReference Include="..\..\src\NLogTarget\NLogTarget.csproj" />
     <Reference Include="System.Net.Http" />

diff --git a/test/NLogTarget.NetCoreApp10.Tests/NLogTarget.NetCoreApp10.Tests.csproj b/test/NLogTarget.NetCoreApp10.Tests/NLogTarget.NetCoreApp10.Tests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
     <PackageReference Include="NLog" Version="4.5.0" />
     <ProjectReference Include="..\..\src\NLogTarget\NLogTarget.csproj" />
   </ItemGroup>

diff --git a/test/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj b/test/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
     <PackageReference Include="log4net" Version="2.0.5" />
     <ProjectReference Include="..\..\src\TraceListener\TraceListener.csproj" />
     <Reference Include="System.Net.Http" />

diff --git a/test/TraceListener.netcoreapp10.Tests/TraceListener.netcoreapp10.Tests.csproj b/test/TraceListener.netcoreapp10.Tests/TraceListener.netcoreapp10.Tests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
     <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
   </ItemGroup>
 

diff --git a/test/Xdt.Tests/Xdt.Tests.csproj b/test/Xdt.Tests/Xdt.Tests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
     <PackageReference Include="Microsoft.Web.Xdt" Version="2.1.1" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />