Skip to content

Commit 00c3e58

Browse files
[Instrumentation.AspNetCore] Fix changelog entry and remove package reference (#5241)
Co-authored-by: Alan West <[email protected]>
1 parent 9db5a52 commit 00c3e58

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## Unreleased
44

5+
* Fixed issue
6+
[#4466](https://github.com/open-telemetry/opentelemetry-dotnet/issues/4466)
7+
where the activity instance returned by `Activity.Current` was different than
8+
instance obtained from `IHttpActivityFeature.Activity`.
9+
[#5136](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5136)
10+
511
## 1.7.0
612

713
Released 2023-Dec-13

src/OpenTelemetry/CHANGELOG.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@
99
upgrading. For details see:
1010
[#5169](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5169)
1111

12-
* Fixed an issue where the created activity from ASP.NET Core was replaced
13-
with a new one. This replacement should only happen when the activity context
14-
from the used propagator has a different trace id, parent span id or trace
15-
state compared to the current activity. For details see:
16-
[#5136](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5136)
17-
1812
* Fixed an issue where `SimpleExemplarReservoir` was not resetting internal
1913
state for cumulative temporality.
2014
[#5230](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5230)

test/Directory.Packages.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44
<PackageVersion Update="System.Text.Json" Version="7.0.1" />
55
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
66
<PackageVersion Include="Microsoft.Coyote" Version="1.7.10" />
7-
<PackageVersion Include="Microsoft.Extensions.Features" Version="8.0.0" />
87
</ItemGroup>
98
</Project>

test/TestApp.AspNetCore/Controllers/ChildActivityController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public IReadOnlyDictionary<string, string> GetChildActivityBaggageContext()
4040
[Route("api/GetActivityEquality")]
4141
public bool GetActivityEquality()
4242
{
43-
var activity = this.HttpContext.Features.GetRequiredFeature<IHttpActivityFeature>().Activity;
43+
var activity = this.HttpContext.Features.Get<IHttpActivityFeature>()?.Activity;
4444
var equal = Activity.Current == activity;
4545
return equal;
4646
}

test/TestApp.AspNetCore/TestApp.AspNetCore.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.Features" />
98
<PackageReference Include="Swashbuckle.AspNetCore" />
109
</ItemGroup>
1110

0 commit comments

Comments
 (0)