[.NET7.0] AspNetCore ActivitySource Migration #3391
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vishweshbankwar
changed the title
Codecov Report
@@ Coverage Diff @@
## net7.0 #3391 +/- ##
==========================================
- Coverage 86.13% 86.02% -0.11%
==========================================
Files 258 258
Lines 9254 9261 +7
==========================================
- Hits 7971 7967 -4
- Misses 1283 1294 +11
|
cijothomas
reviewed
Jun 22, 2022
src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs
Outdated
Show resolved
Hide resolved
cijothomas
reviewed
Jun 22, 2022
src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs
Outdated
Show resolved
Hide resolved
…ttps://github.com/vishweshbankwar/opentelemetry-dotnet into vibankwa/Net7.0-AspnetCore-ActivitySource-Migration
cijothomas
reviewed
Jul 2, 2022
src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs
Outdated
Show resolved
Hide resolved
cijothomas
reviewed
Jul 2, 2022
src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreInstrumentation.cs
Outdated
Show resolved
Hide resolved
src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs
Outdated
Show resolved
Hide resolved
alanwest
reviewed
Jul 12, 2022
alanwest
reviewed
Jul 12, 2022
test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs
Outdated
Show resolved
Hide resolved
CodeBlanch
reviewed
Jul 12, 2022
src/OpenTelemetry.Instrumentation.AspNetCore/TracerProviderBuilderExtensions.cs
Outdated
Show resolved
Hide resolved
alanwest
reviewed
Jul 12, 2022
src/OpenTelemetry.Instrumentation.AspNetCore/TracerProviderBuilderExtensions.cs
Outdated
Show resolved
Hide resolved
…tpInListener.cs Co-authored-by: Timothy Mothra <[email protected]>
…ttps://github.com/vishweshbankwar/opentelemetry-dotnet into vibankwa/Net7.0-AspnetCore-ActivitySource-Migration
alanwest
approved these changes
Jul 13, 2022
cijothomas
reviewed
Jul 15, 2022
| // For .NET6.0 and below, we will continue to use legacy way. | ||
| if (HttpInListener.IsNet7OrGreater) | ||
| { | ||
| var activitySourceService = serviceProvider?.GetService<ActivitySource>(); |
There was a problem hiding this comment.
Not sure if this is safe. Anyone can add ActivitySource to DI, and how do we know if this is the one added by asp.net core?
There was a problem hiding this comment.
This is how library passes the activitysource as well to diagnostics module. https://github.com/dotnet/aspnetcore/blob/0e5cbf447d329a1e7d69932c3decd1c70a00fbba/src/Hosting/Hosting/src/Internal/WebHost.cs#L152
reference: #3391 (comment)
cijothomas
reviewed
Jul 15, 2022
| @@ -135,8 +157,11 @@ public override void OnStartActivity(Activity activity, object payload) | |||
| return; | |||
| } | |||
|
|
|||
| ActivityInstrumentationHelper.SetActivitySourceProperty(activity, ActivitySource); | |||
| ActivityInstrumentationHelper.SetKindProperty(activity, ActivityKind.Server); | |||
| if (!IsNet7OrGreater) | |||
There was a problem hiding this comment.
why we have used pre-processor directives (NET7_0_OR_GREATER) in some places and the static variable in other place?
There was a problem hiding this comment.
Good point - we should use preprocessor directive everywhere. let me know if there is any case where it wont work
cijothomas
reviewed
Jul 15, 2022
src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs
Outdated
Show resolved
Hide resolved
added 3 commits
July 15, 2022 10:05
cijothomas
reviewed
Jul 16, 2022
src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs
Outdated
Show resolved
Hide resolved
cijothomas
reviewed
Jul 16, 2022
| // For .NET6.0 and below, we will continue to use legacy way. | ||
| #if NET7_0_OR_GREATER | ||
| // TODO: Check with .NET team to see if this can be prevented | ||
| // as this allows user to override the ActivitySource. |
There was a problem hiding this comment.
would be good to write a unittest which simulates this.
cijothomas
approved these changes
Jul 16, 2022
added 2 commits
July 18, 2022 09:50
|
This PR was marked stale due to lack of activity and will be closed in 7 days. Commenting or Pushing will instruct the bot to automatically remove the label. This bot runs once per day. |
github-actions
bot
added
the
Stale
alanwest
pushed a commit
to alanwest/opentelemetry-dotnet
that referenced
this pull request
Aug 3, 2022
2 tasks
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #.
#3019
TODO: Add additional tests.
Changes
Please provide a brief description of the changes here.
For significant contributions please make sure you have completed the following items:
CHANGELOG.mdupdated for non-trivial changes