fix(logs): implement SwiftLog event handlers#1933

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

Closed
stephenlclarke wants to merge 3 commits into from
Closed

fix(logs): implement SwiftLog event handlers #1933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81f5246
chore: update swift-log lockfile
stephenlclarke Jun 19, 2026
b1d6fa3
fix(logs): implement SwiftLog event handlers
stephenlclarke Jun 19, 2026
6355f13
test(logs): cover SwiftLog event handlers
stephenlclarke Jul 11, 2026
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
4 changes: 2 additions & 2 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Package.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -431,6 +431,14 @@ let package = Package(
.product(name: "SystemPackage", package: "swift-system"),
]
),
.testTarget(
name: "ContainerLogTests",
dependencies: [
.product(name: "Logging", package: "swift-log"),
.product(name: "SystemPackage", package: "swift-system"),
"ContainerLog",
]
),
.target(
name: "ContainerPersistence",
dependencies: [
Expand Down
20 changes: 20 additions & 0 deletions Sources/ContainerLog/FileLogHandler.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,14 @@ public struct FileLogHandler: LogHandler {
self.fileHandle.seekToEndOfFile()
}

public func log(event: LogEvent) {
self.emit(
level: event.level,
message: event.message,
metadata: event.metadata
)
}

public func log(
level: Logger.Level,
message: Logger.Message,
Expand All@@ -68,6 +76,18 @@ public struct FileLogHandler: LogHandler {
file: String,
function: String,
line: UInt
) {
self.emit(
level: level,
message: message,
metadata: metadata
)
}

private func emit(
level: Logger.Level,
message: Logger.Message,
metadata: Logger.Metadata?
) {
let timestampFormatter: ISO8601DateFormatter = {
let formatter = ISO8601DateFormatter()
Expand Down
20 changes: 20 additions & 0 deletions Sources/ContainerLog/OSLogHandler.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,14 @@ public struct OSLogHandler: LogHandler {
}

extension OSLogHandler {
public func log(event: LogEvent) {
self.emit(
level: event.level,
message: event.message,
metadata: event.metadata
)
}

public func log(
level: Logger.Level,
message: Logger.Message,
Expand All@@ -55,6 +63,18 @@ extension OSLogHandler {
file: String,
function: String,
line: UInt
) {
self.emit(
level: level,
message: message,
metadata: metadata
)
}

private func emit(
level: Logger.Level,
message: Logger.Message,
metadata: Logger.Metadata?
) {
var formattedMetadata = self.formattedMetadata
if let metadataOverride = metadata, !metadataOverride.isEmpty {
Expand Down
20 changes: 20 additions & 0 deletions Sources/ContainerLog/StderrLogHandler.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ public struct StderrLogHandler: LogHandler {

public init() {}

public func log(event: LogEvent) {
self.emit(
level: event.level,
message: event.message,
metadata: event.metadata
)
}

public func log(
level: Logger.Level,
message: Logger.Message,
Expand All@@ -42,6 +50,18 @@ public struct StderrLogHandler: LogHandler {
file: String,
function: String,
line: UInt
) {
self.emit(
level: level,
message: message,
metadata: metadata
)
}

private func emit(
level: Logger.Level,
message: Logger.Message,
metadata: Logger.Metadata?
) {
let data: Data
switch logLevel {
Expand Down
61 changes: 61 additions & 0 deletions Tests/ContainerLogTests/ContainerLogHandlerTests.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
//===----------------------------------------------------------------------===//
// Copyright 2026 Apple Inc. and the container project authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//===----------------------------------------------------------------------===//

import Foundation
import Logging
import SystemPackage
import Testing

@testable import ContainerLog

@Suite
struct ContainerLogHandlerTests {
@Test
func handlersAcceptPrimaryLogEvent() throws {
let directory = FileManager.default.temporaryDirectory
.appendingPathComponent("container-log-tests-\(UUID().uuidString)", isDirectory: true)
defer { try? FileManager.default.removeItem(at: directory) }

let url = directory.appendingPathComponent("events.log")
var fileHandler = try FileLogHandler(
label: "container-log-tests",
category: "events",
path: FilePath(url.path)
)
fileHandler.metadata = ["scope": "handler"]

let event = LogEvent(
level: .warning,
message: "primary event",
metadata: ["scope": "event", "request": "123"],
source: "ContainerLogTests",
file: #fileID,
function: #function,
line: #line
)

fileHandler.log(event: event)
StderrLogHandler().log(event: event)
OSLogHandler(label: "container-log-tests", category: "events").log(event: event)

let output = try String(contentsOf: url, encoding: .utf8)
#expect(output.contains("[warning] container-log-tests events"))
#expect(output.contains("primary event"))
#expect(output.contains("event"))
#expect(output.contains("123"))
#expect(!output.contains("handler"))
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(logs): implement SwiftLog event handlers#1933

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

 Closed

stephenlclarke
wants to merge
3
commits into

from

 Closed


fix(logs): implement SwiftLog event handlers
#1933
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
81f5246

chore: update swift-log lockfile


stephenlclarke Jun 19, 2026
b1d6fa3

fix(logs): implement SwiftLog event handlers


stephenlclarke Jun 19, 2026
6355f13

test(logs): cover SwiftLog event handlers


stephenlclarke Jul 11, 2026

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


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


8 changes: 8 additions & 0 deletions
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -431,6 +431,14 @@ let package = Package(
 .product(name: "SystemPackage", package: "swift-system"),
 ]
 ),
 .testTarget(
 name: "ContainerLogTests",
 dependencies: [
 .product(name: "Logging", package: "swift-log"),
 .product(name: "SystemPackage", package: "swift-system"),
 "ContainerLog",
 ]
 ),
 .target(
 name: "ContainerPersistence",
 dependencies: [
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/FileLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,14 @@ public struct FileLogHandler: LogHandler {
 self.fileHandle.seekToEndOfFile()
 }

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -68,6 +76,18 @@ public struct FileLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let timestampFormatter: ISO8601DateFormatter = {
 let formatter = ISO8601DateFormatter()
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/OSLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,14 @@ public struct OSLogHandler: LogHandler {
}

extension OSLogHandler {
 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -55,6 +63,18 @@ extension OSLogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 var formattedMetadata = self.formattedMetadata
 if let metadataOverride = metadata, !metadataOverride.isEmpty {
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/StderrLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ public struct StderrLogHandler: LogHandler {

 public init() {}

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -42,6 +50,18 @@ public struct StderrLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let data: Data
 switch logLevel {
Expand Down

61 changes: 61 additions & 0 deletions
Tests/ContainerLogTests/ContainerLogHandlerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
//===----------------------------------------------------------------------===//
// Copyright 2026 Apple Inc. and the container project authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//===----------------------------------------------------------------------===//

import Foundation
import Logging
import SystemPackage
import Testing

@testable import ContainerLog

@Suite
struct ContainerLogHandlerTests {
 @Test
 func handlersAcceptPrimaryLogEvent() throws {
 let directory = FileManager.default.temporaryDirectory
 .appendingPathComponent("container-log-tests-\(UUID().uuidString)", isDirectory: true)
 defer { try? FileManager.default.removeItem(at: directory) }

 let url = directory.appendingPathComponent("events.log")
 var fileHandler = try FileLogHandler(
 label: "container-log-tests",
 category: "events",
 path: FilePath(url.path)
 )
 fileHandler.metadata = ["scope": "handler"]

 let event = LogEvent(
 level: .warning,
 message: "primary event",
 metadata: ["scope": "event", "request": "123"],
 source: "ContainerLogTests",
 file: #fileID,
 function: #function,
 line: #line
 )

 fileHandler.log(event: event)
 StderrLogHandler().log(event: event)
 OSLogHandler(label: "container-log-tests", category: "events").log(event: event)

 let output = try String(contentsOf: url, encoding: .utf8)
 #expect(output.contains("[warning] container-log-tests events"))
 #expect(output.contains("primary event"))
 #expect(output.contains("event"))
 #expect(output.contains("123"))
 #expect(!output.contains("handler"))
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(logs): implement SwiftLog event handlers#1933

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

 Closed

stephenlclarke
wants to merge
3
commits into

from

 Closed


fix(logs): implement SwiftLog event handlers
#1933
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
81f5246

chore: update swift-log lockfile


stephenlclarke Jun 19, 2026
b1d6fa3

fix(logs): implement SwiftLog event handlers


stephenlclarke Jun 19, 2026
6355f13

test(logs): cover SwiftLog event handlers


stephenlclarke Jul 11, 2026

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


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


8 changes: 8 additions & 0 deletions
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -431,6 +431,14 @@ let package = Package(
 .product(name: "SystemPackage", package: "swift-system"),
 ]
 ),
 .testTarget(
 name: "ContainerLogTests",
 dependencies: [
 .product(name: "Logging", package: "swift-log"),
 .product(name: "SystemPackage", package: "swift-system"),
 "ContainerLog",
 ]
 ),
 .target(
 name: "ContainerPersistence",
 dependencies: [
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/FileLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,14 @@ public struct FileLogHandler: LogHandler {
 self.fileHandle.seekToEndOfFile()
 }

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -68,6 +76,18 @@ public struct FileLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let timestampFormatter: ISO8601DateFormatter = {
 let formatter = ISO8601DateFormatter()
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/OSLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,14 @@ public struct OSLogHandler: LogHandler {
}

extension OSLogHandler {
 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -55,6 +63,18 @@ extension OSLogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 var formattedMetadata = self.formattedMetadata
 if let metadataOverride = metadata, !metadataOverride.isEmpty {
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/StderrLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ public struct StderrLogHandler: LogHandler {

 public init() {}

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -42,6 +50,18 @@ public struct StderrLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let data: Data
 switch logLevel {
Expand Down

61 changes: 61 additions & 0 deletions
Tests/ContainerLogTests/ContainerLogHandlerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
//===----------------------------------------------------------------------===//
// Copyright 2026 Apple Inc. and the container project authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//===----------------------------------------------------------------------===//

import Foundation
import Logging
import SystemPackage
import Testing

@testable import ContainerLog

@Suite
struct ContainerLogHandlerTests {
 @Test
 func handlersAcceptPrimaryLogEvent() throws {
 let directory = FileManager.default.temporaryDirectory
 .appendingPathComponent("container-log-tests-\(UUID().uuidString)", isDirectory: true)
 defer { try? FileManager.default.removeItem(at: directory) }

 let url = directory.appendingPathComponent("events.log")
 var fileHandler = try FileLogHandler(
 label: "container-log-tests",
 category: "events",
 path: FilePath(url.path)
 )
 fileHandler.metadata = ["scope": "handler"]

 let event = LogEvent(
 level: .warning,
 message: "primary event",
 metadata: ["scope": "event", "request": "123"],
 source: "ContainerLogTests",
 file: #fileID,
 function: #function,
 line: #line
 )

 fileHandler.log(event: event)
 StderrLogHandler().log(event: event)
 OSLogHandler(label: "container-log-tests", category: "events").log(event: event)

 let output = try String(contentsOf: url, encoding: .utf8)
 #expect(output.contains("[warning] container-log-tests events"))
 #expect(output.contains("primary event"))
 #expect(output.contains("event"))
 #expect(output.contains("123"))
 #expect(!output.contains("handler"))
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(logs): implement SwiftLog event handlers#1933

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

 Closed

stephenlclarke
wants to merge
3
commits into

from

 Closed


fix(logs): implement SwiftLog event handlers
#1933
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
81f5246

chore: update swift-log lockfile


stephenlclarke Jun 19, 2026
b1d6fa3

fix(logs): implement SwiftLog event handlers


stephenlclarke Jun 19, 2026
6355f13

test(logs): cover SwiftLog event handlers


stephenlclarke Jul 11, 2026

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


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


8 changes: 8 additions & 0 deletions
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -431,6 +431,14 @@ let package = Package(
 .product(name: "SystemPackage", package: "swift-system"),
 ]
 ),
 .testTarget(
 name: "ContainerLogTests",
 dependencies: [
 .product(name: "Logging", package: "swift-log"),
 .product(name: "SystemPackage", package: "swift-system"),
 "ContainerLog",
 ]
 ),
 .target(
 name: "ContainerPersistence",
 dependencies: [
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/FileLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,14 @@ public struct FileLogHandler: LogHandler {
 self.fileHandle.seekToEndOfFile()
 }

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -68,6 +76,18 @@ public struct FileLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let timestampFormatter: ISO8601DateFormatter = {
 let formatter = ISO8601DateFormatter()
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/OSLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,14 @@ public struct OSLogHandler: LogHandler {
}

extension OSLogHandler {
 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -55,6 +63,18 @@ extension OSLogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 var formattedMetadata = self.formattedMetadata
 if let metadataOverride = metadata, !metadataOverride.isEmpty {
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/StderrLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ public struct StderrLogHandler: LogHandler {

 public init() {}

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -42,6 +50,18 @@ public struct StderrLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let data: Data
 switch logLevel {
Expand Down

61 changes: 61 additions & 0 deletions
Tests/ContainerLogTests/ContainerLogHandlerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
//===----------------------------------------------------------------------===//
// Copyright 2026 Apple Inc. and the container project authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//===----------------------------------------------------------------------===//

import Foundation
import Logging
import SystemPackage
import Testing

@testable import ContainerLog

@Suite
struct ContainerLogHandlerTests {
 @Test
 func handlersAcceptPrimaryLogEvent() throws {
 let directory = FileManager.default.temporaryDirectory
 .appendingPathComponent("container-log-tests-\(UUID().uuidString)", isDirectory: true)
 defer { try? FileManager.default.removeItem(at: directory) }

 let url = directory.appendingPathComponent("events.log")
 var fileHandler = try FileLogHandler(
 label: "container-log-tests",
 category: "events",
 path: FilePath(url.path)
 )
 fileHandler.metadata = ["scope": "handler"]

 let event = LogEvent(
 level: .warning,
 message: "primary event",
 metadata: ["scope": "event", "request": "123"],
 source: "ContainerLogTests",
 file: #fileID,
 function: #function,
 line: #line
 )

 fileHandler.log(event: event)
 StderrLogHandler().log(event: event)
 OSLogHandler(label: "container-log-tests", category: "events").log(event: event)

 let output = try String(contentsOf: url, encoding: .utf8)
 #expect(output.contains("[warning] container-log-tests events"))
 #expect(output.contains("primary event"))
 #expect(output.contains("event"))
 #expect(output.contains("123"))
 #expect(!output.contains("handler"))
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(logs): implement SwiftLog event handlers#1933

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

 Closed

stephenlclarke
wants to merge
3
commits into

from

 Closed


fix(logs): implement SwiftLog event handlers
#1933
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
81f5246

chore: update swift-log lockfile


stephenlclarke Jun 19, 2026
b1d6fa3

fix(logs): implement SwiftLog event handlers


stephenlclarke Jun 19, 2026
6355f13

test(logs): cover SwiftLog event handlers


stephenlclarke Jul 11, 2026

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


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


8 changes: 8 additions & 0 deletions
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -431,6 +431,14 @@ let package = Package(
 .product(name: "SystemPackage", package: "swift-system"),
 ]
 ),
 .testTarget(
 name: "ContainerLogTests",
 dependencies: [
 .product(name: "Logging", package: "swift-log"),
 .product(name: "SystemPackage", package: "swift-system"),
 "ContainerLog",
 ]
 ),
 .target(
 name: "ContainerPersistence",
 dependencies: [
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/FileLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,14 @@ public struct FileLogHandler: LogHandler {
 self.fileHandle.seekToEndOfFile()
 }

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -68,6 +76,18 @@ public struct FileLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let timestampFormatter: ISO8601DateFormatter = {
 let formatter = ISO8601DateFormatter()
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/OSLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,14 @@ public struct OSLogHandler: LogHandler {
}

extension OSLogHandler {
 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -55,6 +63,18 @@ extension OSLogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 var formattedMetadata = self.formattedMetadata
 if let metadataOverride = metadata, !metadataOverride.isEmpty {
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/StderrLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ public struct StderrLogHandler: LogHandler {

 public init() {}

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -42,6 +50,18 @@ public struct StderrLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let data: Data
 switch logLevel {
Expand Down

61 changes: 61 additions & 0 deletions
Tests/ContainerLogTests/ContainerLogHandlerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
//===----------------------------------------------------------------------===//
// Copyright 2026 Apple Inc. and the container project authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//===----------------------------------------------------------------------===//

import Foundation
import Logging
import SystemPackage
import Testing

@testable import ContainerLog

@Suite
struct ContainerLogHandlerTests {
 @Test
 func handlersAcceptPrimaryLogEvent() throws {
 let directory = FileManager.default.temporaryDirectory
 .appendingPathComponent("container-log-tests-\(UUID().uuidString)", isDirectory: true)
 defer { try? FileManager.default.removeItem(at: directory) }

 let url = directory.appendingPathComponent("events.log")
 var fileHandler = try FileLogHandler(
 label: "container-log-tests",
 category: "events",
 path: FilePath(url.path)
 )
 fileHandler.metadata = ["scope": "handler"]

 let event = LogEvent(
 level: .warning,
 message: "primary event",
 metadata: ["scope": "event", "request": "123"],
 source: "ContainerLogTests",
 file: #fileID,
 function: #function,
 line: #line
 )

 fileHandler.log(event: event)
 StderrLogHandler().log(event: event)
 OSLogHandler(label: "container-log-tests", category: "events").log(event: event)

 let output = try String(contentsOf: url, encoding: .utf8)
 #expect(output.contains("[warning] container-log-tests events"))
 #expect(output.contains("primary event"))
 #expect(output.contains("event"))
 #expect(output.contains("123"))
 #expect(!output.contains("handler"))
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(logs): implement SwiftLog event handlers#1933

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

 Closed

stephenlclarke
wants to merge
3
commits into

from

 Closed


fix(logs): implement SwiftLog event handlers
#1933
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
81f5246

chore: update swift-log lockfile


stephenlclarke Jun 19, 2026
b1d6fa3

fix(logs): implement SwiftLog event handlers


stephenlclarke Jun 19, 2026
6355f13

test(logs): cover SwiftLog event handlers


stephenlclarke Jul 11, 2026

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


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


8 changes: 8 additions & 0 deletions
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -431,6 +431,14 @@ let package = Package(
 .product(name: "SystemPackage", package: "swift-system"),
 ]
 ),
 .testTarget(
 name: "ContainerLogTests",
 dependencies: [
 .product(name: "Logging", package: "swift-log"),
 .product(name: "SystemPackage", package: "swift-system"),
 "ContainerLog",
 ]
 ),
 .target(
 name: "ContainerPersistence",
 dependencies: [
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/FileLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,14 @@ public struct FileLogHandler: LogHandler {
 self.fileHandle.seekToEndOfFile()
 }

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -68,6 +76,18 @@ public struct FileLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let timestampFormatter: ISO8601DateFormatter = {
 let formatter = ISO8601DateFormatter()
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/OSLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,14 @@ public struct OSLogHandler: LogHandler {
}

extension OSLogHandler {
 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -55,6 +63,18 @@ extension OSLogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 var formattedMetadata = self.formattedMetadata
 if let metadataOverride = metadata, !metadataOverride.isEmpty {
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/StderrLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ public struct StderrLogHandler: LogHandler {

 public init() {}

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -42,6 +50,18 @@ public struct StderrLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let data: Data
 switch logLevel {
Expand Down

61 changes: 61 additions & 0 deletions
Tests/ContainerLogTests/ContainerLogHandlerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
//===----------------------------------------------------------------------===//
// Copyright 2026 Apple Inc. and the container project authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//===----------------------------------------------------------------------===//

import Foundation
import Logging
import SystemPackage
import Testing

@testable import ContainerLog

@Suite
struct ContainerLogHandlerTests {
 @Test
 func handlersAcceptPrimaryLogEvent() throws {
 let directory = FileManager.default.temporaryDirectory
 .appendingPathComponent("container-log-tests-\(UUID().uuidString)", isDirectory: true)
 defer { try? FileManager.default.removeItem(at: directory) }

 let url = directory.appendingPathComponent("events.log")
 var fileHandler = try FileLogHandler(
 label: "container-log-tests",
 category: "events",
 path: FilePath(url.path)
 )
 fileHandler.metadata = ["scope": "handler"]

 let event = LogEvent(
 level: .warning,
 message: "primary event",
 metadata: ["scope": "event", "request": "123"],
 source: "ContainerLogTests",
 file: #fileID,
 function: #function,
 line: #line
 )

 fileHandler.log(event: event)
 StderrLogHandler().log(event: event)
 OSLogHandler(label: "container-log-tests", category: "events").log(event: event)

 let output = try String(contentsOf: url, encoding: .utf8)
 #expect(output.contains("[warning] container-log-tests events"))
 #expect(output.contains("primary event"))
 #expect(output.contains("event"))
 #expect(output.contains("123"))
 #expect(!output.contains("handler"))
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(logs): implement SwiftLog event handlers#1933

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

 Closed

stephenlclarke
wants to merge
3
commits into

from

 Closed


fix(logs): implement SwiftLog event handlers
#1933
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
81f5246

chore: update swift-log lockfile


stephenlclarke Jun 19, 2026
b1d6fa3

fix(logs): implement SwiftLog event handlers


stephenlclarke Jun 19, 2026
6355f13

test(logs): cover SwiftLog event handlers


stephenlclarke Jul 11, 2026

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


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


8 changes: 8 additions & 0 deletions
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -431,6 +431,14 @@ let package = Package(
 .product(name: "SystemPackage", package: "swift-system"),
 ]
 ),
 .testTarget(
 name: "ContainerLogTests",
 dependencies: [
 .product(name: "Logging", package: "swift-log"),
 .product(name: "SystemPackage", package: "swift-system"),
 "ContainerLog",
 ]
 ),
 .target(
 name: "ContainerPersistence",
 dependencies: [
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/FileLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,14 @@ public struct FileLogHandler: LogHandler {
 self.fileHandle.seekToEndOfFile()
 }

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -68,6 +76,18 @@ public struct FileLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let timestampFormatter: ISO8601DateFormatter = {
 let formatter = ISO8601DateFormatter()
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/OSLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,14 @@ public struct OSLogHandler: LogHandler {
}

extension OSLogHandler {
 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -55,6 +63,18 @@ extension OSLogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 var formattedMetadata = self.formattedMetadata
 if let metadataOverride = metadata, !metadataOverride.isEmpty {
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/StderrLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ public struct StderrLogHandler: LogHandler {

 public init() {}

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -42,6 +50,18 @@ public struct StderrLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let data: Data
 switch logLevel {
Expand Down

61 changes: 61 additions & 0 deletions
Tests/ContainerLogTests/ContainerLogHandlerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
//===----------------------------------------------------------------------===//
// Copyright 2026 Apple Inc. and the container project authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//===----------------------------------------------------------------------===//

import Foundation
import Logging
import SystemPackage
import Testing

@testable import ContainerLog

@Suite
struct ContainerLogHandlerTests {
 @Test
 func handlersAcceptPrimaryLogEvent() throws {
 let directory = FileManager.default.temporaryDirectory
 .appendingPathComponent("container-log-tests-\(UUID().uuidString)", isDirectory: true)
 defer { try? FileManager.default.removeItem(at: directory) }

 let url = directory.appendingPathComponent("events.log")
 var fileHandler = try FileLogHandler(
 label: "container-log-tests",
 category: "events",
 path: FilePath(url.path)
 )
 fileHandler.metadata = ["scope": "handler"]

 let event = LogEvent(
 level: .warning,
 message: "primary event",
 metadata: ["scope": "event", "request": "123"],
 source: "ContainerLogTests",
 file: #fileID,
 function: #function,
 line: #line
 )

 fileHandler.log(event: event)
 StderrLogHandler().log(event: event)
 OSLogHandler(label: "container-log-tests", category: "events").log(event: event)

 let output = try String(contentsOf: url, encoding: .utf8)
 #expect(output.contains("[warning] container-log-tests events"))
 #expect(output.contains("primary event"))
 #expect(output.contains("event"))
 #expect(output.contains("123"))
 #expect(!output.contains("handler"))
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(logs): implement SwiftLog event handlers#1933

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

 Closed

stephenlclarke
wants to merge
3
commits into

from

 Closed


fix(logs): implement SwiftLog event handlers
#1933
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
81f5246

chore: update swift-log lockfile


stephenlclarke Jun 19, 2026
b1d6fa3

fix(logs): implement SwiftLog event handlers


stephenlclarke Jun 19, 2026
6355f13

test(logs): cover SwiftLog event handlers


stephenlclarke Jul 11, 2026

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


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


8 changes: 8 additions & 0 deletions
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -431,6 +431,14 @@ let package = Package(
 .product(name: "SystemPackage", package: "swift-system"),
 ]
 ),
 .testTarget(
 name: "ContainerLogTests",
 dependencies: [
 .product(name: "Logging", package: "swift-log"),
 .product(name: "SystemPackage", package: "swift-system"),
 "ContainerLog",
 ]
 ),
 .target(
 name: "ContainerPersistence",
 dependencies: [
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/FileLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,14 @@ public struct FileLogHandler: LogHandler {
 self.fileHandle.seekToEndOfFile()
 }

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -68,6 +76,18 @@ public struct FileLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let timestampFormatter: ISO8601DateFormatter = {
 let formatter = ISO8601DateFormatter()
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/OSLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,14 @@ public struct OSLogHandler: LogHandler {
}

extension OSLogHandler {
 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -55,6 +63,18 @@ extension OSLogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 var formattedMetadata = self.formattedMetadata
 if let metadataOverride = metadata, !metadataOverride.isEmpty {
Expand Down

20 changes: 20 additions & 0 deletions
Sources/ContainerLog/StderrLogHandler.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ public struct StderrLogHandler: LogHandler {

 public init() {}

 public func log(event: LogEvent) {
 self.emit(
 level: event.level,
 message: event.message,
 metadata: event.metadata
 )
 }

 public func log(
 level: Logger.Level,
 message: Logger.Message,
Expand All@@ -42,6 +50,18 @@ public struct StderrLogHandler: LogHandler {
 file: String,
 function: String,
 line: UInt
 ) {
 self.emit(
 level: level,
 message: message,
 metadata: metadata
 )
 }

 private func emit(
 level: Logger.Level,
 message: Logger.Message,
 metadata: Logger.Metadata?
 ) {
 let data: Data
 switch logLevel {
Expand Down

61 changes: 61 additions & 0 deletions
Tests/ContainerLogTests/ContainerLogHandlerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
//===----------------------------------------------------------------------===//
// Copyright 2026 Apple Inc. and the container project authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//===----------------------------------------------------------------------===//

import Foundation
import Logging
import SystemPackage
import Testing

@testable import ContainerLog

@Suite
struct ContainerLogHandlerTests {
 @Test
 func handlersAcceptPrimaryLogEvent() throws {
 let directory = FileManager.default.temporaryDirectory
 .appendingPathComponent("container-log-tests-\(UUID().uuidString)", isDirectory: true)
 defer { try? FileManager.default.removeItem(at: directory) }

 let url = directory.appendingPathComponent("events.log")
 var fileHandler = try FileLogHandler(
 label: "container-log-tests",
 category: "events",
 path: FilePath(url.path)
 )
 fileHandler.metadata = ["scope": "handler"]

 let event = LogEvent(
 level: .warning,
 message: "primary event",
 metadata: ["scope": "event", "request": "123"],
 source: "ContainerLogTests",
 file: #fileID,
 function: #function,
 line: #line
 )

 fileHandler.log(event: event)
 StderrLogHandler().log(event: event)
 OSLogHandler(label: "container-log-tests", category: "events").log(event: event)

 let output = try String(contentsOf: url, encoding: .utf8)
 #expect(output.contains("[warning] container-log-tests events"))
 #expect(output.contains("primary event"))
 #expect(output.contains("event"))
 #expect(output.contains("123"))
 #expect(!output.contains("handler"))
 }
}