mirror of
https://github.com/apple/swift-log
synced 2026-11-22 03:40:39 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
82cf87d893 | ||
|
|
47655e0c23 | ||
|
|
d05c8efdae | ||
|
|
c7413d967b | ||
|
|
34b131f794 |
No files matched your search
+53
-68
@@ -10,79 +10,64 @@ on:
|
||||
- cron: "0 8,20 * * *"
|
||||
|
||||
jobs:
|
||||
unit-tests:
|
||||
name: Unit tests
|
||||
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
|
||||
tests:
|
||||
name: Tests
|
||||
uses: swiftlang/github-workflows/.github/workflows/package_test.yml@0.0.18
|
||||
with:
|
||||
linux_6_1_enabled: false
|
||||
linux_6_4_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
linux_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
windows_6_1_enabled: false
|
||||
windows_6_2_enabled: true
|
||||
windows_6_3_enabled: true
|
||||
windows_6_4_enabled: true
|
||||
windows_nightly_next_enabled: true
|
||||
windows_nightly_main_enabled: true
|
||||
windows_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
windows_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
windows_6_4_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
windows_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
windows_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
# After https://github.com/swiftlang/github-workflows/pull/362 fix is available, this can be simplified to:
|
||||
# windows_command: |
|
||||
# Debug-Test: swift test
|
||||
# Release-Build: swift build -c release
|
||||
# windows_version_overrides: |
|
||||
# default: -Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable
|
||||
# nightly-release: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable
|
||||
# nightly-main: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable
|
||||
windows_env_vars: '{"COMMON_SWIFT_FLAGS": "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"}'
|
||||
windows_command: |
|
||||
Debug-Test:
|
||||
command: swift test -Xswiftc -warnings-as-errors %COMMON_SWIFT_FLAGS%
|
||||
versions: ["current-2", "current-1", "current"]
|
||||
Release-Build:
|
||||
command: swift build -c release -Xswiftc -warnings-as-errors %COMMON_SWIFT_FLAGS%
|
||||
versions: ["current-2", "current-1", "current"]
|
||||
Debug-Test-Nightly:
|
||||
command: swift test %COMMON_SWIFT_FLAGS%
|
||||
versions: ["nightly-release", "nightly-main"]
|
||||
Release-Build-Nightly:
|
||||
command: swift build -c release %COMMON_SWIFT_FLAGS%
|
||||
versions: ["nightly-release", "nightly-main"]
|
||||
# The Windows runner installs a pinned Swift patch release. The container image tracks the newest patch release.
|
||||
# Context: https://github.com/swiftlang/github-workflows/issues/356
|
||||
windows_use_docker: true
|
||||
# Strict flags for the release toolchains. The nightly toolchains skip -warnings-as-errors.
|
||||
linux_version_overrides: |
|
||||
default: -Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable
|
||||
nightly-release: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable
|
||||
nightly-main: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable
|
||||
macos_runner_pool: nightly
|
||||
xcode_scheme: swift-log-Package
|
||||
xcode_targets: |
|
||||
macOS:
|
||||
build: true
|
||||
test: true
|
||||
wasm_sdk_versions: '["current", "nightly-main"]'
|
||||
enable_embedded_wasm_sdk_build: false
|
||||
enable_macos_swiftly: false
|
||||
enable_freebsd: false
|
||||
|
||||
macos-benchmarks:
|
||||
name: macOS benchmarks
|
||||
uses: apple/swift-nio/.github/workflows/macos_benchmarks.yml@main
|
||||
uses: swiftlang/github-workflows/.github/workflows/benchmarks.yml@0.0.18
|
||||
with:
|
||||
benchmark_package_paths: '["Benchmarks/NoTraits", "Benchmarks/MaxLogLevelWarning", "Benchmarks/MaxLogLevelNone"]'
|
||||
macos_swift_6_3_enabled: true
|
||||
macos_swift_6_4_enabled: true
|
||||
enable_linux: false
|
||||
enable_macos: true
|
||||
macos_swift_versions: '["current-1", "current"]'
|
||||
macos_runner_pool: nightly
|
||||
|
||||
cxx-interop:
|
||||
name: Cxx interop
|
||||
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
|
||||
|
||||
static-linux:
|
||||
name: Static Linux Swift SDK
|
||||
# Workaround https://github.com/nektos/act/issues/1875
|
||||
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
|
||||
|
||||
macos-tests:
|
||||
name: macOS tests
|
||||
uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
|
||||
cmake-build:
|
||||
name: CMake build
|
||||
uses: swiftlang/github-workflows/.github/workflows/cmake_build.yml@0.0.18
|
||||
with:
|
||||
runner_pool: nightly
|
||||
build_scheme: swift-log-Package
|
||||
swift_6_1_enabled: false
|
||||
swift_6_2_enabled: true
|
||||
swift_6_3_enabled: true
|
||||
swift_6_4_enabled: true
|
||||
macos_xcode_test_enabled: true
|
||||
ios_xcode_test_enabled: false
|
||||
watchos_xcode_test_enabled: false
|
||||
tvos_xcode_test_enabled: false
|
||||
visionos_xcode_test_enabled: false
|
||||
|
||||
wasm:
|
||||
name: Wasm Swift SDK
|
||||
uses: apple/swift-nio/.github/workflows/wasm_swift_sdk.yml@main
|
||||
with:
|
||||
nightly_next_enabled: false
|
||||
|
||||
android:
|
||||
name: Android Swift SDK
|
||||
# Workaround https://github.com/nektos/act/issues/1875
|
||||
uses: apple/swift-nio/.github/workflows/android_swift_sdk.yml@main
|
||||
|
||||
release-builds:
|
||||
name: Release builds
|
||||
uses: apple/swift-nio/.github/workflows/release_builds.yml@main
|
||||
with:
|
||||
windows_6_1_enabled: false
|
||||
windows_6_2_enabled: true
|
||||
windows_6_3_enabled: true
|
||||
windows_6_4_enabled: true
|
||||
windows_nightly_next_enabled: true
|
||||
windows_nightly_main_enabled: true
|
||||
enable_windows_checks: false
|
||||
linux_pre_build_command: apt-get update && apt-get install -y ninja-build
|
||||
@@ -10,98 +10,68 @@ on:
|
||||
jobs:
|
||||
soundness:
|
||||
name: Soundness
|
||||
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@0.0.17
|
||||
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@0.0.18
|
||||
with:
|
||||
license_header_check_project_name: "Swift Logging API"
|
||||
|
||||
unit-tests:
|
||||
name: Unit tests
|
||||
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
|
||||
tests:
|
||||
name: Tests
|
||||
uses: swiftlang/github-workflows/.github/workflows/package_test.yml@0.0.18
|
||||
with:
|
||||
linux_6_1_enabled: false
|
||||
linux_6_4_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
linux_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
windows_6_1_enabled: false
|
||||
windows_6_2_enabled: true
|
||||
windows_6_3_enabled: true
|
||||
windows_6_4_enabled: true
|
||||
windows_nightly_next_enabled: true
|
||||
windows_nightly_main_enabled: true
|
||||
windows_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
windows_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
windows_6_4_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
windows_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
windows_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
|
||||
# After https://github.com/swiftlang/github-workflows/pull/362 fix is available, this can be simplified to:
|
||||
# windows_command: |
|
||||
# Debug-Test: swift test
|
||||
# Release-Build: swift build -c release
|
||||
# windows_version_overrides: |
|
||||
# default: -Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable
|
||||
# nightly-release: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable
|
||||
# nightly-main: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable
|
||||
windows_env_vars: '{"COMMON_SWIFT_FLAGS": "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"}'
|
||||
windows_command: |
|
||||
Debug-Test:
|
||||
command: swift test -Xswiftc -warnings-as-errors %COMMON_SWIFT_FLAGS%
|
||||
versions: ["current-2", "current-1", "current"]
|
||||
Release-Build:
|
||||
command: swift build -c release -Xswiftc -warnings-as-errors %COMMON_SWIFT_FLAGS%
|
||||
versions: ["current-2", "current-1", "current"]
|
||||
Debug-Test-Nightly:
|
||||
command: swift test %COMMON_SWIFT_FLAGS%
|
||||
versions: ["nightly-release", "nightly-main"]
|
||||
Release-Build-Nightly:
|
||||
command: swift build -c release %COMMON_SWIFT_FLAGS%
|
||||
versions: ["nightly-release", "nightly-main"]
|
||||
# The Windows runner installs a pinned Swift patch release. The container image tracks the newest patch release.
|
||||
# Context: https://github.com/swiftlang/github-workflows/issues/356
|
||||
windows_use_docker: true
|
||||
# Strict flags for the release toolchains. The nightly toolchains skip -warnings-as-errors.
|
||||
linux_version_overrides: |
|
||||
default: -Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable
|
||||
nightly-release: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable
|
||||
nightly-main: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable
|
||||
macos_runner_pool: general
|
||||
xcode_scheme: swift-log-Package
|
||||
xcode_targets: |
|
||||
macOS:
|
||||
build: true
|
||||
test: true
|
||||
wasm_sdk_versions: '["current", "nightly-main"]'
|
||||
enable_embedded_wasm_sdk_build: false
|
||||
enable_macos_swiftly: false
|
||||
enable_freebsd: false
|
||||
|
||||
macos-benchmarks:
|
||||
name: macOS benchmarks
|
||||
uses: apple/swift-nio/.github/workflows/macos_benchmarks.yml@main
|
||||
uses: swiftlang/github-workflows/.github/workflows/benchmarks.yml@0.0.18
|
||||
with:
|
||||
benchmark_package_paths: '["Benchmarks/NoTraits", "Benchmarks/MaxLogLevelWarning", "Benchmarks/MaxLogLevelNone"]'
|
||||
enable_linux: false
|
||||
enable_macos: true
|
||||
macos_swift_versions: '["current-1", "current"]'
|
||||
macos_runner_pool: general
|
||||
macos_swift_6_3_enabled: true
|
||||
macos_swift_6_4_enabled: true
|
||||
|
||||
cxx-interop:
|
||||
name: Cxx interop
|
||||
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
|
||||
|
||||
static-linux:
|
||||
name: Static Linux Swift SDK
|
||||
# Workaround https://github.com/nektos/act/issues/1875
|
||||
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
|
||||
|
||||
macos-tests:
|
||||
name: macOS tests
|
||||
uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
|
||||
cmake-build:
|
||||
name: CMake build
|
||||
uses: swiftlang/github-workflows/.github/workflows/cmake_build.yml@0.0.18
|
||||
with:
|
||||
runner_pool: general
|
||||
build_scheme: swift-log-Package
|
||||
swift_test_enabled: true
|
||||
swift_6_1_enabled: false
|
||||
swift_6_2_enabled: true
|
||||
swift_6_3_enabled: true
|
||||
swift_6_4_enabled: true
|
||||
macos_xcode_test_enabled: true
|
||||
ios_xcode_test_enabled: false
|
||||
watchos_xcode_test_enabled: false
|
||||
tvos_xcode_test_enabled: false
|
||||
visionos_xcode_test_enabled: false
|
||||
|
||||
android:
|
||||
name: Android Swift SDK
|
||||
# Workaround https://github.com/nektos/act/issues/1875
|
||||
uses: apple/swift-nio/.github/workflows/android_swift_sdk.yml@main
|
||||
|
||||
release-builds:
|
||||
name: Release builds
|
||||
uses: apple/swift-nio/.github/workflows/release_builds.yml@main
|
||||
with:
|
||||
windows_6_1_enabled: false
|
||||
windows_6_2_enabled: true
|
||||
windows_6_3_enabled: true
|
||||
windows_6_4_enabled: true
|
||||
windows_nightly_next_enabled: true
|
||||
windows_nightly_main_enabled: true
|
||||
|
||||
wasm:
|
||||
name: Wasm Swift SDK
|
||||
uses: apple/swift-nio/.github/workflows/wasm_swift_sdk.yml@main
|
||||
with:
|
||||
nightly_next_enabled: false
|
||||
|
||||
cmake-lists:
|
||||
name: Check CMake Lists
|
||||
uses: apple/swift-nio/.github/workflows/cmake_tests.yml@main
|
||||
with:
|
||||
image: "swift:6.2-jammy"
|
||||
update_cmake_lists_config: >-
|
||||
{
|
||||
"targets": [
|
||||
{ "name": "Logging", "type": "source", "exceptions": [] },
|
||||
{ "name": "InMemoryLogging", "type": "source", "exceptions": [] }
|
||||
]
|
||||
}
|
||||
enable_windows_checks: false
|
||||
linux_pre_build_command: apt-get update && apt-get install -y ninja-build
|
||||
@@ -2,6 +2,7 @@ name: PR label
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
pull-requests: read
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
@@ -10,12 +11,4 @@ on:
|
||||
jobs:
|
||||
semver-label-check:
|
||||
name: Semantic version label check
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 1
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
persist-credentials: false
|
||||
- name: Check for Semantic Version label
|
||||
uses: apple/swift-nio/.github/actions/pull_request_semver_label_checker@main
|
||||
uses: swiftlang/github-workflows/.github/workflows/pull_request_label.yml@0.0.18
|
||||
@@ -1,4 +1,4 @@
|
||||
// swift-tools-version: 6.2
|
||||
// swift-tools-version: 6.2.3
|
||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
||||
|
||||
import PackageDescription
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 734,
|
||||
"instructions" : 6771,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 734,
|
||||
"instructions" : 6767,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 734,
|
||||
"instructions" : 6775,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 710,
|
||||
"instructions" : 6771,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 6875,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 6879,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 6895,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 6867,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 810,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 803,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 803,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 803,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
// swift-tools-version: 6.2
|
||||
// swift-tools-version: 6.2.3
|
||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
||||
|
||||
import PackageDescription
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 734,
|
||||
"instructions" : 6775,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 734,
|
||||
"instructions" : 6747,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 6775,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 1993,
|
||||
"instructions" : 1251327,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 1968,
|
||||
"instructions" : 1251327,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 6847,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 750,
|
||||
"instructions" : 6863,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 6871,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 1189887,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 1189887,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 689,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 815,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 775,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 2008,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 2002,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
// swift-tools-version:6.2
|
||||
// swift-tools-version:6.2.3
|
||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
||||
|
||||
import PackageDescription
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 1050,
|
||||
"instructions" : 324863,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 1050,
|
||||
"instructions" : 324863,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 1046,
|
||||
"instructions" : 320767,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 4751359,
|
||||
"objectAllocCount" : 1000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 5039157355,
|
||||
"objectAllocCount" : 2016000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 81723391,
|
||||
"objectAllocCount" : 37000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 17661951,
|
||||
"objectAllocCount" : 6000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 5644287,
|
||||
"objectAllocCount" : 2000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 7065599,
|
||||
"objectAllocCount" : 3000
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 1005,
|
||||
"instructions" : 272895,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 1017,
|
||||
"instructions" : 284927,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"instructions" : 1966,
|
||||
"instructions" : 1249279,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 3273000,
|
||||
"objectAllocCount" : 1000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 9117695,
|
||||
"objectAllocCount" : 4000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 324863,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 324863,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 323071,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 4415487,
|
||||
"objectAllocCount" : 1000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 4322989256,
|
||||
"objectAllocCount" : 2016000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 68354047,
|
||||
"objectAllocCount" : 37000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 14581759,
|
||||
"objectAllocCount" : 6000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 5795839,
|
||||
"objectAllocCount" : 2000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 7192575,
|
||||
"objectAllocCount" : 3000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 301055,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 243967,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 1189887,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 2841000,
|
||||
"objectAllocCount" : 1000
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"instructions" : 8929279,
|
||||
"objectAllocCount" : 4000
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 5483,
|
||||
"objectAllocCount" : 1
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 4939775,
|
||||
"objectAllocCount" : 2016
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 82239,
|
||||
"objectAllocCount" : 37
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 18351,
|
||||
"objectAllocCount" : 6
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 6200,
|
||||
"objectAllocCount" : 2
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 7600,
|
||||
"objectAllocCount" : 3
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 4551,
|
||||
"objectAllocCount" : 1
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 9623,
|
||||
"objectAllocCount" : 4
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 1119,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 1119,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 1117,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 5327,
|
||||
"objectAllocCount" : 1
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 4263935,
|
||||
"objectAllocCount" : 2016
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 69119,
|
||||
"objectAllocCount" : 37
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 15471,
|
||||
"objectAllocCount" : 6
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 6851,
|
||||
"objectAllocCount" : 2
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 8399,
|
||||
"objectAllocCount" : 3
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 1095,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 1038,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 1972,
|
||||
"objectAllocCount" : 0
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 4171,
|
||||
"objectAllocCount" : 1
|
||||
}
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"instructions" : 10231,
|
||||
"objectAllocCount" : 4
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
// swift-tools-version:6.2
|
||||
// swift-tools-version:6.2.3
|
||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
||||
|
||||
import PackageDescription
|
||||
|
||||
@@ -36,6 +36,7 @@ public func makeBenchmark(
|
||||
"\(logLevel)_log_with_\(loggerLevel)_log_level\(suffix)",
|
||||
configuration: .init(
|
||||
metrics: metrics,
|
||||
scalingFactor: .kilo,
|
||||
maxIterations: iterations,
|
||||
thresholds: [
|
||||
.instructions: BenchmarkThresholds(
|
||||
@@ -54,12 +55,16 @@ public func makeBenchmark(
|
||||
if setScopedLogger {
|
||||
withLogger(logger) { logger in
|
||||
benchmark.startMeasurement()
|
||||
body(logger)
|
||||
for _ in benchmark.scaledIterations {
|
||||
body(logger)
|
||||
}
|
||||
benchmark.stopMeasurement()
|
||||
}
|
||||
} else {
|
||||
benchmark.startMeasurement()
|
||||
body(logger)
|
||||
for _ in benchmark.scaledIterations {
|
||||
body(logger)
|
||||
}
|
||||
benchmark.stopMeasurement()
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -33,8 +33,8 @@ option(BUILD_SHARED_LIBS "Build shared libraries by default" YES)
|
||||
|
||||
set(CMAKE_Swift_LANGUAGE_VERSION 6)
|
||||
|
||||
if(CMAKE_Swift_COMPILER_VERSION VERSION_LESS "6.2")
|
||||
message(FATAL_ERROR "swift-log requires Swift compiler version 6.2 or newer. Detected version: ${CMAKE_Swift_COMPILER_VERSION}")
|
||||
if(CMAKE_Swift_COMPILER_VERSION VERSION_LESS "6.2.3")
|
||||
message(FATAL_ERROR "swift-log requires Swift compiler version 6.2.3 or newer. Detected version: ${CMAKE_Swift_COMPILER_VERSION}")
|
||||
endif()
|
||||
|
||||
set(SWIFT_LOG_COMMON_COMPILE_OPTIONS
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// swift-tools-version:6.2
|
||||
// swift-tools-version:6.2.3
|
||||
|
||||
import PackageDescription
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ choose from the many
|
||||
The following snippet shows how to add SwiftLog to your Swift Package:
|
||||
|
||||
```swift
|
||||
// swift-tools-version: 6.2
|
||||
// swift-tools-version: 6.2.3
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
|
||||
@@ -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 }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1395,7 +1395,18 @@ extension Logger {
|
||||
@inlinable
|
||||
internal static func currentModule(fileID: String = #fileID) -> String {
|
||||
let utf8All = fileID.utf8
|
||||
if let slashIndex = utf8All.firstIndex(of: UInt8(ascii: "/")) {
|
||||
let searchStart: String.UTF8View.Index
|
||||
if utf8All.first == UInt8(ascii: "`") {
|
||||
guard let closingBacktickIndex = utf8All.dropFirst().firstIndex(of: UInt8(ascii: "`")) else {
|
||||
// It should be impossible for a well-formed module to get here, so treat it as an "n/a" case.
|
||||
return "n/a"
|
||||
}
|
||||
// Backticks are part of raw-identifier module names as written in source and mangled, so preserve them.
|
||||
searchStart = utf8All.index(after: closingBacktickIndex)
|
||||
} else {
|
||||
searchStart = utf8All.startIndex
|
||||
}
|
||||
if let slashIndex = utf8All[searchStart...].firstIndex(of: UInt8(ascii: "/")) {
|
||||
return String(fileID[..<slashIndex])
|
||||
} else {
|
||||
return "n/a"
|
||||
|
||||
@@ -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..<handlerCount).map { _ in InMemoryLogHandler() }
|
||||
let handler = MultiplexLogHandler(sinks, metadataProvider: .init { ["trace-id": "constructor"] })
|
||||
var logger = Logger(label: "test", factory: { _ in handler })
|
||||
|
||||
logger.handler.metadataProvider = .init { ["trace-id": "replaced"] }
|
||||
#expect(logger.metadataProvider?.get() == ["trace-id": "replaced"])
|
||||
logger.info("replaced")
|
||||
|
||||
logger.handler.metadataProvider = nil
|
||||
#expect(logger.metadataProvider == nil)
|
||||
logger.info("cleared")
|
||||
|
||||
for sink in sinks {
|
||||
#expect(sink.entries.map(\.metadata) == [["trace-id": "replaced"], [:]])
|
||||
}
|
||||
}
|
||||
|
||||
@Test func settingProviderReachesHandlersWithoutProviderSupport() {
|
||||
let sink = InMemoryLogHandler()
|
||||
var handler = MultiplexLogHandler(
|
||||
[HandlerWithoutProviderSupport(sink: sink)],
|
||||
metadataProvider: .init { ["trace-id": "constructor"] }
|
||||
)
|
||||
handler.metadataProvider = .init { ["trace-id": "replaced"] }
|
||||
let logger = Logger(label: "test", factory: { _ in handler })
|
||||
logger.info("hello")
|
||||
// Debug builds may also record a one-time warning about the unsupported provider.
|
||||
#expect(sink.entries.filter { $0.message == "hello" }.map(\.metadata) == [["trace-id": "replaced"]])
|
||||
}
|
||||
}
|
||||
|
||||
/// Uses the default `metadataProvider` implementation, so it ignores providers set on it.
|
||||
private struct HandlerWithoutProviderSupport: LogHandler {
|
||||
let sink: InMemoryLogHandler
|
||||
var metadata: Logger.Metadata = [:]
|
||||
var logLevel: Logger.Level = .info
|
||||
|
||||
subscript(metadataKey key: String) -> Logger.Metadata.Value? {
|
||||
get { self.metadata[key] }
|
||||
set { self.metadata[key] = newValue }
|
||||
}
|
||||
|
||||
func log(event: LogEvent) {
|
||||
self.sink.log(event: event)
|
||||
}
|
||||
}
|
||||
@@ -1157,6 +1157,20 @@ struct LoggingTest {
|
||||
#expect(logger1.handlerCopies == 0)
|
||||
#expect(logger1[metadataKey: "key0"] == "0")
|
||||
}
|
||||
|
||||
@Test func currentModuleFileIDParsing() {
|
||||
#expect(Logger.currentModule(fileID: "MyModule/MyFile.swift") == "MyModule")
|
||||
#expect(Logger.currentModule(fileID: "MyModule/Subdir/MyFile.swift") == "MyModule")
|
||||
#expect(Logger.currentModule(fileID: "`My.Module`/MyFile.swift") == "`My.Module`")
|
||||
#expect(Logger.currentModule(fileID: "`My/Module`/MyFile.swift") == "`My/Module`")
|
||||
#expect(Logger.currentModule(fileID: "`/a/b/c`/MyFile.swift") == "`/a/b/c`")
|
||||
#expect(Logger.currentModule(fileID: "`/a/b/c`/Subdir/MyFile.swift") == "`/a/b/c`")
|
||||
#expect(Logger.currentModule(fileID: "`Module With Spaces`/MyFile.swift") == "`Module With Spaces`")
|
||||
#expect(Logger.currentModule(fileID: "`Unclosed/MyFile.swift") == "n/a")
|
||||
#expect(Logger.currentModule(fileID: "`NoSlash`") == "n/a")
|
||||
#expect(Logger.currentModule(fileID: "NoSlash.swift") == "n/a")
|
||||
#expect(Logger.currentModule(fileID: "") == "n/a")
|
||||
}
|
||||
}
|
||||
|
||||
extension Logger {
|
||||
|
||||
Reference in new issue
Block a user