Merge pull request #925 from microsoft/develop

Merge develop to master

Author: Dmitry-Matveev

.github/ISSUE_TEMPLATE.md

@@ -11,8 +11,8 @@ If you are reporting bug/issue, please provide detailed Repro instructions.
 
 
 ## Version Info 
-SDK Version :
-.NET Version :	 						
-How Application was onboarded with SDK(VisualStudio/StatusMonitor/Azure Extension) :
+SDK Version (version of https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) :
+.NET Core Version (TargetFramework in your .csproj file) :	 						
+How Application was onboarded with SDK(Installed Nugets/VisualStudio/Azure WebAppExtension) :
 OS :
-Hosting Info (IIS/Azure WebApps/ etc) :
+Hosting Info (IIS/Azure Web Apps/Running From Visual Studio etc) :

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,12 +2,12 @@ Fix Issue # .
 <Short description of the fix.>
 
 - [ ] I ran Unit Tests locally.
+- [ ] CHANGELOG.md updated with one line description of the fix, and a link to the original issue if available.
 
 For significant contributions please make sure you have completed the following items:
 
 - [ ] Changes in public surface reviewed
 - [ ] Design discussion issue #
-- [ ] CHANGELOG.md updated with one line description of the fix, and a link to the original issue.
 - [ ] The PR will trigger build, unit tests, and functional tests automatically. If your PR was submitted from fork - mention one of committers to initiate the build for you.
 	  If you want to to re-run the build/tests, the easiest way is to simply Close and Re-Open this same PR. (Just click 'close pull request' followed by 'open pull request' buttons at the bottom of the PR)
 

CHANGELOG.md

@@ -1,10 +1,16 @@
 # Changelog
 
