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

Commit 61cb449

Browse files
author
Liudmila Molkova
authored
Merge pull request #881 from microsoft/develop
develop to master 2.10.0 stable
2 parents cc33596 + 7850004 commit 61cb449

File tree

5 files changed

+19
-42
lines changed

5 files changed

+19
-42
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## Version 2.7.0
4+
- Updated Web/Base SDK version dependency to 2.10.0
5+
- [Remove unused reference to System.Net.Http](https://github.com/microsoft/ApplicationInsights-aspnetcore/pull/879)
6+
37
## Version 2.7.0-beta4
48
- [RequestTrackingTelemetryModule is modified to stop tracking exceptions by default, as exceptions are captured by ApplicationInsightsLoggerProvider.](https://github.com/Microsoft/ApplicationInsights-aspnetcore/issues/861)
59
- Updated Web/Base SDK version dependency to 2.10.0-beta4

‎Readme.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ root\
3434
test\
3535
ApplicationInsights.AspNetCore.Tests - Unit tests
3636
FunctionalTestUtils - Test utilities for functional tests
37-
MVCFramework.FunctionalTests - functional tests for MVC application targetting NetCore1.1,NetCore2.0 and NET45
38-
WebApi.FunctionalTests - functional tests for Web API application targetting NetCore1.1,NetCore2.0 and NET45
39-
EmptyApp.FunctionalTests - functional tests for an Empty application targetting NetCore1.1,NetCore2.0 and NET45
37+
MVCFramework.FunctionalTests - functional tests for MVC application targeting NetCore1.1,NetCore2.0 and NET45
38+
WebApi.FunctionalTests - functional tests for Web API application targeting NetCore1.1,NetCore2.0 and NET45
39+
EmptyApp.FunctionalTests - functional tests for an Empty application targeting NetCore1.1,NetCore2.0 and NET45
4040
PerfTest - performance test
4141
```
4242

@@ -57,7 +57,7 @@ Execute the ```RunTests.cmd``` script in the repository root.
5757

5858
You can also open the solution in Visual Studio and run tests directly from Visual Studio Test Explorer. However, as the tests has multiple targets, Test Explorer only shows the first target
5959
from <TargetFrameworks> in .csproj. To debug/run tests from a particular TargetFramework with Visual Studio, only option is to re-arrange the <TargetFrameworks>
60-
such that the intented target comes first. This is a Visual Studio limitation and is likely removed in the future.
60+
such that the intended target comes first. This is a Visual Studio limitation and is likely removed in the future.
6161

6262

6363
Running and writing tests

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Diagnostics;
66
using System.Globalization;
77
using System.Linq;
8-
using System.Net.Http.Headers;
98
using System.Text;
109
using Extensibility.Implementation.Tracing;
1110
using Microsoft.ApplicationInsights.AspNetCore.DiagnosticListeners.Implementation;
@@ -550,10 +549,11 @@ private void ReadCorrelationContext(IHeaderDictionary requestHeaders, Activity a
550549
{
551550
foreach (var item in baggage)
552551
{
553-
if (NameValueHeaderValue.TryParse(item, out var baggageItem))
552+
var parts = item.Split('=');
553+
if (parts.Length == 2)
554554
{
555-
var itemName = StringUtilities.EnforceMaxLength(baggageItem.Name, InjectionGuardConstants.ContextHeaderKeyMaxLength);
556-
var itemValue = StringUtilities.EnforceMaxLength(baggageItem.Value, InjectionGuardConstants.ContextHeaderValueMaxLength);
555+
var itemName = StringUtilities.EnforceMaxLength(parts[0], InjectionGuardConstants.ContextHeaderKeyMaxLength);
556+
var itemValue = StringUtilities.EnforceMaxLength(parts[1], InjectionGuardConstants.ContextHeaderValueMaxLength);
557557
activity.AddBaggage(itemName, itemValue);
558558
}
559559
}

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

-26
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,6 @@ namespace Microsoft.ApplicationInsights.AspNetCore.DiagnosticListeners
99

1010
internal static class HttpHeadersUtilities
1111
{
12-
internal static IEnumerable<string> GetHeaderValues(HttpHeaders headers, string headerName)
13-
{
14-
IEnumerable<string> result;
15-
if (headers == null || !headers.TryGetValues(headerName, out result))
16-
{
17-
result = Enumerable.Empty<string>();
18-
}
19-
return result;
20-
}
21-
2212
internal static IEnumerable<string> GetHeaderValues(IHeaderDictionary headers, string headerName)
2313
{
2414
IEnumerable<string> result = Enumerable.Empty<string>();
@@ -33,33 +23,17 @@ internal static IEnumerable<string> GetHeaderValues(IHeaderDictionary headers, s
3323
return result;
3424
}
3525

36-
internal static string GetHeaderKeyValue(HttpHeaders headers, string headerName, string keyName)
37-
{
38-
IEnumerable<string> headerValues = GetHeaderValues(headers, headerName);
39-
return HeadersUtilities.GetHeaderKeyValue(headerValues, keyName);
40-
}
41-
4226
internal static string GetHeaderKeyValue(IHeaderDictionary headers, string headerName, string keyName)
4327
{
4428
IEnumerable<string> headerValues = GetHeaderValues(headers, headerName);
4529
return HeadersUtilities.GetHeaderKeyValue(headerValues, keyName);
4630
}
4731

48-
internal static string GetRequestContextKeyValue(HttpHeaders headers, string keyName)
49-
{
50-
return GetHeaderKeyValue(headers, RequestResponseHeaders.RequestContextHeader, keyName);
51-
}
52-
5332
internal static string GetRequestContextKeyValue(IHeaderDictionary headers, string keyName)
5433
{
5534
return GetHeaderKeyValue(headers, RequestResponseHeaders.RequestContextHeader, keyName);
5635
}
5736

58-
internal static bool ContainsRequestContextKeyValue(HttpHeaders headers, string keyName)
59-
{
60-
return !string.IsNullOrEmpty(GetHeaderKeyValue(headers, RequestResponseHeaders.RequestContextHeader, keyName));
61-
}
62-
6337
internal static bool ContainsRequestContextKeyValue(IHeaderDictionary headers, string keyName)
6438
{
6539
return !string.IsNullOrEmpty(GetHeaderKeyValue(headers, RequestResponseHeaders.RequestContextHeader, keyName));

‎src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<AssemblyName>Microsoft.ApplicationInsights.AspNetCore</AssemblyName>
4-
<VersionPrefix>2.7.0-beta4</VersionPrefix>
4+
<VersionPrefix>2.7.0</VersionPrefix>
55
<Authors>Microsoft</Authors>
66
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
77
<AssemblyTitle>Application Insights for ASP.NET Core Web Applications</AssemblyTitle>
@@ -81,11 +81,11 @@
8181
</ItemGroup>
8282

8383
<ItemGroup>
84-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta4" />
85-
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.10.0-beta4" />
86-
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.10.0-beta4" />
87-
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.10.0-beta4" />
88-
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.10.0-beta4" />
84+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0" />
85+
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.10.0" />
86+
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.10.0" />
87+
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.10.0" />
88+
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.10.0" />
8989
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.0.2" />
9090
<PackageReference Include="System.Text.Encodings.Web" Version="4.3.1" />
9191
</ItemGroup>
@@ -97,12 +97,11 @@
9797

9898
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
9999
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
100-
<PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.10.0-beta4" />
100+
<PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.10.0" />
101101
<PackageReference Include="System.Text.Encodings.Web" Version="4.3.1" />
102102
</ItemGroup>
103103

104104
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net46' ">
105-
<PackageReference Include="System.Net.Http" Version="4.3.2" />
106105
<Reference Include="System" />
107106
<Reference Include="Microsoft.CSharp" />
108107
</ItemGroup>

0 commit comments

Comments
 (0)