From 3a871d38fd024a4146740c22cabd78bb93c83d7f Mon Sep 17 00:00:00 2001 From: Tarek Mahmoud Sayed Date: Wed, 24 Jun 2020 16:40:07 -0700 Subject: [PATCH 1/2] Fix Http test failure because of Activity Id Format default change. --- .../System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs index fa0588d2413430..9fd7ed1ab324ba 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs @@ -552,6 +552,7 @@ public void SendAsync_ExpectedDiagnosticSourceActivityLoggingDoesNotOverwriteHea bool activityStopLogged = false; Activity parentActivity = new Activity("parent"); + parentActivity.SetIdFormat(ActivityIdFormat.Hierarchical); parentActivity.AddBaggage("correlationId", Guid.NewGuid().ToString("N").ToString()); parentActivity.Start(); From 5c968a55e69764da08f523fd229bea928aafc1d7 Mon Sep 17 00:00:00 2001 From: Tarek Mahmoud Sayed Date: Wed, 24 Jun 2020 18:48:18 -0700 Subject: [PATCH 2/2] fix another failing test for same reason --- .../System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs index 9fd7ed1ab324ba..34100505203182 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs @@ -494,6 +494,7 @@ public void SendAsync_ExpectedDiagnosticSourceActivityLogging_InvalidBaggage() bool exceptionLogged = false; Activity parentActivity = new Activity("parent"); + parentActivity.SetIdFormat(ActivityIdFormat.Hierarchical); parentActivity.AddBaggage("bad/key", "value"); parentActivity.AddBaggage("goodkey", "bad/value"); parentActivity.AddBaggage("key", "value");