Skip to content

Make LegacyPropagator list sort linear #132373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martincostello wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −4
Open

Make LegacyPropagator list sort linear #132373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/LegacyPropagator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,7 @@ internal static bool TryExtractBaggage(string baggageString, out IEnumerable<Key
{
baggageList ??= new List<KeyValuePair<string, string?>>();

// Insert in reverse order for asp.net compatibility.
baggageList.Insert(0, new KeyValuePair<string, string?>(
baggageList.Add(new KeyValuePair<string, string?>(
WebUtility.UrlDecode(baggageString.Substring(keyStart, keyEnd - keyStart)).Trim(s_trimmingSpaceCharacters),
WebUtility.UrlDecode(baggageString.Substring(valueStart, currentIndex - valueStart)).Trim(s_trimmingSpaceCharacters)));
}
Expand All @@ -182,6 +181,9 @@ internal static bool TryExtractBaggage(string baggageString, out IEnumerable<Key
currentIndex++; // Move to next key-value entry
} while (currentIndex < baggageString.Length);

// Reverse order for asp.net compatibility.
baggageList?.Reverse();

baggage = baggageList;
return baggageList != null;
}
Expand Down
10 changes: 8 additions & 2 deletions src/libraries/System.Diagnostics.DiagnosticSource/tests/PropagatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,18 @@ public void TestAllPropagators()
TestLegacyPropagatorUsingW3CActivity(
DistributedContextPropagator.Current,
"Legacy1=true",
new List<KeyValuePair<string, string>>() { new KeyValuePair<string, string>(" LegacyKey1 ", " LegacyValue1 ") });
new List<KeyValuePair<string, string>>() {
new KeyValuePair<string, string>(" LegacyKey1 ", " LegacyValue1 "),
new KeyValuePair<string, string>("LegacyKey1b", "LegacyValue1b"),
new KeyValuePair<string, string>("LegacyKey1c", "LegacyValue1c") });

TestLegacyPropagatorUsingHierarchicalActivity(
DistributedContextPropagator.Current,
"Legacy2=true",
new List<KeyValuePair<string, string>>() { new KeyValuePair<string, string>("LegacyKey2", "LegacyValue2") });
new List<KeyValuePair<string, string>>() {
new KeyValuePair<string, string>("LegacyKey2", "LegacyValue2"),
new KeyValuePair<string, string>("LegacyKey2b", "LegacyValue2b"),
new KeyValuePair<string, string>("LegacyKey2c", "LegacyValue2c") });

TestFields(DistributedContextPropagator.Current);

Expand Down
Loading