From d5deab2217792a282007f0380eaba5a1eae29207 Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Thu, 20 Feb 2025 18:46:17 +0100 Subject: [PATCH 1/3] fix HttpHandlerDiagnosticListenerTests.TestW3CHeadersTraceStateAndCorrelationContext --- .../tests/HttpHandlerDiagnosticListenerTests.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs index 0c23059c17ae88..4d58d7a326b40e 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs @@ -194,6 +194,8 @@ public void TestW3CHeadersTraceStateAndCorrelationContext() { using (var eventRecords = new EventObserverAndRecorder()) { + Activity.DefaultIdFormat = ActivityIdFormat.W3C; + Activity.ForceDefaultIdFormat = true; var parent = new Activity("w3c activity"); parent.SetParentId(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom()); parent.TraceStateString = "some=state"; From 3eca730ba60e4a02446f1433c61b2b3c8336d5fd Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Thu, 20 Feb 2025 18:58:54 +0100 Subject: [PATCH 2/3] no need to ForceDefaultIdFormat --- .../tests/HttpHandlerDiagnosticListenerTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs index 4d58d7a326b40e..8dd283e14ce622 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs @@ -195,7 +195,6 @@ public void TestW3CHeadersTraceStateAndCorrelationContext() using (var eventRecords = new EventObserverAndRecorder()) { Activity.DefaultIdFormat = ActivityIdFormat.W3C; - Activity.ForceDefaultIdFormat = true; var parent = new Activity("w3c activity"); parent.SetParentId(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom()); parent.TraceStateString = "some=state"; From 8e65e1ce56bd0a614041a1021aa5e94ef1ba6bf0 Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Fri, 21 Feb 2025 18:52:56 +0100 Subject: [PATCH 3/3] Disable TestW3CHeaders --- .../tests/HttpHandlerDiagnosticListenerTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs index 8dd283e14ce622..ecfe219e072843 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs @@ -145,6 +145,7 @@ public async Task TestBasicReceiveAndResponseEvents() } } + [ActiveIssue("https://github.com/dotnet/runtime/issues/112792")] [OuterLoop] [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))] public void TestW3CHeaders()