Merge pull request #978 from microsoft/develop

merge develop to master (prep 2.8-beta3)

.vsts/linux-build.yml

@@ -2,10 +2,10 @@ pool:
   vmImage: 'ubuntu-16.04'
 steps:
 
-- task: DotNetCoreInstaller@0
-  displayName: install dotnet core 2.1.500
+- task: DotNetCoreInstaller@2
+  displayName: install dotnet core 3.0.100-preview8-013656
   inputs:
-    version: "2.1.500"
+    version: "3.0.100-preview8-013656"
 
 - task: DotNetCoreCLI@1
   displayName: Restore solutions
@@ -21,37 +21,48 @@ steps:
     arguments: "--configuration Release"
 
 - task: DotNetCoreCLI@1
-  displayName: Test 2.0
+  displayName: Functional Tests 3.0
+  continueOnError: true
+  inputs:
+    command: "test"
+    projects: "test/**/TestApp30.Tests30.csproj"
+    arguments: "--configuration Release -l trx"
+
+- task: DotNetCoreInstaller@2
+  displayName: install dotnet core 2.2.104
+  inputs:
+    version: "2.2.104"
+
+- task: DotNetCoreCLI@1
+  displayName: Functional Tests 2.0
   continueOnError: true
   inputs:
     command: "test"
     projects: "test/**/*Tests20.csproj"
     arguments: "--configuration Release -l trx"
 
-- task: DotNetCoreInstaller@0
-  displayName: install dotnet core 1.1.5
+- task: DotNetCoreCLI@1
+  displayName: Unit Tests for AspNetCore
+  continueOnError: true
   inputs:
-    version: "1.1.5"
+    command: "test"
+    projects: "test/**/*AspNetCore.Tests.csproj"
+    arguments: "--configuration Release -l trx"
 
 - task: DotNetCoreCLI@1
-  displayName: Test 1.1.5
+  displayName: Unit Tests + Func Tests for WorkerService
   continueOnError: true
   inputs:
     command: "test"
-    projects: "test/**/*Tests.csproj"
-    arguments: "--configuration Release -l trx --filter Category!=WindowsOnly"
+    projects: "test/**/*WorkerService.Tests.csproj"
+    arguments: "--configuration Release -l trx"
 
 
 - task: PublishTestResults@2
   inputs:
     testRunner: "VSTest"
     testResultsFiles: "**/*.trx"
 
-- task: DotNetCoreInstaller@0
-  displayName: install dotnet core 2.1.500
-  inputs:
-    version: "2.1.500"
-
 - task: DotNetCoreCLI@1
   displayName: Package Nuget
   inputs:
@@ -63,4 +74,4 @@ steps:
   inputs:
     PathtoPublish: "$(build.artifactstagingdirectory)"
     ArtifactName: "drop"
-    ArtifactType: "Container"
+    ArtifactType: "Container"

ApplicationInsights.AspNetCore.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2008
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29209.152
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF}"
 EndProject
