ContainerLog: add metadataProvider to LogHandler implementations#1855
Open
ArasanDev wants to merge 1 commit into
Open
ContainerLog: add metadataProvider to LogHandler implementations#1855ArasanDev wants to merge 1 commit into
ArasanDev wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Type of Change
Motivation and Context
Resolves #1754.
The
LogHandlerprotocol in swift-log 1.5+ requires conforming types todeclare
var metadataProvider: Logger.MetadataProvider? { get set }. Thethree handlers in
ContainerLog—StderrLogHandler,OSLogHandler,and
FileLogHandler— were missing this property. The protocol's defaultextension emits a runtime warning in DEBUG builds whenever a
MetadataProvideris attached to a handler that doesn't implement theproperty, which surfaces as build noise in downstream projects that import
ContainerLog(e.g. reported in #1754 viastephenlclarke/container-compose).Changes per handler:
StderrLogHandler: AddedmetadataProviderproperty. Also correcteda pre-existing gap: the original
log()used only the per-callmetadataparameter and silently ignored handler-level
self.metadata. The updatedimplementation merges all three sources in the canonical priority order
(handler-level → provider → per-call), matching
StreamLogHandler.prepareMetadata.OSLogHandler: AddedmetadataProviderproperty. Removed theformattedMetadatacache and itsdidSetobserver — a dynamic provider(which may read task-local values) requires per-call computation, making
the cached value incorrect. Updated
log()to merge all three sources inthe same priority order.
FileLogHandler: AddedmetadataProviderproperty. Inserted theprovider merge step between handler-level and per-call metadata in the
existing
log()merge sequence.All three handlers now follow the merge order defined in
StreamLogHandler.prepareMetadata: handler-level metadata as the base,provider overwrites it, per-call metadata overwrites that.
Testing
make testpasses