+## Version 2.8.0-beta1
+- [Add EventCounter collection.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/913)
+- [Performance fixes: One DiagSource Listener; Head Sampling Feature; No Concurrent Dictionary; etc...](https://github.com/microsoft/ApplicationInsights-aspnetcore/pull/907)
+- [Fix: Add `IJavaScriptSnippet` service interface and update the `IServiceCollection` extension to register it for `JavaScriptSnippet`.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/890)
+- [Make JavaScriptEncoder optional and Fallback to JavaScriptEncoder.Default.](https://github.com/microsoft/ApplicationInsights-aspnetcore/pull/918)
+
 ## Version 2.7.1
 - [Fix - ApplicationInsights StartupFilter should not swallow exceptions from downstream ApplicationBuilder.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/897)
 
 ## Version 2.7.0
- - Updated Web/Base SDK version dependency to 2.10.0
+- Updated Web/Base SDK version dependency to 2.10.0
 - [Remove unused reference to System.Net.Http](https://github.com/microsoft/ApplicationInsights-aspnetcore/pull/879)
 
 ## Version 2.7.0-beta4

Readme.md

@@ -11,14 +11,12 @@ Linux :[![Build Status](https://mseng.visualstudio.com/AppInsights/_apis/build/s
 Microsoft Application Insights for ASP.NET Core applications
 =============================================================
 
-This repository has a code for [Application Insights monitoring](http://azure.microsoft.com/en-us/services/application-insights/) of [ASP.NET Core](https://github.com/aspnet/home) applications. Read about contribution policies on Application Insights Home [repository](https://github.com/microsoft/ApplicationInsights-home)
+This repository has a code for [Application Insights monitoring](http://azure.microsoft.com/en-us/services/application-insights/) of [ASP.NET Core](https://docs.microsoft.com/aspnet/core) applications. Read about contribution policies on Application Insights Home [repository](https://github.com/microsoft/ApplicationInsights-home)
 
 Getting Started
 ---------------
 
-[Application Insights monitoring](http://azure.microsoft.com/en-us/services/application-insights/) is a service that allows you to collect monitoring and diagnostics information about your application. The [getting started](https://github.com/Microsoft/ApplicationInsights-aspnet5/wiki/Getting-Started) guide shows how you can onboard your ASP.NET Core web application to use the Application Insights SDK.
-
-Application Insights collects a lot of information out-of-the-box such as requests, dependencies, exceptions, and usage. It also allows you to configure additional data collection.  The [configure](https://github.com/Microsoft/ApplicationInsights-aspnet5/wiki/Configure) guide demonstrates the most common tasks you may want to do.
+[Application Insights monitoring](http://azure.microsoft.com/en-us/services/application-insights/) is a service that allows you to collect monitoring and diagnostics information about your application. The [getting started](https://docs.microsoft.com/azure/azure-monitor/app/asp-net-core) guide shows how you can onboard your ASP.NET Core web application to use the Application Insights SDK.
 
 
 Repository structure

src/Microsoft.ApplicationInsights.AspNetCore/DiagnosticListeners/Implementation/ContextData.cs

@@ -1,11 +1,12 @@
 namespace Microsoft.ApplicationInsights.AspNetCore.DiagnosticListeners
 {
 #if NET451 || NET46
-    using System.Runtime.Remoting.Messaging;
     using System.Runtime.Remoting;
+    using System.Runtime.Remoting.Messaging;
 #else
     using System.Threading;
 #endif
+
     /// <summary>
     /// Represents ambient data that is local to a given asynchronous control flow, such as an asynchronous method.
     /// </summary>
@@ -15,7 +16,6 @@ internal class ContextData<T>
 #if NET451 || NET46
         private static readonly string Key = typeof(ContextData<T>).FullName;
 
-
         /// <summary>
         /// Gets or sets the value of the ambient data.
         /// </summary>
@@ -27,6 +27,7 @@ public T Value
                 var handle = CallContext.LogicalGetData(Key) as ObjectHandle;
                 return handle != null ? (T)handle.Unwrap() : default(T);
             }
+
             set
             {
                 CallContext.LogicalSetData(Key, new ObjectHandle(value));

src/Microsoft.ApplicationInsights.AspNetCore/DiagnosticListeners/Implementation/HeadersUtilities.cs

@@ -21,7 +21,7 @@ internal static class HeadersUtilities
         public static string GetHeaderKeyValue(IEnumerable<string> headerValues, string keyName)
         {
             if (headerValues != null)
-            {                
+            {
                 foreach (string keyNameValue in headerValues)
                 {
                     string[] keyNameValueParts = keyNameValue.Trim().Split('=');
@@ -43,9 +43,9 @@ public static string GetHeaderKeyValue(IEnumerable<string> headerValues, string
         /// provided key value. If the initial header value strings don't contain the key name,
         /// then the key name/value pair should be added to the comma-separated list and returned.
         /// </summary>
-        /// <param name="headerValues">The existing header values that the key/value pair should be added to.</param>
-        /// <param name="keyName">The name of the key to add.</param>
-        /// <param name="keyValue">The value of the key to add.</param>
+        /// <param name="currentHeaders">The existing header values that the key/value pair should be added to.</param>
+        /// <param name="key">The name of the key to add.</param>
+        /// <param name="value">The value of the key to add.</param>
         /// <returns>The result of setting the provided key name/value pair into the provided headerValues.</returns>
         public static StringValues SetHeaderKeyValue(string[] currentHeaders, string key, string value)
         {
@@ -60,14 +60,32 @@ public static StringValues SetHeaderKeyValue(string[] currentHeaders, string key
                     }
                 }
 
-                return StringValues.Concat(currentHeaders, string.Concat(key, "=", value));                
+                return StringValues.Concat(currentHeaders, string.Concat(key, "=", value));
             }
             else
             {
                 return string.Concat(key, "=", value);
             }
         }
 
+        /// <summary>
+        /// Http Headers only allow Printable US-ASCII characters.
+        /// Remove all other characters.
+        /// </summary>
+        public static string SanitizeString(string input)
+        {
+            if (string.IsNullOrWhiteSpace(input))
+            {
+                return input;
+            }
+
+            // US-ASCII characters (hex: 0x00 - 0x7F) (decimal: 0-127)
+            // ASCII Extended characters (hex: 0x80 - 0xFF) (decimal: 128-255) (NOT ALLOWED)
+            // Non-Printable ASCII characters are (hex: 0x00 - 0x1F) (decimal: 0-31) (NOT ALLOWED)
+            // Printable ASCII characters are (hex: 0x20 - 0xFF) (decimal: 32-255)
+            return Regex.Replace(input, @"[^\u0020-\u007F]", string.Empty);
+        }
+
         /// <summary>
         /// Check if the header contains the key, case insensitve, ignore leading and trailing whitepsaces.
         /// </summary>
@@ -108,24 +126,5 @@ private static bool HeaderMatchesKey(string headerValue, string key)
 
             return true;
         }
-
-        /// <summary>
-        /// Http Headers only allow Printable US-ASCII characters.
-        /// Remove all other characters.
-        /// </summary>
-        public static string SanitizeString(string input)
-        {
-            if (string.IsNullOrWhiteSpace(input))
-            {
-                return input;
-            }
-
-            // US-ASCII characters (hex: 0x00 - 0x7F) (decimal: 0-127)
-            // ASCII Extended characters (hex: 0x80 - 0xFF) (decimal: 0-255) (NOT ALLOWED)
-            // Non-Printable ASCII characters are (hex: 0x00 - 0x1F) (decimal: 0-31) (NOT ALLOWED)
-            // Printable ASCII characters are (hex: 0x20 - 0xFF) (decimal: 32-255) 
-            return Regex.Replace(input, @"[^\u0020-\u007F]", string.Empty);
-        }
-
     }
 }