Modify ASP.NET Core instrumentation to take advantage of sampling decision #1899

utpilla · 2021-03-11T07:46:18Z

Changes

Extends the optimization done in Modify httpclient instrumentation to take advantage of sampling decision #1894 to ASP.NET Core instrumentation
Added a unit test for context propagation even when activity.IsAllDataRequested is false

codecov · 2021-03-11T07:55:02Z

Codecov Report

Merging #1899 (b88ba57) into main (02ceb1a) will increase coverage by 0.00%.
The diff coverage is 93.33%.

@@           Coverage Diff           @@
##             main    #1899   +/-   ##
=======================================
  Coverage   84.41%   84.42%           
=======================================
  Files         188      188           
  Lines        6103     6105    +2     
=======================================
+ Hits         5152     5154    +2     
  Misses        951      951

Impacted Files	Coverage Δ
...tation.AspNetCore/Implementation/HttpInListener.cs	`86.02% <93.33%> (+0.20%)`	⬆️

src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs

test/TestApp.AspNetCore.2.1/Controllers/ChildActivityController.cs

cijothomas · 2021-03-11T15:21:57Z

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs

+                request = new HttpRequestMessage(HttpMethod.Get, "/api/GetChildActivityBaggageContext");
+                request.Headers.Add("Baggage", "key1=value1,key2=value2");
+                response = await client.SendAsync(request);
+                var childActivityBaggageContext = JsonConvert.DeserializeObject<IReadOnlyDictionary<string, string>>(response.Content.ReadAsStringAsync().Result);


you can avoid the additional json parsing, by making the test app return 2 strings contaning traceparent and tracestate (activity.Id, activity.TraceState) respectively.

src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs

cijothomas · 2021-03-11T15:29:26Z

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs

+                // Test TraceContext Propagation
+                var expectedTraceState = "rojo=1,congo=2";
+                var request = new HttpRequestMessage(HttpMethod.Get, "/api/GetChildActivityTraceContext");
+                request.Headers.Add("traceparent", $"00-{expectedTraceId}-{expectedParentSpanId}-01");


portions of this test would pass by default, as asp.net creates activity from traceparent always, irrespective of sampling in Otel.
To ensure thorough test, use a custom propagator (with some header like Foo), and validate the scenarios. Also add cases where sending traceparent with "00" and "01" as sampling flags

…tpInListener.cs Co-authored-by: Cijo Thomas <cithomas@microsoft.com>

src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs

…or-SuppressInstrumentation

cijothomas

Lets add to changelog that FIlter/Enrich is only called if AllDataRequested is true.

…etCoreInstrumentation-For-SuppressInstrumentation

…entation-For-SuppressInstrumentation' into utpilla/Optimize-AspNetCoreInstrumentation-For-SuppressInstrumentation

utpilla added 2 commits March 10, 2021 16:00

Optimize ASP.NET Core instrumentation for SuppressInstrumentation

bf0184e

Updated unit tests

bb8b094

utpilla requested a review from a team March 11, 2021 07:46