Skip to content

Commit ab7db2e

Browse files
snakefootsnakefoot
authored
Merge branch 'develop' into develop
2 parents f925686 + a3b2089 commit ab7db2e

File tree

179 files changed

+4679
-765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+4679
-765
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
## Build
2323

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

‎.github/ISSUE_TEMPLATE/azure_snapshot_debugger_issue.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ name: Issue with Application Insights Snapshot Debugger
33
about: Need help with Application Insights Snapshot Debugger
44
---
55

6-
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/).
6+
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.
7+
8+
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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,8 @@ We will close this issue if:
2020

2121
* The repro project you share with us is complex. We can't investigate custom projects, so don't point us to such, please.
2222
* If we will not be able to repro the behavior you're reporting
23+
24+
### For Immediate Support
25+
26+
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.
27+
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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "nuget"
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "daily"

‎.props/Product.props

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,24 @@
99
<Import Project=".\_AnalyzerSettings.props" />
1010

1111
<Import Project=".\_GlobalStaticVersion.props" />
12-
<Import Project=".\_Nupkg.props" />
12+
<Import Project=".\_Nupkg.props" Condition="'$(IsExamplesSolution)' != 'true'"/>
1313

1414
<ItemGroup Condition=" $(OS) == 'Windows_NT'">
1515
<!--Analyzers-->
16+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
17+
<PrivateAssets>All</PrivateAssets>
18+
</PackageReference>
1619
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1720
<PrivateAssets>All</PrivateAssets>
1821
</PackageReference>
19-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
22+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
2023
<PrivateAssets>All</PrivateAssets>
2124
</PackageReference>
22-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0">
25+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2">
2326
<PrivateAssets>all</PrivateAssets>
2427
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2528
</PackageReference>
26-
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.0">
29+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.2">
2730
<PrivateAssets>All</PrivateAssets>
2831
</PackageReference>
2932
</ItemGroup>
@@ -40,6 +43,16 @@
4043
</ItemGroup>
4144

4245
<PropertyGroup>
46+
<!-- Enable all the latest CA rules from 'Microsoft.CodeAnalysis.NetAnalyzers' as build warnings by default -->
47+
48+
<AnalysisLevel>latest</AnalysisLevel>
49+
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
50+
51+
<!-- This appears to create a conflict between using built-in analyzers and the NuGetPackage. -->
52+
<!--<EnableNETAnalyzers>true</EnableNETAnalyzers>-->
53+
54+
55+
4356
<!--Removing the SRC folder from the output directory-->
4457
<CorePath>$(RelativeOutputPathBase)</CorePath>
4558
<OutputPath>$(BinRoot)\$(Configuration)\$(CorePath)</OutputPath>

‎.props/_GlobalStaticVersion.props

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Update for every public release.
1212
-->
1313
<SemanticVersionMajor>2</SemanticVersionMajor>
14-
<SemanticVersionMinor>16</SemanticVersionMinor> <!-- If changing the Minor version, also update the Date value. -->
14+
<SemanticVersionMinor>18</SemanticVersionMinor> <!-- If changing the Minor version, also update the Date value. -->
1515
<SemanticVersionPatch>0</SemanticVersionPatch>
1616
<PreReleaseMilestone>beta1</PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
1717
<PreReleaseMilestone Condition="'$(NightlyBuild)' == 'True'">nightly</PreReleaseMilestone> <!-- Overwrite this property for nightly builds from the DEVELOP branch. -->
@@ -22,13 +22,16 @@
2222
as it will restart file versions so 2.4.0-beta1 may have higher
2323
file version (like 2.4.0.2222) than 2.4.0-beta2 (like 2.4.0.1111)
2424
-->
25-
<SemanticVersionDate>2020-09-08</SemanticVersionDate>
25+
<SemanticVersionDate>2021-02-19</SemanticVersionDate>
2626

