Skip to content

Remove netstandard targets from asp.netcore instrumentation #3567

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

Merged
utpilla merged 8 commits into from
Aug 18, 2022
Merged

Remove netstandard targets from asp.netcore instrumentation #3567

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df9b56a
remove netstandard targets from asp.netcore
Aug 9, 2022
25594cd
update changelog
Aug 9, 2022
ea20bd9
Merge branch 'main' into vibankwa/remove-netstandard-from-aspnetcore
Aug 16, 2022
7f6d265
fix merge issue
Aug 16, 2022
23681c9
fix merge issue
Aug 16, 2022
7c0b35d
Update test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.In…
vishweshbankwar Aug 16, 2022
c5333bc
update conditional compilation
Aug 16, 2022
50fac81
Merge branch 'main' into vibankwa/remove-netstandard-from-aspnetcore
vishweshbankwar Aug 17, 2022
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
Prev Previous commit
Next Next commit
fix merge issue
  • Loading branch information
Vishwesh Bankwar committed Aug 16, 2022
commit 7f6d265f1bb103f8a5a2fde853cd772b44009c99
2 changes: 1 addition & 1 deletion src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public override void OnStopActivity(Activity activity, object payload)
{
activity.SetStatus(SpanHelper.ResolveSpanStatusForHttpStatusCode(activity.Kind, response.StatusCode));
}
if (activity.GetStatus().StatusCode == StatusCode.Unset)
if (activity.Status == ActivityStatusCode.Unset)
{
activity.SetStatus(SpanHelper.ResolveSpanStatusForHttpStatusCode(activity.Kind, response.StatusCode));
}
Expand Down