Skip to content
This repository was archived by the owner on Jun 10, 2020. It is now read-only.

Commit cc33596

Browse files
cijothomascijothomas
authored
Merge pull request #872 from Microsoft/develop
Dev to master
2 parents c9b04f5 + 8b8c48c commit cc33596

19 files changed

+409
-380
lines changed

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
# Changelog
22

3+
## Version 2.7.0-beta4
4+
- [RequestTrackingTelemetryModule is modified to stop tracking exceptions by default, as exceptions are captured by ApplicationInsightsLoggerProvider.](https://github.com/Microsoft/ApplicationInsights-aspnetcore/issues/861)
5+
- Updated Web/Base SDK version dependency to 2.10.0-beta4
6+
- Updated Microsoft.Extensions.Logging.ApplicationInsights to 2.10.0-beta4
7+
- Reliability improvements with additional exception handling.
8+
39
## Version 2.7.0-beta3
410
- [Enables Microsoft.Extensions.Logging.ApplicationInsights.ApplicationInsightsLoggerProvider by default. If ApplicationInsightsLoggerProvider was enabled previously using ILoggerFactory extension method, please remove it to prevent duplicate logs.](https://github.com/Microsoft/ApplicationInsights-aspnetcore/issues/854)
511
- [Remove reference to Microsoft.Extensions.DiagnosticAdapter and use DiagnosticSource subscription APIs directly](https://github.com/Microsoft/ApplicationInsights-aspnetcore/pull/852)
612
- [Fix: NullReferenceException in ApplicationInsightsLogger.Log when exception contains a Data entry with a null value](https://github.com/Microsoft/ApplicationInsights-aspnetcore/issues/848)
13+
- [Performance fixes for GetUri, SetKeyHeaderValue, ConcurrentDictionary use and Telemetry Initializers](https://github.com/Microsoft/ApplicationInsights-aspnetcore/pull/864)
714

815
## Version 2.7.0-beta2
916
- Added NetStandard2.0 target.

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

+21-9
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ namespace Microsoft.ApplicationInsights.AspNetCore.DiagnosticListeners
55
using System.Linq;
66
using System.Text.RegularExpressions;
77
using Microsoft.ApplicationInsights.Common;
8+
using Microsoft.Extensions.Primitives;
89

910
/// <summary>
1011
/// Generic functions that can be used to get and set Http headers.
@@ -20,7 +21,7 @@ internal static class HeadersUtilities
2021
public static string GetHeaderKeyValue(IEnumerable<string> headerValues, string keyName)
2122
{
2223
if (headerValues != null)
23-
{
24+
{
2425
foreach (string keyNameValue in headerValues)
2526
{
2627
string[] keyNameValueParts = keyNameValue.Trim().Split('=');
@@ -38,22 +39,33 @@ public static string GetHeaderKeyValue(IEnumerable<string> headerValues, string
3839
/// <summary>
3940
/// Given the provided list of header value strings, return a comma-separated list of key
4041
/// name/value pairs with the provided keyName and keyValue. If the initial header value
41-
/// strings contains the key name, then the original key value should be replaced with the
42+
/// string contains the key name, then the original key value should be replaced with the
4243
/// provided key value. If the initial header value strings don't contain the key name,
4344
/// then the key name/value pair should be added to the comma-separated list and returned.
4445
/// </summary>
4546
/// <param name="headerValues">The existing header values that the key/value pair should be added to.</param>
4647
/// <param name="keyName">The name of the key to add.</param>
4748
/// <param name="keyValue">The value of the key to add.</param>
4849
/// <returns>The result of setting the provided key name/value pair into the provided headerValues.</returns>
49-
public static IEnumerable<string> SetHeaderKeyValue(IEnumerable<string> headerValues, string keyName, string keyValue)
50+
public static StringValues SetHeaderKeyValue(string[] currentHeaders, string key, string value)
5051
{
51-
string[] newHeaderKeyValue = new[] { string.Format(CultureInfo.InvariantCulture, "{0}={1}", keyName.Trim(), keyValue.Trim()) };
52-
return headerValues == null || !headerValues.Any()
53-
? newHeaderKeyValue
54-
: headerValues
55-
.Where(headerValue => !HeaderMatchesKey(headerValue, keyName))
56-
.Concat(newHeaderKeyValue);
52+
if (currentHeaders != null)
53+
{
54+
for (int index = 0; index < currentHeaders.Length; index++)
55+
{
56+
if (HeaderMatchesKey(currentHeaders[index], key))
57+
{
58+
currentHeaders[index] = string.Concat(key, "=", value);
59+
return currentHeaders;
60+
}
61+
}
62+
63+
return StringValues.Concat(currentHeaders, string.Concat(key, "=", value));
64+
}
65+
else
66+
{
67+
return string.Concat(key, "=", value);
68+
}
5769
}
5870

5971
/// <summary>

‎src/Microsoft.ApplicationInsights.AspNetCore/DiagnosticListeners/Implementation/HostingDiagnosticListener.cs

+89-65
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,15 @@ public void OnHttpRequestInStart(HttpContext httpContext)
161161
// with W3C support on .NET https://github.com/dotnet/corefx/issues/30331
162162

163163
newActivity = new Activity(ActivityCreatedByHostingDiagnosticListener);
164-
newActivity.SetParentId(StringUtilities.GenerateTraceId());
164+
if (this.enableW3CHeaders)
165+
{
166+
newActivity.GenerateW3CContext();
167+
newActivity.SetParentId(newActivity.GetTraceId());
168+
}
169+
else
170+
{
171+
newActivity.SetParentId(W3CUtilities.GenerateTraceId());
172+
}
165173
// end of workaround
166174
}
167175

@@ -257,7 +265,9 @@ public void OnBeginRequest(HttpContext httpContext, long timestamp)
257265
InjectionGuardConstants.RequestHeaderMaxLength);
258266
}
259267
}
260-
else if(!activity.IsW3CActivity())
268+
269+
// no headers
270+
else if (originalParentId == null)
261271
{
262272
// As a first step in supporting W3C protocol in ApplicationInsights,
263273
// we want to generate Activity Ids in the W3C compatible format.
@@ -266,8 +276,16 @@ public void OnBeginRequest(HttpContext httpContext, long timestamp)
266276
// So if there is no current Activity (i.e. there were no Request-Id header in the incoming request), we'll override ParentId on
267277
// the current Activity by the properly formatted one. This workaround should go away
268278
// with W3C support on .NET https://github.com/dotnet/corefx/issues/30331
269-
270-
activity.SetParentId(StringUtilities.GenerateTraceId());
279+
280+
if (this.enableW3CHeaders)
281+
{
282+
activity.GenerateW3CContext();
283+
activity.SetParentId(activity.GetTraceId());
284+
}
285+
else
286+
{
287+
activity.SetParentId(W3CUtilities.GenerateTraceId());
288+
}
271289

272290
// end of workaround
273291
}
@@ -337,6 +355,10 @@ private RequestTelemetry InitializeRequestTelemetry(HttpContext httpContext, Act
337355
requestTelemetry.Context.Operation.Id = activity.RootId;
338356
requestTelemetry.Id = activity.Id;
339357
}
358+
else
359+
{
360+
activity.UpdateTelemetry(requestTelemetry, false);
361+
}
340362

341363
foreach (var prop in activity.Baggage)
342364
{
@@ -346,7 +368,7 @@ private RequestTelemetry InitializeRequestTelemetry(HttpContext httpContext, Act
346368
}
347369
}
348370

349-
this.client.Initialize(requestTelemetry);
371+
this.client.InitializeInstrumentationKey(requestTelemetry);
350372

351373
requestTelemetry.Source = GetAppIdFromRequestHeader(httpContext.Request.Headers, requestTelemetry.Context.InstrumentationKey);
352374

@@ -490,10 +512,6 @@ private void SetW3CContext(IHeaderDictionary requestHeaders, Activity activity,
490512
InjectionGuardConstants.TraceParentHeaderMaxLength);
491513
activity.SetTraceparent(parentTraceParent);
492514
}
493-
else
494-
{
495-
activity.GenerateW3CContext();
496-
}
497515

498516
string[] traceStateValues = HttpHeadersUtilities.SafeGetCommaSeparatedHeaderValues(requestHeaders, W3C.W3CConstants.TraceStateHeader,
499517
InjectionGuardConstants.TraceStateHeaderMaxLength, InjectionGuardConstants.TraceStateMaxPairs);
@@ -568,63 +586,69 @@ public void OnNext(KeyValuePair<string, object> value)
568586
HttpContext httpContext = null;
569587
Exception exception = null;
570588
long? timestamp = null;
571-
572-
switch (value.Key)
589+
try
573590
{
574-
case "Microsoft.AspNetCore.Hosting.HttpRequestIn.Start":
575-
httpContext = this.httpContextFetcherStart.Fetch(value.Value) as HttpContext;
576-
if (httpContext != null)
577-
{
578-
this.OnHttpRequestInStart(httpContext);
579-
}
580-
break;
581-
case "Microsoft.AspNetCore.Hosting.HttpRequestIn.Stop":
582-
httpContext = this.httpContextFetcherStop.Fetch(value.Value) as HttpContext;
583-
if (httpContext != null)
584-
{
585-
this.OnHttpRequestInStop(httpContext);
586-
}
587-
break;
588-
case "Microsoft.AspNetCore.Hosting.BeginRequest":
589-
httpContext = this.httpContextFetcherBeginRequest.Fetch(value.Value) as HttpContext;
590-
timestamp = this.timestampFetcherBeginRequest.Fetch(value.Value) as long?;
591-
if (httpContext != null && timestamp.HasValue)
592-
{
593-
this.OnBeginRequest(httpContext, timestamp.Value);
594-
}
595-
break;
596-
case "Microsoft.AspNetCore.Hosting.EndRequest":
597-
httpContext = this.httpContextFetcherEndRequest.Fetch(value.Value) as HttpContext;
598-
timestamp = this.timestampFetcherEndRequest.Fetch(value.Value) as long?;
599-
if (httpContext != null && timestamp.HasValue)
600-
{
601-
this.OnEndRequest(httpContext, timestamp.Value);
602-
}
603-
break;
604-
case "Microsoft.AspNetCore.Diagnostics.UnhandledException":
605-
httpContext = this.httpContextFetcherDiagExceptionUnhandled.Fetch(value.Value) as HttpContext;
606-
exception = this.exceptionFetcherDiagExceptionUnhandled.Fetch(value.Value) as Exception;
607-
if (httpContext != null && exception != null)
608-
{
609-
this.OnDiagnosticsUnhandledException(httpContext, exception);
610-
}
611-
break;
612-
case "Microsoft.AspNetCore.Diagnostics.HandledException":
613-
httpContext = this.httpContextFetcherDiagExceptionHandled.Fetch(value.Value) as HttpContext;
614-
exception = this.exceptionFetcherDiagExceptionHandled.Fetch(value.Value) as Exception;
615-
if (httpContext != null && exception != null)
616-
{
617-
this.OnDiagnosticsHandledException(httpContext, exception);
618-
}
619-
break;
620-
case "Microsoft.AspNetCore.Hosting.UnhandledException":
621-
httpContext = this.httpContextFetcherHostingExceptionUnhandled.Fetch(value.Value) as HttpContext;
622-
exception = this.exceptionFetcherHostingExceptionUnhandled.Fetch(value.Value) as Exception;
623-
if (httpContext != null && exception != null)
624-
{
625-
this.OnHostingException(httpContext, exception);
626-
}
627-
break;
591+
switch (value.Key)
592+
{
593+
case "Microsoft.AspNetCore.Hosting.HttpRequestIn.Start":
594+
httpContext = this.httpContextFetcherStart.Fetch(value.Value) as HttpContext;
595+
if (httpContext != null)
596+
{
597+
this.OnHttpRequestInStart(httpContext);
598+
}
599+
break;
600+
case "Microsoft.AspNetCore.Hosting.HttpRequestIn.Stop":
601+
httpContext = this.httpContextFetcherStop.Fetch(value.Value) as HttpContext;
602+
if (httpContext != null)
603+
{
604+
this.OnHttpRequestInStop(httpContext);
605+
}
606+
break;
607+
case "Microsoft.AspNetCore.Hosting.BeginRequest":
608+
httpContext = this.httpContextFetcherBeginRequest.Fetch(value.Value) as HttpContext;
609+
timestamp = this.timestampFetcherBeginRequest.Fetch(value.Value) as long?;
610+
if (httpContext != null && timestamp.HasValue)
611+
{
612+
this.OnBeginRequest(httpContext, timestamp.Value);
613+
}
614+
break;
615+
case "Microsoft.AspNetCore.Hosting.EndRequest":
616+
httpContext = this.httpContextFetcherEndRequest.Fetch(value.Value) as HttpContext;
617+
timestamp = this.timestampFetcherEndRequest.Fetch(value.Value) as long?;
618+
if (httpContext != null && timestamp.HasValue)
619+
{
620+
this.OnEndRequest(httpContext, timestamp.Value);
621+
}
622+
break;
623+
case "Microsoft.AspNetCore.Diagnostics.UnhandledException":
624+
httpContext = this.httpContextFetcherDiagExceptionUnhandled.Fetch(value.Value) as HttpContext;
625+
exception = this.exceptionFetcherDiagExceptionUnhandled.Fetch(value.Value) as Exception;
626+
if (httpContext != null && exception != null)
627+
{
628+
this.OnDiagnosticsUnhandledException(httpContext, exception);
629+
}
630+
break;
631+
case "Microsoft.AspNetCore.Diagnostics.HandledException":
632+
httpContext = this.httpContextFetcherDiagExceptionHandled.Fetch(value.Value) as HttpContext;
633+
exception = this.exceptionFetcherDiagExceptionHandled.Fetch(value.Value) as Exception;
634+
if (httpContext != null && exception != null)
635+
{
636+
this.OnDiagnosticsHandledException(httpContext, exception);
637+
}
638+
break;
639+
case "Microsoft.AspNetCore.Hosting.UnhandledException":
640+
httpContext = this.httpContextFetcherHostingExceptionUnhandled.Fetch(value.Value) as HttpContext;
641+
exception = this.exceptionFetcherHostingExceptionUnhandled.Fetch(value.Value) as Exception;
642+
if (httpContext != null && exception != null)
643+
{
644+
this.OnHostingException(httpContext, exception);
645+
}
646+
break;
647+
}
648+
}
649+
catch (Exception ex)
650+
{
651+
AspNetCoreEventSource.Instance.DiagnosticListenerWarning("HostingDiagnosticListener", value.Key, ex.Message);
628652
}
629653
}
630654

‎src/Microsoft.ApplicationInsights.AspNetCore/DiagnosticListeners/Implementation/HttpHeadersUtilities.cs

+1-18
Original file line numberDiff line numberDiff line change
@@ -65,36 +65,19 @@ internal static bool ContainsRequestContextKeyValue(IHeaderDictionary headers, s
6565
return !string.IsNullOrEmpty(GetHeaderKeyValue(headers, RequestResponseHeaders.RequestContextHeader, keyName));
6666
}
6767

68-
internal static void SetRequestContextKeyValue(HttpHeaders headers, string keyName, string keyValue)
69-
{
70-
SetHeaderKeyValue(headers, RequestResponseHeaders.RequestContextHeader, keyName, keyValue);
71-
}
72-
7368
internal static void SetRequestContextKeyValue(IHeaderDictionary headers, string keyName, string keyValue)
7469
{
7570
SetHeaderKeyValue(headers, RequestResponseHeaders.RequestContextHeader, keyName, keyValue);
7671
}
7772

78-
internal static void SetHeaderKeyValue(HttpHeaders headers, string headerName, string keyName, string keyValue)
79-
{
80-
if (headers == null)
81-
{
82-
throw new ArgumentNullException(nameof(headers));
83-
}
84-
85-
IEnumerable<string> headerValues = GetHeaderValues(headers, headerName);
86-
headers.Remove(headerName);
87-
headers.Add(headerName, HeadersUtilities.SetHeaderKeyValue(headerValues, keyName, keyValue));
88-
}
89-
9073
internal static void SetHeaderKeyValue(IHeaderDictionary headers, string headerName, string keyName, string keyValue)
9174
{
9275
if (headers == null)
9376
{
9477
throw new ArgumentNullException(nameof(headers));
9578
}
9679

97-
headers[headerName] = new StringValues(HeadersUtilities.SetHeaderKeyValue(headers[headerName].AsEnumerable(), keyName, keyValue).ToArray());
80+
headers[headerName] = HeadersUtilities.SetHeaderKeyValue(headers[headerName], keyName, keyValue);
9881
}
9982

10083
internal static string[] SafeGetCommaSeparatedHeaderValues(IHeaderDictionary headers, string headerName, int maxLength, int maxItems)

‎src/Microsoft.ApplicationInsights.AspNetCore/DiagnosticListeners/Implementation/MvcDiagnosticsListener.cs

+15-7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ namespace Microsoft.ApplicationInsights.AspNetCore.DiagnosticListeners
44
using System.Collections.Generic;
55
using System.Linq;
66
using Microsoft.ApplicationInsights.AspNetCore.DiagnosticListeners.Implementation;
7+
using Microsoft.ApplicationInsights.AspNetCore.Extensibility.Implementation.Tracing;
78
using Microsoft.ApplicationInsights.DataContracts;
89
using Microsoft.AspNetCore.Http;
910

@@ -102,17 +103,24 @@ public void OnSubscribe()
102103
/// <inheritdoc />
103104
public void OnNext(KeyValuePair<string, object> value)
104105
{
105-
if (value.Key == "Microsoft.AspNetCore.Mvc.BeforeAction")
106+
try
106107
{
107-
var context = httpContextFetcher.Fetch(value.Value) as HttpContext;
108-
var routeData = routeDataFetcher.Fetch(value.Value);
109-
var routeValues = routeValuesFetcher.Fetch(routeData) as IDictionary<string, object>;
110-
111-
if (context != null && routeValues != null)
108+
if (value.Key == "Microsoft.AspNetCore.Mvc.BeforeAction")
112109
{
113-
this.OnBeforeAction(context, routeValues);
110+
var context = httpContextFetcher.Fetch(value.Value) as HttpContext;
111+
var routeData = routeDataFetcher.Fetch(value.Value);
112+
var routeValues = routeValuesFetcher.Fetch(routeData) as IDictionary<string, object>;
113+
114+
if (context != null && routeValues != null)
115+
{
116+
this.OnBeforeAction(context, routeValues);
117+
}
114118
}
115119
}
120+
catch (Exception ex)
121+
{
122+
AspNetCoreEventSource.Instance.DiagnosticListenerWarning("MvcDiagnosticsListener", value.Key, ex.Message);
123+
}
116124
}
117125

118126
/// <inheritdoc />

0 commit comments

Comments
 (0)