From b1662aced1696dc0c9075276a96290cb298a6e9a Mon Sep 17 00:00:00 2001
From: Ramjot Singh <ramjsing@microsoft.com>
Date: Thu, 20 Dec 2018 12:41:41 -0800
Subject: [PATCH] Taking PR comments

---
 .../ApplicationInsightsLoggerOptions.cs       |  2 +-
 ...icationInsightsLoggingBuilderExtensions.cs | 22 +++++++++----------
 src/ILogger/ILogger.csproj                    |  7 ++++--
 .../ILoggerIntegrationTests.cs                |  8 ++++++-
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/ILogger/ApplicationInsightsLoggerOptions.cs b/src/ILogger/ApplicationInsightsLoggerOptions.cs
index 48dcfee..838d9b3 100644
--- a/src/ILogger/ApplicationInsightsLoggerOptions.cs
+++ b/src/ILogger/ApplicationInsightsLoggerOptions.cs
@@ -22,7 +22,7 @@ namespace Microsoft.Extensions.Logging.ApplicationInsights
         public bool TrackExceptionsAsExceptionTelemetry { get; set; } = true;
 
         /// <summary>
-        /// Gets or sets a value indicating whether the Scope information is excluded from telemetry or not.
+        /// Gets or sets a value indicating whether the Scope information is included from telemetry or not.
         /// Defaults to true.
         /// </summary>
         public bool IncludeScopes { get; set; } = true;
diff --git a/src/ILogger/ApplicationInsightsLoggingBuilderExtensions.cs b/src/ILogger/ApplicationInsightsLoggingBuilderExtensions.cs
index 1e3c14f..80e65e2 100644
--- a/src/ILogger/ApplicationInsightsLoggingBuilderExtensions.cs
+++ b/src/ILogger/ApplicationInsightsLoggingBuilderExtensions.cs
@@ -48,30 +48,30 @@ namespace Microsoft.Extensions.Logging
         /// </summary>
         /// <param name="builder">The <see cref="ILoggingBuilder"/> to use.</param>
         /// <param name="instrumentationKey">Application insights instrumentation key.</param>
-        /// <param name="configureApplicationInsightsOptions">Action to configure ApplicationInsights logger.</param>
+        /// <param name="configureApplicationInsightsLoggerOptions">Action to configure ApplicationInsights logger.</param>
         /// <returns>Logging builder with Application Insights added to it.</returns>
         public static ILoggingBuilder AddApplicationInsights(
             this ILoggingBuilder builder,
             string instrumentationKey,
-            Action<ApplicationInsightsLoggerOptions> configureApplicationInsightsOptions)
+            Action<ApplicationInsightsLoggerOptions> configureApplicationInsightsLoggerOptions)
         {
             return builder.AddApplicationInsights(
                 (telemetryConfiguration) => telemetryConfiguration.InstrumentationKey = instrumentationKey,
-                configureApplicationInsightsOptions);
+                configureApplicationInsightsLoggerOptions);
         }
 
         /// <summary>
         /// Adds an ApplicationInsights logger named 'ApplicationInsights' to the factory.
         /// </summary>
         /// <param name="builder">The <see cref="ILoggingBuilder"/> to use.</param>
-        /// <param name="configureApplicationInsightsOptions">Action to configure ApplicationInsights logger.</param>
+        /// <param name="configureApplicationInsightsLoggerOptions">Action to configure ApplicationInsights logger.</param>
         public static ILoggingBuilder AddApplicationInsights(
             this ILoggingBuilder builder,
-            Action<ApplicationInsightsLoggerOptions> configureApplicationInsightsOptions)
+            Action<ApplicationInsightsLoggerOptions> configureApplicationInsightsLoggerOptions)
         {
             return builder.AddApplicationInsights(
                 (telemetryConfiguration) => { },
-                configureApplicationInsightsOptions);
+                configureApplicationInsightsLoggerOptions);
         }
 
         /// <summary>
@@ -79,22 +79,22 @@ namespace Microsoft.Extensions.Logging
         /// </summary>
         /// <param name="builder">The <see cref="ILoggingBuilder"/> to use.</param>
         /// <param name="configureTelemetryConfiguration">Action to configure telemetry configuration.</param>
-        /// <param name="configureApplicationInsightsOptions">Action to configure ApplicationInsights logger.</param>
+        /// <param name="configureApplicationInsightsLoggerOptions">Action to configure ApplicationInsights logger.</param>
         private static ILoggingBuilder AddApplicationInsights(
             this ILoggingBuilder builder,
             Action<TelemetryConfiguration> configureTelemetryConfiguration,
-            Action<ApplicationInsightsLoggerOptions> configureApplicationInsightsOptions)
+            Action<ApplicationInsightsLoggerOptions> configureApplicationInsightsLoggerOptions)
         {
-            if (configureApplicationInsightsOptions == null)
+            if (configureApplicationInsightsLoggerOptions == null)
             {
-                throw new ArgumentNullException(nameof(configureApplicationInsightsOptions));
+                throw new ArgumentNullException(nameof(configureApplicationInsightsLoggerOptions));
             }
 
             // Initialize IOptions<TelemetryConfiguration> user can keep on configuring it furthur if they want to.
             builder.Services.Configure<TelemetryConfiguration>(configureTelemetryConfiguration);
 
             builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<ILoggerProvider, ApplicationInsightsLoggerProvider>());
-            builder.Services.Configure(configureApplicationInsightsOptions);
+            builder.Services.Configure(configureApplicationInsightsLoggerOptions);
 
             return builder;
         }
diff --git a/src/ILogger/ILogger.csproj b/src/ILogger/ILogger.csproj
index 4699618..e461f8d 100644
--- a/src/ILogger/ILogger.csproj
+++ b/src/ILogger/ILogger.csproj
@@ -30,8 +30,11 @@
     <Description>Application Insights ILogger allows forwarding events from ILogger to Application Insights. Application Insights will collect your logs from multiple sources and provide rich powerful search capabilities. Privacy statement: https://go.microsoft.com/fwlink/?LinkId=512156</Description>
     <PackageTags>$(PackageTags) ILogger ILoggerBuilder ILoggerProvider</PackageTags>
   </PropertyGroup>
-  
-  
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
 
   <PropertyGroup>
     <GenerateAdditionalSources>false</GenerateAdditionalSources>
diff --git a/test/ILogger.NetStandard.Tests/ILoggerIntegrationTests.cs b/test/ILogger.NetStandard.Tests/ILoggerIntegrationTests.cs
index 15a32db..4c057c0 100644
--- a/test/ILogger.NetStandard.Tests/ILoggerIntegrationTests.cs
+++ b/test/ILogger.NetStandard.Tests/ILoggerIntegrationTests.cs
@@ -163,6 +163,9 @@ namespace Microsoft.ApplicationInsights
 
             Assert.AreEqual(" => TestScope", (itemsReceived[1] as ISupportProperties).Properties["Scope"]);
             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);
         }
 
         /// <summary>
@@ -171,7 +174,7 @@ namespace Microsoft.ApplicationInsights
         /// </summary>
         [TestMethod]
         [TestCategory("ILogger")]
-        public void ApplicationInsightsLoggerAddsScopeWhenSwitchIsFalse()
+        public void ApplicationInsightsLoggerDoesNotAddScopeWhenSwitchIsFalse()
         {
             List<ITelemetry> itemsReceived = new List<ITelemetry>();
 
@@ -197,6 +200,9 @@ namespace Microsoft.ApplicationInsights
 
             Assert.IsFalse((itemsReceived[1] as ISupportProperties).Properties.ContainsKey("Scope"));
             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);
         }
 
         /// <summary>