Add ActivityContextFormat and propagation #724
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
…hub.com/cijothomas/opentelemetry-dotnet into cijothomas/activity3adapter1a_alternate
…hub.com/cijothomas/opentelemetry-dotnet into cijothomas/activity3adapter1a_alternate
Make Asp.Net instrumentation work with Activity API
…it tests and this is not planned to be in this repo as well.
…hub.com/cijothomas/opentelemetry-dotnet into cijothomas/activity3adapter1a_alternate
cijothomas
requested review from
bruno-garcia,
CodeBlanch,
discostu105,
lmolkova,
MikeGoldsmith,
pjanotti and
SergeyKanzhelev
as code owners
CodeBlanch
reviewed
Jun 12, 2020
| using OpenTelemetry.Context.Propagation; | ||
| using Xunit; | ||
|
|
||
| namespace OpenTelemetry.Impl.Trace.Propagation |
There was a problem hiding this comment.
nit: Rename "Impl" -> "Implementation" in namespace. I think "Impl" was used a lot before but we're been slowly cleaning it up?
CodeBlanch
reviewed
Jun 12, 2020
test/OpenTelemetry.Instrumentation.Dependencies.Tests/HttpClientTests.Basic.netcore31.cs
Show resolved
Hide resolved
CodeBlanch
reviewed
Jun 12, 2020
| activity.Kind, | ||
| activity.Tags, | ||
| activity.Links); | ||
| activity.Context, |
There was a problem hiding this comment.
nit: Extra tab thing going on here? Also at the end of the method (line 121) spacing looks off. Sorry for even mentioning it just happened to catch my eye.
CodeBlanch
reviewed
Jun 12, 2020
src/OpenTelemetry.Instrumentation.AspNet.Win/Implementation/HttpInListener.cs
Outdated
Show resolved
Hide resolved
CodeBlanch
reviewed
Jun 13, 2020
CodeBlanch
reviewed
Jun 13, 2020
src/OpenTelemetry.Instrumentation.AspNet.Win/Implementation/HttpInListener.cs
Show resolved
Hide resolved
CodeBlanch
reviewed
Jun 13, 2020
| @@ -59,12 +59,14 @@ public void Dispose() | |||
| // [InlineData("http://localhost/api/value", 0, null, "/api/value")] // Request will be filtered | |||
| // [InlineData("http://localhost/api/value", 0, null, "{ThrowException}")] // Filter user code will throw an exception | |||
| [InlineData("http://localhost/api/value/2", 0, null, "CustomContext", "/api/value")] // Request will not be filtered | |||
| [InlineData("http://localhost/api/value/2", 0, null, "CustomContext", "/api/value", true)] // Request will not be filtered | |||
There was a problem hiding this comment.
This tests for both cases now? Awesome!
CodeBlanch
reviewed
Jun 14, 2020
| // then we need to retrieve the one created by HttpInListener | ||
| // and stop it. | ||
| var activityByHttpInListener = (Activity)activity.GetCustomProperty("ActivityByHttpInListener"); | ||
| activityByHttpInListener.Stop(); |
There was a problem hiding this comment.
One last thing :) When we stop "newOne" here do we need to restore Activity.Current back to libraryActivity (since the Stop will call Activity.SetCurrent(Parent))? Something like:
else if (activity.OperationName.Equals("Microsoft.AspNet.HttpReqIn.Start"))
{
// This block is hit if Asp.Net did restore Current to its own activity,
// then we need to retrieve the one created by HttpInListener
// and stop it.
var activityByHttpInListener = (Activity)activity.GetCustomProperty("ActivityByHttpInListener");
activityByHttpInListener.Stop();
Activity.Current = activity; // Put back libraryActivity
}There was a problem hiding this comment.
Right. Added tests too for this.
CodeBlanch
approved these changes
Jun 15, 2020
|
Merging this now to make another PR on top of this. |
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.
Following up on #701, this PR adds ITextFormatActivity and TraceContextFormatActivity which can extract/inject ActivityContext (similar to SpanContext).
TODO: as another follow up:
When instrumentation adapter creates new activity(), this results in a duplicate telemetry collection. This will be fixed as a follow up, along with fixing the custom Filter. (the new instrumentationadapters dont support Filters)
Changes
Introduce ITextFormatActivity and TraceContextFormatActivity
Modify instrumentation adapter to extract context using above - the activity which did not use the above(i.e Asp.Net, Asp.Net Core), will be ignored and a new one is started.
Checklist
For significant contributions please make sure you have completed the following items:
The PR will automatically request reviews from code owners and trigger CI build and tests.