Merge branch 'develop' into develop

.github/CONTRIBUTING.md

@@ -22,7 +22,7 @@
 ## Build
 
 To successfully build the sources on your machine, make sure you've installed the following prerequisites:
-- Visual Studio 2019 Community or Enterprise
+- Visual Studio 2019 Community, Professional or Enterprise
 - .NET SDKs (https://dotnet.microsoft.com/download)
     - .NET 4.8
 	- .NET Core 3.1 SDK 

.github/ISSUE_TEMPLATE/azure_snapshot_debugger_issue.md

@@ -3,4 +3,6 @@ name: Issue with Application Insights Snapshot Debugger
 about: Need help with Application Insights Snapshot Debugger
 ---
 
-If you're seeing issue with [Application Insights Snapshot Debugger](https://docs.microsoft.com/azure/azure-monitor/app/snapshot-debugger), get support from [Azure Support Center](https://azure.microsoft.com/support/create-ticket/).
+If you encounter an issue with [Application Insights Snapshot Debugger](https://docs.microsoft.com/azure/azure-monitor/app/snapshot-debugger) in Azure, please check the [troubleshooting documentation](https://docs.microsoft.com/azure/azure-monitor/app/snapshot-debugger-troubleshoot). Use the [Azure Support Center](https://azure.microsoft.com/support/create-ticket/) to file a ticket if the troubleshooting document didn't help.
+
+Otherwise, please [file an issue](https://github.com/microsoft/ApplicationInsights-SnapshotCollector/issues/new/choose) in the Microsoft/ApplicationInsights-SnapshotCollector repo.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -20,3 +20,8 @@ We will close this issue if:
 
 * The repro project you share with us is complex. We can't investigate custom projects, so don't point us to such, please.
 * If we will not be able to repro the behavior you're reporting
+
+### For Immediate Support
+
+For immediate support relating to the Application Insights .NET SDK we encourage you to file an [Azure Support Request](https://docs.microsoft.com/azure/azure-portal/supportability/how-to-create-azure-support-request) with Microsoft Azure instead of filing a GitHub Issue in this repository. 
+You can do so by going online to the [Azure portal](https://portal.azure.com/) and submitting a support request. Access to subscription management and billing support is included with your Microsoft Azure subscription, and technical support is provided through one of the [Azure Support Plans](https://azure.microsoft.com/support/plans/). For step-by-step guidance for the Azure portal, see [How to create an Azure support request](https://docs.microsoft.com/azure/azure-portal/supportability/how-to-create-azure-support-request). Alternatively, you can create and manage your support tickets programmatically using the [Azure Support ticket REST API](https://docs.microsoft.com/rest/api/support/)

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "nuget"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.props/Product.props

@@ -9,21 +9,24 @@
   <Import Project=".\_AnalyzerSettings.props" />
 
   <Import Project=".\_GlobalStaticVersion.props" />
-  <Import Project=".\_Nupkg.props" />
+  <Import Project=".\_Nupkg.props"  Condition="'$(IsExamplesSolution)' != 'true'"/>
 
   <ItemGroup Condition=" $(OS) == 'Windows_NT'">
     <!--Analyzers-->
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0">	
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2">	
       <PrivateAssets>all</PrivateAssets>	
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>	
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.2">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>
@@ -40,6 +43,16 @@
   </ItemGroup>
 
   <PropertyGroup>
+    <!-- Enable all the latest CA rules from 'Microsoft.CodeAnalysis.NetAnalyzers' as build warnings by default -->
+
+    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+
+    <!-- This appears to create a conflict between using built-in analyzers and the NuGetPackage. -->
+    <!--<EnableNETAnalyzers>true</EnableNETAnalyzers>--> 
+
+
+
     <!--Removing the SRC folder from the output directory-->
     <CorePath>$(RelativeOutputPathBase)</CorePath>
     <OutputPath>$(BinRoot)\$(Configuration)\$(CorePath)</OutputPath>

.props/_GlobalStaticVersion.props

@@ -11,7 +11,7 @@
       Update for every public release. 
     -->
     <SemanticVersionMajor>2</SemanticVersionMajor>
-    <SemanticVersionMinor>16</SemanticVersionMinor> <!-- If changing the Minor version, also update the Date value. -->
+    <SemanticVersionMinor>18</SemanticVersionMinor> <!-- If changing the Minor version, also update the Date value. -->
     <SemanticVersionPatch>0</SemanticVersionPatch>
     <PreReleaseMilestone>beta1</PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
     <PreReleaseMilestone Condition="'$(NightlyBuild)' == 'True'">nightly</PreReleaseMilestone> <!-- Overwrite this property for nightly builds from the DEVELOP branch. -->
@@ -22,13 +22,16 @@
       as it will restart file versions so 2.4.0-beta1 may have higher 
       file version (like 2.4.0.2222) than 2.4.0-beta2 (like 2.4.0.1111)
     -->
-    <SemanticVersionDate>2020-09-08</SemanticVersionDate>
+    <SemanticVersionDate>2021-02-19</SemanticVersionDate>
 
     <!--
-      Pre-release version is used to distinguish internally built NuGet packages.
-      Pre-release version = Minutes since semantic version was set, divided by 5 (to make it fit in a UInt16 (max 65535 = ~7 months).
+      BuildNumber uniquely identifies all builds (The max allowed value is UInt16.MaxValue = 65535).
+      The BuildNumber is used for nightly build package name and DLL assembly version.
+      NuGet uses alphanumeric sorting, so this value is padded with zeros.
+      BuildNumber = Hours since semantic version was set, divided by 12 (~89 years).
     -->
-    <BuildNumber>$([MSBuild]::Divide($([System.DateTime]::Now.Subtract($([System.DateTime]::Parse($(SemanticVersionDate)))).TotalMinutes), 5).ToString('F0'))</BuildNumber>
+    <BuildNumberHours>$([MSBuild]::Divide($([System.DateTime]::Now.Subtract($([System.DateTime]::Parse($(SemanticVersionDate)))).TotalHours), 12))</BuildNumberHours>
+    <BuildNumber>$([System.Math]::Floor($(BuildNumberHours)).ToString('F0').PadLeft(5, '0'))</BuildNumber>
 
     <VersionPrefix>$(SemanticVersionMajor).$(SemanticVersionMinor).$(SemanticVersionPatch)</VersionPrefix>
     <VersionSuffix>$(PreReleaseMilestone)</VersionSuffix>

.publicApi/Microsoft.AI.DependencyCollector.dll/net452/PublicAPI.Shipped.txt

@@ -1,3 +1,16 @@
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.AppIdMaxLength = 50 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderKeyMaxLength = 50 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderValueMaxLength = 1024 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.QuickPulseResponseHeaderMaxLength = 1024 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.RequestHeaderMaxLength = 1024 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceParentHeaderMaxLength = 55 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateHeaderMaxLength = 512 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateMaxPairs = 32 -> int
+const Microsoft.ApplicationInsights.W3C.W3CConstants.ApplicationIdTraceStateField = "cid-v1" -> string
+const Microsoft.ApplicationInsights.W3C.W3CConstants.AzureTracestateNamespace = "az" -> string
+const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceParentHeader = "traceparent" -> string
+const Microsoft.ApplicationInsights.W3C.W3CConstants.TracestateAzureSeparator = ';' -> char
+const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceStateHeader = "tracestate" -> string
 Microsoft.ApplicationInsights.Common.ActiveSubsciptionManager
 Microsoft.ApplicationInsights.Common.ActiveSubsciptionManager.ActiveSubsciptionManager() -> void
 Microsoft.ApplicationInsights.Common.ActiveSubsciptionManager.Attach(object subscription) -> void
@@ -39,19 +52,6 @@ Microsoft.ApplicationInsights.W3C.W3CConstants
 Microsoft.ApplicationInsights.W3C.W3COperationCorrelationTelemetryInitializer
 Microsoft.ApplicationInsights.W3C.W3COperationCorrelationTelemetryInitializer.Initialize(Microsoft.ApplicationInsights.Channel.ITelemetry telemetry) -> void
 Microsoft.ApplicationInsights.W3C.W3COperationCorrelationTelemetryInitializer.W3COperationCorrelationTelemetryInitializer() -> void
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.AppIdMaxLength = 50 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderKeyMaxLength = 50 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderValueMaxLength = 1024 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.QuickPulseResponseHeaderMaxLength = 1024 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.RequestHeaderMaxLength = 1024 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceParentHeaderMaxLength = 55 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateHeaderMaxLength = 512 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateMaxPairs = 32 -> int
-const Microsoft.ApplicationInsights.W3C.W3CConstants.ApplicationIdTraceStateField = "cid-v1" -> string
-const Microsoft.ApplicationInsights.W3C.W3CConstants.AzureTracestateNamespace = "az" -> string
-const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceParentHeader = "traceparent" -> string
-const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceStateHeader = "tracestate" -> string
-const Microsoft.ApplicationInsights.W3C.W3CConstants.TracestateAzureSeparator = ';' -> char
 static Microsoft.ApplicationInsights.Common.ConditionalWeakTableExtensions.AddIfNotExists<TKey, TValue>(this System.Runtime.CompilerServices.ConditionalWeakTable<TKey, TValue> conditionalWeakTable, TKey key, TValue value) -> void
 static Microsoft.ApplicationInsights.Common.StringUtilities.EnforceMaxLength(string input, int maxLength) -> string
 static Microsoft.ApplicationInsights.Common.StringUtilities.FormatRequestId(string traceId, string spanId) -> string
@@ -69,4 +69,4 @@ static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.IsW3CActivity(thi
 static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.SetTraceparent(this System.Diagnostics.Activity activity, string value) -> void
 static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.SetTracestate(this System.Diagnostics.Activity activity, string value) -> void
 static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.UpdateContextOnActivity(this System.Diagnostics.Activity activity) -> System.Diagnostics.Activity
-virtual Microsoft.ApplicationInsights.DependencyCollector.DependencyTrackingTelemetryModule.Dispose(bool disposing) -> void
+virtual Microsoft.ApplicationInsights.DependencyCollector.DependencyTrackingTelemetryModule.Dispose(bool disposing) -> void

.publicApi/Microsoft.AI.DependencyCollector.dll/netstandard2.0/PublicAPI.Shipped.txt

@@ -1,3 +1,16 @@
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.AppIdMaxLength = 50 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderKeyMaxLength = 50 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderValueMaxLength = 1024 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.QuickPulseResponseHeaderMaxLength = 1024 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.RequestHeaderMaxLength = 1024 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceParentHeaderMaxLength = 55 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateHeaderMaxLength = 512 -> int
+const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateMaxPairs = 32 -> int
+const Microsoft.ApplicationInsights.W3C.W3CConstants.ApplicationIdTraceStateField = "cid-v1" -> string
+const Microsoft.ApplicationInsights.W3C.W3CConstants.AzureTracestateNamespace = "az" -> string
+const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceParentHeader = "traceparent" -> string
+const Microsoft.ApplicationInsights.W3C.W3CConstants.TracestateAzureSeparator = ';' -> char
+const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceStateHeader = "tracestate" -> string
 Microsoft.ApplicationInsights.Common.ActiveSubsciptionManager
 Microsoft.ApplicationInsights.Common.ActiveSubsciptionManager.ActiveSubsciptionManager() -> void
 Microsoft.ApplicationInsights.Common.ActiveSubsciptionManager.Attach(object subscription) -> void
@@ -38,19 +51,6 @@ Microsoft.ApplicationInsights.W3C.W3CConstants
 Microsoft.ApplicationInsights.W3C.W3COperationCorrelationTelemetryInitializer
 Microsoft.ApplicationInsights.W3C.W3COperationCorrelationTelemetryInitializer.Initialize(Microsoft.ApplicationInsights.Channel.ITelemetry telemetry) -> void
 Microsoft.ApplicationInsights.W3C.W3COperationCorrelationTelemetryInitializer.W3COperationCorrelationTelemetryInitializer() -> void
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.AppIdMaxLength = 50 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderKeyMaxLength = 50 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderValueMaxLength = 1024 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.QuickPulseResponseHeaderMaxLength = 1024 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.RequestHeaderMaxLength = 1024 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceParentHeaderMaxLength = 55 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateHeaderMaxLength = 512 -> int
-const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateMaxPairs = 32 -> int
-const Microsoft.ApplicationInsights.W3C.W3CConstants.ApplicationIdTraceStateField = "cid-v1" -> string
-const Microsoft.ApplicationInsights.W3C.W3CConstants.AzureTracestateNamespace = "az" -> string
-const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceParentHeader = "traceparent" -> string
-const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceStateHeader = "tracestate" -> string
-const Microsoft.ApplicationInsights.W3C.W3CConstants.TracestateAzureSeparator = ';' -> char
 static Microsoft.ApplicationInsights.Common.ConditionalWeakTableExtensions.AddIfNotExists<TKey, TValue>(this System.Runtime.CompilerServices.ConditionalWeakTable<TKey, TValue> conditionalWeakTable, TKey key, TValue value) -> void
 static Microsoft.ApplicationInsights.Common.StringUtilities.EnforceMaxLength(string input, int maxLength) -> string
 static Microsoft.ApplicationInsights.Common.StringUtilities.FormatRequestId(string traceId, string spanId) -> string
@@ -66,4 +66,4 @@ static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.IsW3CActivity(thi
 static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.SetTraceparent(this System.Diagnostics.Activity activity, string value) -> void
 static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.SetTracestate(this System.Diagnostics.Activity activity, string value) -> void
 static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.UpdateContextOnActivity(this System.Diagnostics.Activity activity) -> System.Diagnostics.Activity
-virtual Microsoft.ApplicationInsights.DependencyCollector.DependencyTrackingTelemetryModule.Dispose(bool disposing) -> void
+virtual Microsoft.ApplicationInsights.DependencyCollector.DependencyTrackingTelemetryModule.Dispose(bool disposing) -> void

.publicApi/Microsoft.AI.EventCounterCollector.dll/netstandard2.0/PublicAPI.Shipped.txt

@@ -1,11 +1,11 @@
 Microsoft.ApplicationInsights.Common.ConditionalWeakTableExtensions
 Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule
 Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.Counters.get -> System.Collections.Generic.IList<Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionRequest>
-Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.UseEventSourceNameAsMetricsNamespace.get -> bool
-Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.UseEventSourceNameAsMetricsNamespace.set -> void
 Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.Dispose() -> void
 Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.EventCounterCollectionModule() -> void
 Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.Initialize(Microsoft.ApplicationInsights.Extensibility.TelemetryConfiguration configuration) -> void
+Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.UseEventSourceNameAsMetricsNamespace.get -> bool
+Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.UseEventSourceNameAsMetricsNamespace.set -> void
 Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionRequest
 Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionRequest.EventCounterCollectionRequest() -> void
 Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionRequest.EventCounterCollectionRequest(string eventSourceName, string eventCounterName) -> void
@@ -14,4 +14,4 @@ Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCo
 Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionRequest.EventSourceName.get -> string
 Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionRequest.EventSourceName.set -> void
 static Microsoft.ApplicationInsights.Common.ConditionalWeakTableExtensions.AddIfNotExists<TKey, TValue>(this System.Runtime.CompilerServices.ConditionalWeakTable<TKey, TValue> conditionalWeakTable, TKey key, TValue value) -> void
-virtual Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.Dispose(bool disposing) -> void
+virtual Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.Dispose(bool disposing) -> void