open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing activityContext propagation (#1446) 

* Fixing activityContext propagation

* Adding tests

* updating tests

* adding comments

Co-authored-by: Cijo Thomas <cithomas@microsoft.com>
This commit is contained in:
Eddy Nakamura 2020-11-03 22:21:06 -03:00 committed by GitHub
parent 7be994a4be
commit c55145b186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs
View File

@ -94,8 +94,6 @@ namespace OpenTelemetry.Instrumentation.Http.Implementation
{
activity.DisplayName = HttpTagHelper.GetOperationNameForHttpMethod(request.Method);
InstrumentRequest(request, activity);
if (activity.IsAllDataRequested)
{
try
@ -197,8 +195,8 @@ namespace OpenTelemetry.Instrumentation.Http.Implementation
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void InstrumentRequest(HttpWebRequest request, Activity activity)
=> Options.Propagator.Inject(new PropagationContext(activity.Context, Baggage.Current), request, HttpWebRequestHeaderValuesSetter);
private static void InstrumentRequest(HttpWebRequest request, ActivityContext activityContext)
=> Options.Propagator.Inject(new PropagationContext(activityContext, Baggage.Current), request, HttpWebRequestHeaderValuesSetter);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static bool IsRequestInstrumented(HttpWebRequest request)
@ -214,7 +212,9 @@ namespace OpenTelemetry.Instrumentation.Http.Implementation
}
var activity = WebRequestActivitySource.StartActivity(ActivityName, ActivityKind.Client);
var activityContext = Activity.Current?.Context ?? default;
InstrumentRequest(request, activityContext);
if (activity == null)
{
// There is a listener but it decided not to sample the current request.

42
test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestTests.Basic.netfx.cs
View File

@ -95,6 +95,48 @@ namespace OpenTelemetry.Instrumentation.Http.Tests
parent.Stop();
}
[Fact]
public async Task HttpWebRequestInstrumentationInjectsHeadersAsyncWhenActivityIsNotRecorded()
{
ActivityContext contentFromPropagator = default;
var activityProcessor = new Mock<BaseProcessor<Activity>>();
var propagator = new Mock<TextMapPropagator>();
propagator.Setup(m => m.Inject(It.IsAny<PropagationContext>(), It.IsAny<HttpWebRequest>(), It.IsAny<Action<HttpWebRequest, string, string>>()))
.Callback<PropagationContext, HttpWebRequest, Action<HttpWebRequest, string, string>>((context, message, action) =>
{
contentFromPropagator = context.ActivityContext;
});
// Sdk.SetDefaultTextMapPropagator(propagator.Object);
using var shutdownSignal = Sdk.CreateTracerProviderBuilder()
.AddProcessor(activityProcessor.Object)
.AddHttpWebRequestInstrumentation(options => options.Propagator = propagator.Object)
.Build();
var request = (HttpWebRequest)WebRequest.Create(this.url);
request.Method = "GET";
var parent = new Activity("parent")
.SetIdFormat(ActivityIdFormat.W3C)
.Start();
parent.TraceStateString = "k1=v1,k2=v2";
parent.ActivityTraceFlags = ActivityTraceFlags.None;
using var response = await request.GetResponseAsync();
// By default parentbasedsampler is used.
// In this case, the parent is the manually created parentactivity, which will have TraceFlags as None.
// This causes child to be not created.
Assert.Empty(activityProcessor.Invocations);
Assert.Equal(parent.TraceId, contentFromPropagator.TraceId);
Assert.Equal(parent.SpanId, contentFromPropagator.SpanId);
Assert.NotEqual(default, contentFromPropagator.SpanId);
parent.Stop();
}
[Fact]
public async Task HttpWebRequestInstrumentationInjectsHeadersAsync_CustomFormat()
{