@@ -32,23 +32,36 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsigh
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTestUtils", "test\FunctionalTestUtils\FunctionalTestUtils.csproj", "{B7217A00-66FA-49A8-8EF3-39C07E1F7E33}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp.FunctionalTests", "test\EmptyApp.FunctionalTests\EmptyApp.FunctionalTests.csproj", "{71CE2DB2-C7AA-4454-B5F2-774BC575E321}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp.FunctionalTests10", "test\EmptyApp.FunctionalTests\EmptyApp.FunctionalTests10.csproj", "{71CE2DB2-C7AA-4454-B5F2-774BC575E321}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp20.FunctionalTests20", "test\EmptyApp20.FunctionalTests\EmptyApp20.FunctionalTests20.csproj", "{C47AFD8A-3326-4391-8115-69349C04C3DA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTestUtils20", "test\FunctionalTestUtils20\FunctionalTestUtils20.csproj", "{937AF006-898E-43FD-80A6-B20D7E3A1944}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework.FunctionalTests", "test\MVCFramework.FunctionalTests\MVCFramework.FunctionalTests.csproj", "{1D5825CC-2EC9-43A1-BE32-778EFF5EAC80}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework.FunctionalTests10", "test\MVCFramework.FunctionalTests\MVCFramework.FunctionalTests10.csproj", "{1D5825CC-2EC9-43A1-BE32-778EFF5EAC80}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework20.FunctionalTests20", "test\MVCFramework20.FunctionalTests\MVCFramework20.FunctionalTests20.csproj", "{51198C41-CD4A-4006-84D4-DE20A0A44363}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi.FunctionalTests", "test\WebApi.FunctionalTests\WebApi.FunctionalTests.csproj", "{325C4ECE-BD4A-4CF2-BC80-FBD1024B5935}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi.FunctionalTests10", "test\WebApi.FunctionalTests\WebApi.FunctionalTests10.csproj", "{325C4ECE-BD4A-4CF2-BC80-FBD1024B5935}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi20.FunctionalTests20", "test\WebApi20.FunctionalTests\WebApi20.FunctionalTests20.csproj", "{C3B3F515-0305-4809-A9A8-37FD80428F74}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsTypes", "test\ApplicationInsightsTypes\ApplicationInsightsTypes.csproj", "{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp30", "test\TestApp30\TestApp30.csproj", "{8E71FECF-E090-409E-8551-C597F9DFB91C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp30.Tests30", "test\TestApp30.Tests\TestApp30.Tests30.csproj", "{FE9DB9A7-D9AE-4188-945C-393D70022D9A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights.WorkerService", "src\Microsoft.ApplicationInsights.WorkerService\Microsoft.ApplicationInsights.WorkerService.csproj", "{AECEE8DD-09AE-4DEA-8690-F76A37C0534B}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "src\Shared\Shared.shproj", "{D56F2979-D6BC-4EF2-BB9B-4077B3290599}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ApplicationInsights.WorkerService.Tests", "test\Microsoft.ApplicationInsights.WorkerService.Tests\Microsoft.ApplicationInsights.WorkerService.Tests.csproj", "{A41D3299-5E41-4B73-8C8E-DD64824BC9E6}"
+EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\Shared\Shared.projitems*{d56f2979-d6bc-4ef2-bb9b-4077b3290599}*SharedItemsImports = 13
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -98,6 +111,22 @@ Global
 		{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E71FECF-E090-409E-8551-C597F9DFB91C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E71FECF-E090-409E-8551-C597F9DFB91C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E71FECF-E090-409E-8551-C597F9DFB91C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E71FECF-E090-409E-8551-C597F9DFB91C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE9DB9A7-D9AE-4188-945C-393D70022D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE9DB9A7-D9AE-4188-945C-393D70022D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE9DB9A7-D9AE-4188-945C-393D70022D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE9DB9A7-D9AE-4188-945C-393D70022D9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AECEE8DD-09AE-4DEA-8690-F76A37C0534B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AECEE8DD-09AE-4DEA-8690-F76A37C0534B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AECEE8DD-09AE-4DEA-8690-F76A37C0534B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AECEE8DD-09AE-4DEA-8690-F76A37C0534B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A41D3299-5E41-4B73-8C8E-DD64824BC9E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A41D3299-5E41-4B73-8C8E-DD64824BC9E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A41D3299-5E41-4B73-8C8E-DD64824BC9E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A41D3299-5E41-4B73-8C8E-DD64824BC9E6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -115,6 +144,11 @@ Global
 		{325C4ECE-BD4A-4CF2-BC80-FBD1024B5935} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
 		{C3B3F515-0305-4809-A9A8-37FD80428F74} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
 		{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
+		{8E71FECF-E090-409E-8551-C597F9DFB91C} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
+		{FE9DB9A7-D9AE-4188-945C-393D70022D9A} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
+		{AECEE8DD-09AE-4DEA-8690-F76A37C0534B} = {2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF}
+		{D56F2979-D6BC-4EF2-BB9B-4077B3290599} = {2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF}
+		{A41D3299-5E41-4B73-8C8E-DD64824BC9E6} = {8B5230E5-8138-44D6-839F-DF9248F195EE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {047855A4-470F-43B1-8B74-69651DD6B8A6}

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## Version 2.8.0-beta3
+- [Make W3C Correlation default and leverage native W3C support from Activity.](https://github.com/microsoft/ApplicationInsights-aspnetcore/pull/958)
+- [Make W3C Correlation default and leverage native W3C support from Activity for Asp.Net Core 3.0.](https://github.com/microsoft/ApplicationInsights-aspnetcore/pull/958)
+- [Fix: Azure Functions performance degradation when W3C enabled.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/900)
+- [Fix: AppId is never set is Response Headers.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/956)
+- [Support correlation-context in absence of request-id or traceparent.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/901)
+- [Non Product - Asp.Net Core 3.0 Functional Tests Added. This leverages the built-in integration test capability of ASP.NET Core via Microsoft.AspNetCore.MVC.Testing](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/539)
+- [Fix: System.NullReferenceException in WebSessionTelemetryInitializer.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/903)
+- Updated Base SDK/Web SDK/Logging Adaptor SDK version dependency to 2.11.0-beta2
+- Updated System.Diagnostics.DiagnosticSource to 4.6.0-preview8.
+
+- [Add new package for .NET Core WorkerServices (Adds GenericHost support)](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/708)
+
 ## Version 2.8.0-beta2
 - [Fix MVCBeforeAction property fetcher to work with .NET Core 3.0 changes.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/936)
 - [Catch generic exception from DiagnosticSourceListeners and log instead of failing user request.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/957)

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

@@ -72,6 +72,7 @@ public static StringValues SetHeaderKeyValue(string[] currentHeaders, string key
         /// Http Headers only allow Printable US-ASCII characters.
         /// Remove all other characters.
         /// </summary>
+        /// <returns>sanitized string.</returns>
         public static string SanitizeString(string input)
         {
             if (string.IsNullOrWhiteSpace(input))