diff --git a/Sources/Logging/Handlers/MultiplexLogHandler.swift b/Sources/Logging/Handlers/MultiplexLogHandler.swift index 3dceab8..b25f86a 100644 --- a/Sources/Logging/Handlers/MultiplexLogHandler.swift +++ b/Sources/Logging/Handlers/MultiplexLogHandler.swift @@ -105,6 +105,9 @@ public struct MultiplexLogHandler: LogHandler { } /// The metadata provider. + /// + /// Setting this property sets the provider on all underlying handlers and replaces + /// the provider passed to ``init(_:metadataProvider:)``. public var metadataProvider: Logger.MetadataProvider? { get { if self.handlers.count == 1 { @@ -138,6 +141,9 @@ public struct MultiplexLogHandler: LogHandler { } } set { + // Also replace this handler's own provider, otherwise the provider passed to the + // initializer keeps overriding the new one, and setting `nil` would not remove it. + self._metadataProvider = newValue self.mutatingForEachHandler { $0.metadataProvider = newValue } } } diff --git a/Tests/InMemoryLoggingTests/MultiplexProviderRegressionTests.swift b/Tests/InMemoryLoggingTests/MultiplexProviderRegressionTests.swift index 1d3b8ef..8ed6ab8 100644 --- a/Tests/InMemoryLoggingTests/MultiplexProviderRegressionTests.swift +++ b/Tests/InMemoryLoggingTests/MultiplexProviderRegressionTests.swift @@ -45,4 +45,52 @@ struct MultiplexProviderRegressionTests { #expect(sink.entries.first?.metadata == ["child": "kept", "outer": "kept", "shared": "outer"]) #expect(sink.entries.last?.metadata == ["child": "kept", "outer": "kept", "shared": "explicit"]) } + + @Test(arguments: [1, 2]) + func settingProviderReplacesConstructorProvider(handlerCount: Int) { + let sinks = (0.. Logger.Metadata.Value? { + get { self.metadata[key] } + set { self.metadata[key] = newValue } + } + + func log(event: LogEvent) { + self.sink.log(event: event) + } }