Skip to content

Make ActivityBaggageLogScopeWrapper implements IEnumerable<KeyValuePair<string, object?>> #5589

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

Merged
dariusclay merged 3 commits into from
Nov 18, 2024
Merged

Make ActivityBaggageLogScopeWrapper implements IEnumerable<KeyValuePair<string, object?>> #5589

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7af5298
chore: make ActivityBaggageLogScopeWrapper implements IEnumerable<Key…
NatMarchand Oct 31, 2024
a7ecab2
chore: fix ActivityBaggageLogScopeWrapper implementation
NatMarchand Nov 1, 2024
bd51806
Merge branch 'main' into main
NatMarchand Nov 14, 2024
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
34 changes: 25 additions & 9 deletions src/Libraries/Microsoft.Extensions.Telemetry/Logging/Import/LoggerFactoryScopeProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ IEnumerator IEnumerable.GetEnumerator()
}
}

private sealed class ActivityBaggageLogScopeWrapper : IEnumerable<KeyValuePair<string, string?>>
private sealed class ActivityBaggageLogScopeWrapper : IEnumerable<KeyValuePair<string, object?>>
{
private readonly IEnumerable<KeyValuePair<string, string?>> _items;

Expand All @@ -247,15 +247,10 @@ public ActivityBaggageLogScopeWrapper(IEnumerable<KeyValuePair<string, string?>>
_items = items;
}

public IEnumerator<KeyValuePair<string, string?>> GetEnumerator()
{
return _items.GetEnumerator();
}
public IEnumerator<KeyValuePair<string, object?>> GetEnumerator() =>
new BaggageEnumerator(_items.GetEnumerator());

IEnumerator IEnumerable.GetEnumerator()
{
return _items.GetEnumerator();
}
IEnumerator IEnumerable.GetEnumerator() => new BaggageEnumerator(_items.GetEnumerator());

public override string ToString()
{
Expand Down Expand Up @@ -285,6 +280,27 @@ public override string ToString()
return result;
}
}

private readonly struct BaggageEnumerator : IEnumerator<KeyValuePair<string, object?>>
{
private readonly IEnumerator<KeyValuePair<string, string?>> _enumerator;

public BaggageEnumerator(IEnumerator<KeyValuePair<string, string?>> enumerator)
{
_enumerator = enumerator;
}

public KeyValuePair<string, object?> Current =>
new KeyValuePair<string, object?>(_enumerator.Current.Key, _enumerator.Current.Value);

object? IEnumerator.Current => Current;

public void Dispose() => _enumerator.Dispose();

public bool MoveNext() => _enumerator.MoveNext();

public void Reset() => _enumerator.Reset();
}
}
}

Expand Down
Loading