2727
<!--
28-
Pre-release version is used to distinguish internally built NuGet packages.
29-
Pre-release version = Minutes since semantic version was set, divided by 5 (to make it fit in a UInt16 (max 65535 = ~7 months).
28+
BuildNumber uniquely identifies all builds (The max allowed value is UInt16.MaxValue = 65535).
29+
The BuildNumber is used for nightly build package name and DLL assembly version.
30+
NuGet uses alphanumeric sorting, so this value is padded with zeros.
31+
BuildNumber = Hours since semantic version was set, divided by 12 (~89 years).
3032
-->
31-
<BuildNumber>$([MSBuild]::Divide($([System.DateTime]::Now.Subtract($([System.DateTime]::Parse($(SemanticVersionDate)))).TotalMinutes), 5).ToString('F0'))</BuildNumber>
33+
<BuildNumberHours>$([MSBuild]::Divide($([System.DateTime]::Now.Subtract($([System.DateTime]::Parse($(SemanticVersionDate)))).TotalHours), 12))</BuildNumberHours>
34+
<BuildNumber>$([System.Math]::Floor($(BuildNumberHours)).ToString('F0').PadLeft(5, '0'))</BuildNumber>
3235

3336
<VersionPrefix>$(SemanticVersionMajor).$(SemanticVersionMinor).$(SemanticVersionPatch)</VersionPrefix>
3437
<VersionSuffix>$(PreReleaseMilestone)</VersionSuffix>

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.AppIdMaxLength = 50 -> int
2+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderKeyMaxLength = 50 -> int
3+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderValueMaxLength = 1024 -> int
4+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.QuickPulseResponseHeaderMaxLength = 1024 -> int
5+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.RequestHeaderMaxLength = 1024 -> int
6+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceParentHeaderMaxLength = 55 -> int
7+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateHeaderMaxLength = 512 -> int
8+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateMaxPairs = 32 -> int
9+
const Microsoft.ApplicationInsights.W3C.W3CConstants.ApplicationIdTraceStateField = "cid-v1" -> string
10+
const Microsoft.ApplicationInsights.W3C.W3CConstants.AzureTracestateNamespace = "az" -> string
11+
const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceParentHeader = "traceparent" -> string
12+
const Microsoft.ApplicationInsights.W3C.W3CConstants.TracestateAzureSeparator = ';' -> char
13+
const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceStateHeader = "tracestate" -> string
114
Microsoft.ApplicationInsights.Common.ActiveSubsciptionManager
215
Microsoft.ApplicationInsights.Common.ActiveSubsciptionManager.ActiveSubsciptionManager() -> void
316
Microsoft.ApplicationInsights.Common.ActiveSubsciptionManager.Attach(object subscription) -> void
@@ -39,19 +52,6 @@ Microsoft.ApplicationInsights.W3C.W3CConstants
3952
Microsoft.ApplicationInsights.W3C.W3COperationCorrelationTelemetryInitializer
4053
Microsoft.ApplicationInsights.W3C.W3COperationCorrelationTelemetryInitializer.Initialize(Microsoft.ApplicationInsights.Channel.ITelemetry telemetry) -> void
4154
Microsoft.ApplicationInsights.W3C.W3COperationCorrelationTelemetryInitializer.W3COperationCorrelationTelemetryInitializer() -> void
42-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.AppIdMaxLength = 50 -> int
43-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderKeyMaxLength = 50 -> int
44-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderValueMaxLength = 1024 -> int
45-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.QuickPulseResponseHeaderMaxLength = 1024 -> int
46-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.RequestHeaderMaxLength = 1024 -> int
47-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceParentHeaderMaxLength = 55 -> int
48-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateHeaderMaxLength = 512 -> int
49-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateMaxPairs = 32 -> int
50-
const Microsoft.ApplicationInsights.W3C.W3CConstants.ApplicationIdTraceStateField = "cid-v1" -> string
51-
const Microsoft.ApplicationInsights.W3C.W3CConstants.AzureTracestateNamespace = "az" -> string
52-
const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceParentHeader = "traceparent" -> string
53-
const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceStateHeader = "tracestate" -> string
54-
const Microsoft.ApplicationInsights.W3C.W3CConstants.TracestateAzureSeparator = ';' -> char
5555
static Microsoft.ApplicationInsights.Common.ConditionalWeakTableExtensions.AddIfNotExists<TKey, TValue>(this System.Runtime.CompilerServices.ConditionalWeakTable<TKey, TValue> conditionalWeakTable, TKey key, TValue value) -> void
5656
static Microsoft.ApplicationInsights.Common.StringUtilities.EnforceMaxLength(string input, int maxLength) -> string
5757
static Microsoft.ApplicationInsights.Common.StringUtilities.FormatRequestId(string traceId, string spanId) -> string
@@ -69,4 +69,4 @@ static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.IsW3CActivity(thi
6969
static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.SetTraceparent(this System.Diagnostics.Activity activity, string value) -> void
7070
static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.SetTracestate(this System.Diagnostics.Activity activity, string value) -> void
7171
static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.UpdateContextOnActivity(this System.Diagnostics.Activity activity) -> System.Diagnostics.Activity
72-
virtual Microsoft.ApplicationInsights.DependencyCollector.DependencyTrackingTelemetryModule.Dispose(bool disposing) -> void
72+
virtual Microsoft.ApplicationInsights.DependencyCollector.DependencyTrackingTelemetryModule.Dispose(bool disposing) -> void

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.AppIdMaxLength = 50 -> int
2+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderKeyMaxLength = 50 -> int
3+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderValueMaxLength = 1024 -> int
4+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.QuickPulseResponseHeaderMaxLength = 1024 -> int
5+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.RequestHeaderMaxLength = 1024 -> int
6+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceParentHeaderMaxLength = 55 -> int
7+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateHeaderMaxLength = 512 -> int
8+
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateMaxPairs = 32 -> int
9+
const Microsoft.ApplicationInsights.W3C.W3CConstants.ApplicationIdTraceStateField = "cid-v1" -> string
10+
const Microsoft.ApplicationInsights.W3C.W3CConstants.AzureTracestateNamespace = "az" -> string
11+
const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceParentHeader = "traceparent" -> string
12+
const Microsoft.ApplicationInsights.W3C.W3CConstants.TracestateAzureSeparator = ';' -> char
13+
const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceStateHeader = "tracestate" -> string
114
Microsoft.ApplicationInsights.Common.ActiveSubsciptionManager
215
Microsoft.ApplicationInsights.Common.ActiveSubsciptionManager.ActiveSubsciptionManager() -> void
316
Microsoft.ApplicationInsights.Common.ActiveSubsciptionManager.Attach(object subscription) -> void
@@ -38,19 +51,6 @@ Microsoft.ApplicationInsights.W3C.W3CConstants
3851
Microsoft.ApplicationInsights.W3C.W3COperationCorrelationTelemetryInitializer
3952
Microsoft.ApplicationInsights.W3C.W3COperationCorrelationTelemetryInitializer.Initialize(Microsoft.ApplicationInsights.Channel.ITelemetry telemetry) -> void
4053
Microsoft.ApplicationInsights.W3C.W3COperationCorrelationTelemetryInitializer.W3COperationCorrelationTelemetryInitializer() -> void
41-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.AppIdMaxLength = 50 -> int
42-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderKeyMaxLength = 50 -> int
43-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.ContextHeaderValueMaxLength = 1024 -> int
44-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.QuickPulseResponseHeaderMaxLength = 1024 -> int
45-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.RequestHeaderMaxLength = 1024 -> int
46-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceParentHeaderMaxLength = 55 -> int
47-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateHeaderMaxLength = 512 -> int
48-
const Microsoft.ApplicationInsights.Common.InjectionGuardConstants.TraceStateMaxPairs = 32 -> int
49-
const Microsoft.ApplicationInsights.W3C.W3CConstants.ApplicationIdTraceStateField = "cid-v1" -> string
50-
const Microsoft.ApplicationInsights.W3C.W3CConstants.AzureTracestateNamespace = "az" -> string
51-
const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceParentHeader = "traceparent" -> string
52-
const Microsoft.ApplicationInsights.W3C.W3CConstants.TraceStateHeader = "tracestate" -> string
53-
const Microsoft.ApplicationInsights.W3C.W3CConstants.TracestateAzureSeparator = ';' -> char
5454
static Microsoft.ApplicationInsights.Common.ConditionalWeakTableExtensions.AddIfNotExists<TKey, TValue>(this System.Runtime.CompilerServices.ConditionalWeakTable<TKey, TValue> conditionalWeakTable, TKey key, TValue value) -> void
5555
static Microsoft.ApplicationInsights.Common.StringUtilities.EnforceMaxLength(string input, int maxLength) -> string
5656
static Microsoft.ApplicationInsights.Common.StringUtilities.FormatRequestId(string traceId, string spanId) -> string
@@ -66,4 +66,4 @@ static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.IsW3CActivity(thi
6666
static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.SetTraceparent(this System.Diagnostics.Activity activity, string value) -> void
6767
static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.SetTracestate(this System.Diagnostics.Activity activity, string value) -> void
6868
static Microsoft.ApplicationInsights.W3C.W3CActivityExtensions.UpdateContextOnActivity(this System.Diagnostics.Activity activity) -> System.Diagnostics.Activity
69-
virtual Microsoft.ApplicationInsights.DependencyCollector.DependencyTrackingTelemetryModule.Dispose(bool disposing) -> void
69+
virtual Microsoft.ApplicationInsights.DependencyCollector.DependencyTrackingTelemetryModule.Dispose(bool disposing) -> void

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Microsoft.ApplicationInsights.Common.ConditionalWeakTableExtensions
22
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule
33
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.Counters.get -> System.Collections.Generic.IList<Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionRequest>
4-
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.UseEventSourceNameAsMetricsNamespace.get -> bool
5-
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.UseEventSourceNameAsMetricsNamespace.set -> void
64
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.Dispose() -> void
75
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.EventCounterCollectionModule() -> void
86
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.Initialize(Microsoft.ApplicationInsights.Extensibility.TelemetryConfiguration configuration) -> void
7+
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.UseEventSourceNameAsMetricsNamespace.get -> bool
8+
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.UseEventSourceNameAsMetricsNamespace.set -> void
99
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionRequest
1010
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionRequest.EventCounterCollectionRequest() -> void
1111
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionRequest.EventCounterCollectionRequest(string eventSourceName, string eventCounterName) -> void
@@ -14,4 +14,4 @@ Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCo
1414
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionRequest.EventSourceName.get -> string
1515
Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionRequest.EventSourceName.set -> void
1616
static Microsoft.ApplicationInsights.Common.ConditionalWeakTableExtensions.AddIfNotExists<TKey, TValue>(this System.Runtime.CompilerServices.ConditionalWeakTable<TKey, TValue> conditionalWeakTable, TKey key, TValue value) -> void
17-
virtual Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.Dispose(bool disposing) -> void
17+
virtual Microsoft.ApplicationInsights.Extensibility.EventCounterCollector.EventCounterCollectionModule.Dispose(bool disposing) -> void

0 commit comments

Comments
 (0)