Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Instrumentation.AspNetCore] Fix changelog entry and remove package reference #5241

Merged
merged 4 commits into from
Jan 22, 2024
Merged

[Instrumentation.AspNetCore] Fix changelog entry and remove package reference #5241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6b7e11
Fix changelog entry and remove package reference
vishweshbankwar Jan 22, 2024
bc23dbf
reword
vishweshbankwar Jan 22, 2024
a6f3e4b
reword
vishweshbankwar Jan 22, 2024
c3bb42e
Merge branch 'main' into vibankwa/fix-changelog-entry
alanwest Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## Unreleased

* Fixed issue
[#4466](https://github.com/open-telemetry/opentelemetry-dotnet/issues/4466)
where the activity instance returned by `Activity.Current` was different than
instance obtained from `IHttpActivityFeature.Activity`.
[#5136](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5136)

## 1.7.0

Released 2023-Dec-13
Expand Down
6 changes: 0 additions & 6 deletions src/OpenTelemetry/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@
upgrading. For details see:
[#5169](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5169)

* Fixed an issue where the created activity from ASP.NET Core was replaced
with a new one. This replacement should only happen when the activity context
from the used propagator has a different trace id, parent span id or trace
state compared to the current activity. For details see:
[#5136](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5136)

* Fixed an issue where `SimpleExemplarReservoir` was not resetting internal
state for cumulative temporality.
[#5230](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5230)
Expand Down
1 change: 0 additions & 1 deletion test/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
<PackageVersion Update="System.Text.Json" Version="7.0.1" />
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageVersion Include="Microsoft.Coyote" Version="1.7.10" />
<PackageVersion Include="Microsoft.Extensions.Features" Version="8.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion test/TestApp.AspNetCore/Controllers/ChildActivityController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public IReadOnlyDictionary<string, string> GetChildActivityBaggageContext()
[Route("api/GetActivityEquality")]
public bool GetActivityEquality()
{
var activity = this.HttpContext.Features.GetRequiredFeature<IHttpActivityFeature>().Activity;
var activity = this.HttpContext.Features.Get<IHttpActivityFeature>()?.Activity;
var equal = Activity.Current == activity;
return equal;
}
Expand Down
1 change: 0 additions & 1 deletion test/TestApp.AspNetCore/TestApp.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Features" />
<PackageReference Include="Swashbuckle.AspNetCore" />
</ItemGroup>

Expand Down
Loading