Skip to content

Commit

Permalink
Merge pull request #2172 from microsoft/develop
Browse files Browse the repository at this point in the history
merge DEVELOP to MASTER (prep 2.17.0 Stable)
  • Loading branch information
TimothyMothra committed Feb 12, 2021
2 parents 31c0aa6 + 96d5d92 commit c9d95e7
Show file tree
Hide file tree
Showing 44 changed files with 379 additions and 320 deletions.
2 changes: 1 addition & 1 deletion .props/_GlobalStaticVersion.props
Expand Up @@ -13,7 +13,7 @@
<SemanticVersionMajor>2</SemanticVersionMajor>
<SemanticVersionMinor>17</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></PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
<PreReleaseMilestone Condition="'$(NightlyBuild)' == 'True'">nightly</PreReleaseMilestone> <!-- Overwrite this property for nightly builds from the DEVELOP branch. -->
<!--
Date when Semantic Version was changed.
Expand Down
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
@@ -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
Expand All @@ -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
Expand Up @@ -33,4 +33,4 @@ Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.Quic
Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.QuickPulseTelemetryProcessor.Initialize(Microsoft.ApplicationInsights.Extensibility.TelemetryConfiguration configuration) -> void
Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.QuickPulseTelemetryProcessor.Process(Microsoft.ApplicationInsights.Channel.ITelemetry telemetry) -> void
Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.QuickPulseTelemetryProcessor.QuickPulseTelemetryProcessor(Microsoft.ApplicationInsights.Extensibility.ITelemetryProcessor next) -> void
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.ConditionalWeakTableExtensions.AddIfNotExists<TKey, TValue>(this System.Runtime.CompilerServices.ConditionalWeakTable<TKey, TValue> conditionalWeakTable, TKey key, TValue value) -> void
Expand Up @@ -33,4 +33,4 @@ Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.Quic
Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.QuickPulseTelemetryProcessor.Initialize(Microsoft.ApplicationInsights.Extensibility.TelemetryConfiguration configuration) -> void
Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.QuickPulseTelemetryProcessor.Process(Microsoft.ApplicationInsights.Channel.ITelemetry telemetry) -> void
Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.QuickPulseTelemetryProcessor.QuickPulseTelemetryProcessor(Microsoft.ApplicationInsights.Extensibility.ITelemetryProcessor next) -> void
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.ConditionalWeakTableExtensions.AddIfNotExists<TKey, TValue>(this System.Runtime.CompilerServices.ConditionalWeakTable<TKey, TValue> conditionalWeakTable, TKey key, TValue value) -> void
6 changes: 3 additions & 3 deletions .publicApi/Microsoft.AI.Web.dll/net452/PublicAPI.Shipped.txt
Expand Up @@ -81,8 +81,6 @@ Microsoft.ApplicationInsights.Web.UserTelemetryInitializer
Microsoft.ApplicationInsights.Web.UserTelemetryInitializer.UserTelemetryInitializer() -> void
Microsoft.ApplicationInsights.Web.WebTestTelemetryInitializer
Microsoft.ApplicationInsights.Web.WebTestTelemetryInitializer.WebTestTelemetryInitializer() -> void
System.Web.HttpContextBaseExtension
System.Web.HttpContextExtension
override Microsoft.ApplicationInsights.Web.AccountIdTelemetryInitializer.OnInitializeTelemetry(System.Web.HttpContext platformContext, Microsoft.ApplicationInsights.DataContracts.RequestTelemetry requestTelemetry, Microsoft.ApplicationInsights.Channel.ITelemetry telemetry) -> void
override Microsoft.ApplicationInsights.Web.AuthenticatedUserIdTelemetryInitializer.OnInitializeTelemetry(System.Web.HttpContext platformContext, Microsoft.ApplicationInsights.DataContracts.RequestTelemetry requestTelemetry, Microsoft.ApplicationInsights.Channel.ITelemetry telemetry) -> void
override Microsoft.ApplicationInsights.Web.ClientIpHeaderTelemetryInitializer.OnInitializeTelemetry(System.Web.HttpContext platformContext, Microsoft.ApplicationInsights.DataContracts.RequestTelemetry requestTelemetry, Microsoft.ApplicationInsights.Channel.ITelemetry telemetry) -> void
Expand All @@ -95,10 +93,12 @@ override Microsoft.ApplicationInsights.Web.WebTestTelemetryInitializer.OnInitial
static Microsoft.ApplicationInsights.Common.ConditionalWeakTableExtensions.AddIfNotExists<TKey, TValue>(this System.Runtime.CompilerServices.ConditionalWeakTable<TKey, TValue> conditionalWeakTable, TKey key, TValue value) -> void
static System.Web.HttpContextBaseExtension.GetRequestTelemetry(this System.Web.HttpContextBase context) -> Microsoft.ApplicationInsights.DataContracts.RequestTelemetry
static System.Web.HttpContextExtension.GetRequestTelemetry(this System.Web.HttpContext context) -> Microsoft.ApplicationInsights.DataContracts.RequestTelemetry
System.Web.HttpContextBaseExtension
System.Web.HttpContextExtension
virtual Microsoft.ApplicationInsights.Web.AspNetDiagnosticTelemetryModule.Dispose(bool dispose) -> void
virtual Microsoft.ApplicationInsights.Web.AzureAppServiceRoleNameFromHostNameHeaderInitializer.GetRequestFromContext(System.Web.HttpContext context) -> Microsoft.ApplicationInsights.DataContracts.RequestTelemetry
virtual Microsoft.ApplicationInsights.Web.AzureAppServiceRoleNameFromHostNameHeaderInitializer.ResolvePlatformContext() -> System.Web.HttpContext
virtual Microsoft.ApplicationInsights.Web.ExceptionTrackingTelemetryModule.Dispose(bool disposing) -> void
virtual Microsoft.ApplicationInsights.Web.Implementation.WebTelemetryModuleBase.OnBeginRequest(Microsoft.ApplicationInsights.DataContracts.RequestTelemetry requestTelemetry, System.Web.HttpContext platformContext) -> void
virtual Microsoft.ApplicationInsights.Web.Implementation.WebTelemetryModuleBase.OnEndRequest(Microsoft.ApplicationInsights.DataContracts.RequestTelemetry requestTelemetry, System.Web.HttpContext platformContext) -> void
virtual Microsoft.ApplicationInsights.Web.Implementation.WebTelemetryModuleBase.OnError(Microsoft.ApplicationInsights.DataContracts.RequestTelemetry requestTelemetry, System.Web.HttpContext platformContext) -> void
virtual Microsoft.ApplicationInsights.Web.Implementation.WebTelemetryModuleBase.OnError(Microsoft.ApplicationInsights.DataContracts.RequestTelemetry requestTelemetry, System.Web.HttpContext platformContext) -> void

0 comments on commit c9d95e7

Please sign in to comment.