diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/Import/LoggerFactoryScopeProvider.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/Import/LoggerFactoryScopeProvider.cs index 3e18106972d..7b13b12c7df 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/Import/LoggerFactoryScopeProvider.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/Import/LoggerFactoryScopeProvider.cs @@ -236,7 +236,7 @@ IEnumerator IEnumerable.GetEnumerator() } } - private sealed class ActivityBaggageLogScopeWrapper : IEnumerable> + private sealed class ActivityBaggageLogScopeWrapper : IEnumerable> { private readonly IEnumerable> _items; @@ -247,15 +247,10 @@ public ActivityBaggageLogScopeWrapper(IEnumerable> _items = items; } - public IEnumerator> GetEnumerator() - { - return _items.GetEnumerator(); - } + public IEnumerator> GetEnumerator() => + new BaggageEnumerator(_items.GetEnumerator()); - IEnumerator IEnumerable.GetEnumerator() - { - return _items.GetEnumerator(); - } + IEnumerator IEnumerable.GetEnumerator() => new BaggageEnumerator(_items.GetEnumerator()); public override string ToString() { @@ -285,6 +280,27 @@ public override string ToString() return result; } } + + private readonly struct BaggageEnumerator : IEnumerator> + { + private readonly IEnumerator> _enumerator; + + public BaggageEnumerator(IEnumerator> enumerator) + { + _enumerator = enumerator; + } + + public KeyValuePair Current => + new KeyValuePair(_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(); + } } }