diff --git a/Makefile b/Makefile index 9b973fee0..1f4248e9b 100644 --- a/Makefile +++ b/Makefile @@ -308,6 +308,7 @@ endef .PHONY: integration integration: init-block + @echo "HOSTNAME: $$(hostname)" $(RUN_INTEGRATION) .PHONY: coverage-integration @@ -320,6 +321,7 @@ coverage-integration: INTEGRATION_POST_TEST = cp $(COV_DATA_DIR)/*.profraw $(COV # process/module profile in its own file so they don't collide. coverage-integration: INTEGRATION_PROFILE_ENV = LLVM_PROFILE_FILE=$(COVERAGE_OUTPUT_DIR)/integration/%p-%m%c.profraw coverage-integration: coverage-all + @echo "HOSTNAME: $$(hostname)" @mkdir -p $(COVERAGE_OUTPUT_DIR)/integration @rm -f $(COVERAGE_OUTPUT_DIR)/integration/*.profraw $(RUN_INTEGRATION) diff --git a/Package.resolved b/Package.resolved index 7211ad02b..e934a06ea 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swift-server/async-http-client.git", "state" : { - "revision" : "60235983163d040f343a489f7e2e77c1918a8bd9", - "version" : "1.26.1" + "revision" : "4603a8036d921ea999fadb742931546c341f4bd7", + "version" : "1.35.0" } }, { @@ -24,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/grpc/grpc-swift-2.git", "state" : { - "revision" : "f28854bc760a116e053fdfc4a48a9428c34625c0", - "version" : "2.3.0" + "revision" : "28cdd63ef88583ddc67d7bb179eab46fab465ce9", + "version" : "2.4.2" } }, { @@ -42,8 +42,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/grpc/grpc-swift-protobuf.git", "state" : { - "revision" : "19153231a03c2fda1f4ea60da1b92a2cb9c011d8", - "version" : "2.2.0" + "revision" : "176c5a434fd76f6f479848d1a8f7d44967534168", + "version" : "2.4.1" } }, { @@ -60,8 +60,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-argument-parser.git", "state" : { - "revision" : "c5d11a805e765f52ba34ec7284bd4fcd6ba68615", - "version" : "1.7.0" + "revision" : "6a52f3251125d74daf04fcbd5e6f08a75d074382", + "version" : "1.8.2" } }, { @@ -69,8 +69,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-asn1.git", "state" : { - "revision" : "f70225981241859eb4aa1a18a75531d26637c8cc", - "version" : "1.4.0" + "revision" : "a9a5efd40eaf558a2bcd48d64b1d1646be686008", + "version" : "1.7.1" } }, { @@ -78,8 +78,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-async-algorithms.git", "state" : { - "revision" : "6c050d5ef8e1aa6342528460db614e9770d7f804", - "version" : "1.1.1" + "revision" : "3da39bbc4e687d4192af7c9cf4eab805745a0b9c", + "version" : "1.1.5" } }, { @@ -87,8 +87,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-atomics.git", "state" : { - "revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7", - "version" : "1.3.0" + "revision" : "0442cb5a3f98ab802acb777929fdb446bda11a34", + "version" : "1.3.1" } }, { @@ -96,8 +96,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-certificates.git", "state" : { - "revision" : "133a347911b6ad0fc8fe3bf46ca90c66cff97130", - "version" : "1.17.0" + "revision" : "89fbc3714264cce8db8e4ec51b64e01c3e28c6c5", + "version" : "1.19.3" } }, { @@ -105,8 +105,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections.git", "state" : { - "revision" : "03cc312c2c933ed87abace34044a5dff7a3117c1", - "version" : "1.5.0" + "revision" : "a0cb0954ecb21e4e31b0070e6ed5674e8556685a", + "version" : "1.6.0" } }, { @@ -132,8 +132,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-crypto.git", "state" : { - "revision" : "334e682869394ee239a57dbe9262bff3cd9495bd", - "version" : "3.14.0" + "revision" : "95ba0316a9b733e92bb6b071255ff46263bbe7dc", + "version" : "3.15.1" + } + }, + { + "identity" : "swift-distributed-tracing", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-distributed-tracing.git", + "state" : { + "revision" : "dc4030184203ffafbb2ec614352487235d747fe0", + "version" : "1.4.1" } }, { @@ -141,8 +150,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-docc-plugin.git", "state" : { - "revision" : "3e4f133a77e644a5812911a0513aeb7288b07d06", - "version" : "1.4.5" + "revision" : "647c708be89f834fa6a6d4945442793a77ddf5b6", + "version" : "1.5.0" } }, { @@ -159,8 +168,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-http-structured-headers.git", "state" : { - "revision" : "76d7627bd88b47bf5a0f8497dd244885960dde0b", - "version" : "1.6.0" + "revision" : "933538faa42c432d385f02e07df0ace7c5ecfc47", + "version" : "1.7.0" } }, { @@ -168,8 +177,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-http-types.git", "state" : { - "revision" : "45eb0224913ea070ec4fba17291b9e7ecf4749ca", - "version" : "1.5.1" + "revision" : "db774a277f60063a32d854f2980299caf06da041", + "version" : "1.6.0" } }, { @@ -177,8 +186,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-log.git", "state" : { - "revision" : "bbd81b6725ae874c69e9b8c8804d462356b55523", - "version" : "1.10.1" + "revision" : "a878e7f8f46cfc0e1125e565b5c08e7d5272dc9a", + "version" : "1.14.0" } }, { @@ -186,8 +195,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-metrics", "state" : { - "revision" : "d51c8d13fa366eec807eedb4e37daa60ff5bfdd5", - "version" : "2.10.1" + "revision" : "087e8074afa97040c3b870c8664fe5482fb87cc4", + "version" : "2.11.0" } }, { @@ -195,8 +204,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio.git", "state" : { - "revision" : "cd6710454f25733900e133c6caf5188952763c36", - "version" : "2.98.0" + "revision" : "0b18836bd8b0162e7e17a995a3fbee20ed8f3b2b", + "version" : "2.101.3" } }, { @@ -204,8 +213,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-extras.git", "state" : { - "revision" : "a55c3dd3a81d035af8a20ce5718889c0dcab073d", - "version" : "1.29.0" + "revision" : "88a51340f59cf181ebde888bd1b749296b3ec029", + "version" : "1.34.3" } }, { @@ -213,8 +222,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-http2.git", "state" : { - "revision" : "81cc18264f92cd307ff98430f89372711d4f6fe9", - "version" : "1.43.0" + "revision" : "61d1b44f6e4e118792be1cff88ee2bc0267c6f9a", + "version" : "1.44.0" } }, { @@ -222,8 +231,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-ssl.git", "state" : { - "revision" : "173cc69a058623525a58ae6710e2f5727c663793", - "version" : "2.36.0" + "revision" : "d930168b86f46ca51a4bc09c5ca45c1833db8067", + "version" : "2.37.2" } }, { @@ -231,8 +240,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-transport-services.git", "state" : { - "revision" : "e645014baea2ec1c2db564410c51a656cf47c923", - "version" : "1.25.1" + "revision" : "67787bb645a5e67d2edcdfbe48a216cc549222d5", + "version" : "1.28.0" } }, { @@ -249,17 +258,26 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-protobuf.git", "state" : { - "revision" : "86970144a0b86068c81ff48ee29b3f97cae0b879", - "version" : "1.36.0" + "revision" : "55d7a1cc5666b85c13464aea1c4b4a90feccb4c8", + "version" : "1.38.1" + } + }, + { + "identity" : "swift-service-context", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-service-context.git", + "state" : { + "revision" : "d0997351b0c7779017f88e7a93bc30a1878d7f29", + "version" : "1.3.0" } }, { "identity" : "swift-service-lifecycle", "kind" : "remoteSourceControl", - "location" : "https://github.com/swift-server/swift-service-lifecycle.git", + "location" : "https://github.com/swift-server/swift-service-lifecycle", "state" : { - "revision" : "e7187309187695115033536e8fc9b2eb87fd956d", - "version" : "2.8.0" + "revision" : "9829955b385e5bb88128b73f1b8389e9b9c3191a", + "version" : "2.11.0" } }, { @@ -267,8 +285,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-system.git", "state" : { - "revision" : "7c6ad0fc39d0763e0b699210e4124afd5041c5df", - "version" : "1.6.4" + "revision" : "b5544ba79a70a0cb3563e75bf26dc198d6b40ed3", + "version" : "1.7.4" } }, { @@ -285,8 +303,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/jpsim/Yams.git", "state" : { - "revision" : "deaf82e867fa2cbd3cd865978b079bfcf384ac28", - "version" : "6.2.1" + "revision" : "a27b21e0c81c5bf42049b897a62aaf387e80f279", + "version" : "6.2.2" } }, { diff --git a/Package.swift b/Package.swift index 7f241d942..6660fc4b0 100644 --- a/Package.swift +++ b/Package.swift @@ -54,10 +54,10 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/apple/containerization.git", exact: Version(stringLiteral: scVersion)), - .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.3.0"), + .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.7.0"), .package(url: "https://github.com/apple/swift-collections.git", from: "1.2.0"), .package(url: "https://github.com/apple/swift-configuration", from: "1.0.0"), - .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"), + .package(url: "https://github.com/apple/swift-log.git", from: "1.10.1"), .package(url: "https://github.com/apple/swift-nio.git", from: "2.80.0"), .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.36.0"), .package(url: "https://github.com/apple/swift-system.git", from: "1.6.4"), diff --git a/Sources/ContainerBuild/Builder.pb.swift b/Sources/ContainerBuild/Builder.pb.swift index 6b6c11653..7653e21cb 100644 --- a/Sources/ContainerBuild/Builder.pb.swift +++ b/Sources/ContainerBuild/Builder.pb.swift @@ -36,12 +36,12 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate nonisolated struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } -public enum Com_Apple_Container_Build_V1_TransferDirection: SwiftProtobuf.Enum, Swift.CaseIterable { +public nonisolated enum Com_Apple_Container_Build_V1_TransferDirection: SwiftProtobuf.Enum, Swift.CaseIterable { public typealias RawValue = Int case into // = 0 case outof // = 1 @@ -76,7 +76,7 @@ public enum Com_Apple_Container_Build_V1_TransferDirection: SwiftProtobuf.Enum, } /// Standard input/output. -public enum Com_Apple_Container_Build_V1_Stdio: SwiftProtobuf.Enum, Swift.CaseIterable { +public nonisolated enum Com_Apple_Container_Build_V1_Stdio: SwiftProtobuf.Enum, Swift.CaseIterable { public typealias RawValue = Int case stdin // = 0 case stdout // = 1 @@ -115,7 +115,7 @@ public enum Com_Apple_Container_Build_V1_Stdio: SwiftProtobuf.Enum, Swift.CaseIt } /// Build error type. -public enum Com_Apple_Container_Build_V1_BuildErrorType: SwiftProtobuf.Enum, Swift.CaseIterable { +public nonisolated enum Com_Apple_Container_Build_V1_BuildErrorType: SwiftProtobuf.Enum, Swift.CaseIterable { public typealias RawValue = Int case buildFailed // = 0 case `internal` // = 1 @@ -149,7 +149,7 @@ public enum Com_Apple_Container_Build_V1_BuildErrorType: SwiftProtobuf.Enum, Swi } -public struct Com_Apple_Container_Build_V1_InfoRequest: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_InfoRequest: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -159,7 +159,7 @@ public struct Com_Apple_Container_Build_V1_InfoRequest: Sendable { public init() {} } -public struct Com_Apple_Container_Build_V1_InfoResponse: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_InfoResponse: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -169,7 +169,7 @@ public struct Com_Apple_Container_Build_V1_InfoResponse: Sendable { public init() {} } -public struct Com_Apple_Container_Build_V1_CreateBuildRequest: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_CreateBuildRequest: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -194,7 +194,7 @@ public struct Com_Apple_Container_Build_V1_CreateBuildRequest: Sendable { public init() {} } -public struct Com_Apple_Container_Build_V1_CreateBuildResponse: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_CreateBuildResponse: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -210,7 +210,7 @@ public struct Com_Apple_Container_Build_V1_CreateBuildResponse: Sendable { public init() {} } -public struct Com_Apple_Container_Build_V1_ClientStream: @unchecked Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_ClientStream: @unchecked Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -262,7 +262,7 @@ public struct Com_Apple_Container_Build_V1_ClientStream: @unchecked Sendable { public var unknownFields = SwiftProtobuf.UnknownStorage() /// The packet type. - public enum OneOf_PacketType: Equatable, Sendable { + public nonisolated enum OneOf_PacketType: Equatable, Sendable { case signal(Com_Apple_Container_Build_V1_Signal) case command(Com_Apple_Container_Build_V1_Run) case buildTransfer(Com_Apple_Container_Build_V1_BuildTransfer) @@ -275,7 +275,7 @@ public struct Com_Apple_Container_Build_V1_ClientStream: @unchecked Sendable { fileprivate var _storage = _StorageClass.defaultInstance } -public struct Com_Apple_Container_Build_V1_Signal: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_Signal: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -289,7 +289,7 @@ public struct Com_Apple_Container_Build_V1_Signal: Sendable { public init() {} } -public struct Com_Apple_Container_Build_V1_Run: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_Run: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -305,7 +305,7 @@ public struct Com_Apple_Container_Build_V1_Run: Sendable { public init() {} } -public struct Com_Apple_Container_Build_V1_RunComplete: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_RunComplete: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -318,7 +318,7 @@ public struct Com_Apple_Container_Build_V1_RunComplete: Sendable { public init() {} } -public struct Com_Apple_Container_Build_V1_BuildTransfer: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_BuildTransfer: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -370,7 +370,7 @@ public struct Com_Apple_Container_Build_V1_BuildTransfer: Sendable { fileprivate var _destination: String? = nil } -public struct Com_Apple_Container_Build_V1_ImageTransfer: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_ImageTransfer: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -411,7 +411,7 @@ public struct Com_Apple_Container_Build_V1_ImageTransfer: Sendable { fileprivate var _descriptor: Com_Apple_Container_Build_V1_Descriptor? = nil } -public struct Com_Apple_Container_Build_V1_ServerStream: @unchecked Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_ServerStream: @unchecked Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -471,7 +471,7 @@ public struct Com_Apple_Container_Build_V1_ServerStream: @unchecked Sendable { public var unknownFields = SwiftProtobuf.UnknownStorage() /// The packet type. - public enum OneOf_PacketType: Equatable, Sendable { + public nonisolated enum OneOf_PacketType: Equatable, Sendable { case io(Com_Apple_Container_Build_V1_IO) case buildError(Com_Apple_Container_Build_V1_BuildError) case commandComplete(Com_Apple_Container_Build_V1_RunComplete) @@ -485,7 +485,7 @@ public struct Com_Apple_Container_Build_V1_ServerStream: @unchecked Sendable { fileprivate var _storage = _StorageClass.defaultInstance } -public struct Com_Apple_Container_Build_V1_IO: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_IO: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -501,7 +501,7 @@ public struct Com_Apple_Container_Build_V1_IO: Sendable { public init() {} } -public struct Com_Apple_Container_Build_V1_BuildError: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_BuildError: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -518,7 +518,7 @@ public struct Com_Apple_Container_Build_V1_BuildError: Sendable { } /// OCI Platform metadata. -public struct Com_Apple_Container_Build_V1_Platform: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_Platform: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -539,7 +539,7 @@ public struct Com_Apple_Container_Build_V1_Platform: Sendable { } /// OCI Descriptor metadata. -public struct Com_Apple_Container_Build_V1_Descriptor: Sendable { +public nonisolated struct Com_Apple_Container_Build_V1_Descriptor: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -572,21 +572,21 @@ public struct Com_Apple_Container_Build_V1_Descriptor: Sendable { // MARK: - Code below here is support for the SwiftProtobuf runtime. -fileprivate let _protobuf_package = "com.apple.container.build.v1" +fileprivate nonisolated let _protobuf_package = "com.apple.container.build.v1" -extension Com_Apple_Container_Build_V1_TransferDirection: SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_TransferDirection: SwiftProtobuf._ProtoNameProviding { public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\0INTO\0\u{1}OUTOF\0") } -extension Com_Apple_Container_Build_V1_Stdio: SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_Stdio: SwiftProtobuf._ProtoNameProviding { public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\0STDIN\0\u{1}STDOUT\0\u{1}STDERR\0") } -extension Com_Apple_Container_Build_V1_BuildErrorType: SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_BuildErrorType: SwiftProtobuf._ProtoNameProviding { public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\0BUILD_FAILED\0\u{1}INTERNAL\0") } -extension Com_Apple_Container_Build_V1_InfoRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_InfoRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".InfoRequest" public static let _protobuf_nameMap = SwiftProtobuf._NameMap() @@ -605,7 +605,7 @@ extension Com_Apple_Container_Build_V1_InfoRequest: SwiftProtobuf.Message, Swift } } -extension Com_Apple_Container_Build_V1_InfoResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_InfoResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".InfoResponse" public static let _protobuf_nameMap = SwiftProtobuf._NameMap() @@ -624,7 +624,7 @@ extension Com_Apple_Container_Build_V1_InfoResponse: SwiftProtobuf.Message, Swif } } -extension Com_Apple_Container_Build_V1_CreateBuildRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_CreateBuildRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".CreateBuildRequest" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}stage_name\0\u{1}tag\0\u{1}metadata\0\u{3}build_args\0\u{1}debug\0") @@ -674,7 +674,7 @@ extension Com_Apple_Container_Build_V1_CreateBuildRequest: SwiftProtobuf.Message } } -extension Com_Apple_Container_Build_V1_CreateBuildResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_CreateBuildResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".CreateBuildResponse" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}build_id\0\u{1}metadata\0") @@ -709,7 +709,7 @@ extension Com_Apple_Container_Build_V1_CreateBuildResponse: SwiftProtobuf.Messag } } -extension Com_Apple_Container_Build_V1_ClientStream: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_ClientStream: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".ClientStream" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}build_id\0\u{1}signal\0\u{1}command\0\u{3}build_transfer\0\u{3}image_transfer\0") @@ -853,7 +853,7 @@ extension Com_Apple_Container_Build_V1_ClientStream: SwiftProtobuf.Message, Swif } } -extension Com_Apple_Container_Build_V1_Signal: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_Signal: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".Signal" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}signal\0") @@ -883,7 +883,7 @@ extension Com_Apple_Container_Build_V1_Signal: SwiftProtobuf.Message, SwiftProto } } -extension Com_Apple_Container_Build_V1_Run: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_Run: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".Run" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}id\0\u{1}command\0") @@ -918,7 +918,7 @@ extension Com_Apple_Container_Build_V1_Run: SwiftProtobuf.Message, SwiftProtobuf } } -extension Com_Apple_Container_Build_V1_RunComplete: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_RunComplete: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".RunComplete" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}id\0") @@ -948,7 +948,7 @@ extension Com_Apple_Container_Build_V1_RunComplete: SwiftProtobuf.Message, Swift } } -extension Com_Apple_Container_Build_V1_BuildTransfer: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_BuildTransfer: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".BuildTransfer" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}id\0\u{1}direction\0\u{1}source\0\u{1}destination\0\u{1}data\0\u{1}complete\0\u{3}is_directory\0\u{1}metadata\0") @@ -1017,7 +1017,7 @@ extension Com_Apple_Container_Build_V1_BuildTransfer: SwiftProtobuf.Message, Swi } } -extension Com_Apple_Container_Build_V1_ImageTransfer: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_ImageTransfer: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".ImageTransfer" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}id\0\u{1}direction\0\u{1}tag\0\u{1}descriptor\0\u{1}data\0\u{1}complete\0\u{1}metadata\0") @@ -1081,7 +1081,7 @@ extension Com_Apple_Container_Build_V1_ImageTransfer: SwiftProtobuf.Message, Swi } } -extension Com_Apple_Container_Build_V1_ServerStream: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_ServerStream: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".ServerStream" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}build_id\0\u{1}io\0\u{3}build_error\0\u{3}command_complete\0\u{3}build_transfer\0\u{3}image_transfer\0") @@ -1242,7 +1242,7 @@ extension Com_Apple_Container_Build_V1_ServerStream: SwiftProtobuf.Message, Swif } } -extension Com_Apple_Container_Build_V1_IO: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_IO: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".IO" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}type\0\u{1}data\0") @@ -1277,7 +1277,7 @@ extension Com_Apple_Container_Build_V1_IO: SwiftProtobuf.Message, SwiftProtobuf. } } -extension Com_Apple_Container_Build_V1_BuildError: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_BuildError: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".BuildError" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}type\0\u{1}message\0") @@ -1312,7 +1312,7 @@ extension Com_Apple_Container_Build_V1_BuildError: SwiftProtobuf.Message, SwiftP } } -extension Com_Apple_Container_Build_V1_Platform: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_Platform: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".Platform" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}architecture\0\u{1}os\0\u{3}os_version\0\u{3}os_features\0\u{1}variant\0") @@ -1362,7 +1362,7 @@ extension Com_Apple_Container_Build_V1_Platform: SwiftProtobuf.Message, SwiftPro } } -extension Com_Apple_Container_Build_V1_Descriptor: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +nonisolated extension Com_Apple_Container_Build_V1_Descriptor: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".Descriptor" public static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}media_type\0\u{1}digest\0\u{1}size\0\u{1}urls\0\u{1}annotations\0\u{1}platform\0") diff --git a/Sources/ContainerLog/FileLogHandler.swift b/Sources/ContainerLog/FileLogHandler.swift index 446fa3308..7a84730ba 100644 --- a/Sources/ContainerLog/FileLogHandler.swift +++ b/Sources/ContainerLog/FileLogHandler.swift @@ -60,15 +60,7 @@ public struct FileLogHandler: LogHandler { self.fileHandle.seekToEndOfFile() } - public func log( - level: Logger.Level, - message: Logger.Message, - metadata: Logger.Metadata?, - source: String, - file: String, - function: String, - line: UInt - ) { + public func log(event: LogEvent) { let timestampFormatter: ISO8601DateFormatter = { let formatter = ISO8601DateFormatter() formatter.formatOptions.insert(.withFractionalSeconds) @@ -78,15 +70,15 @@ public struct FileLogHandler: LogHandler { // Merge logger-level metadata with per-message metadata var effectiveMetadata = self.metadata - if let metadata { + if let metadata = event.metadata { effectiveMetadata.merge(metadata) { _, new in new } } let text: String if !effectiveMetadata.isEmpty { - text = "\(timestamp) [\(level)] \(label) \(category) \(effectiveMetadata.description): \(message)\n" + text = "\(timestamp) [\(event.level)] \(label) \(category) \(effectiveMetadata.description): \(event.message)\n" } else { - text = "\(timestamp) [\(level)] \(label): \(category) \(message)\n" + text = "\(timestamp) [\(event.level)] \(label): \(category) \(event.message)\n" } if let data = text.data(using: .utf8) { fileHandle.write(data) diff --git a/Sources/ContainerLog/OSLogHandler.swift b/Sources/ContainerLog/OSLogHandler.swift index 227e35e03..7c099fb43 100644 --- a/Sources/ContainerLog/OSLogHandler.swift +++ b/Sources/ContainerLog/OSLogHandler.swift @@ -47,17 +47,9 @@ public struct OSLogHandler: LogHandler { } extension OSLogHandler { - public func log( - level: Logger.Level, - message: Logger.Message, - metadata: Logger.Metadata?, - source: String, - file: String, - function: String, - line: UInt - ) { + public func log(event: LogEvent) { var formattedMetadata = self.formattedMetadata - if let metadataOverride = metadata, !metadataOverride.isEmpty { + if let metadataOverride = event.metadata, !metadataOverride.isEmpty { formattedMetadata = self.formatMetadata( self.metadata.merging(metadataOverride) { $1 @@ -65,13 +57,13 @@ extension OSLogHandler { ) } - var finalMessage = message.description + var finalMessage = event.message.description if let formattedMetadata { finalMessage += " " + formattedMetadata } self.logger.log( - level: level.toOSLogLevel(), + level: event.level.toOSLogLevel(), "\(finalMessage, privacy: .public)" ) } diff --git a/Sources/ContainerLog/StderrLogHandler.swift b/Sources/ContainerLog/StderrLogHandler.swift index ffcd9179e..809db3aff 100644 --- a/Sources/ContainerLog/StderrLogHandler.swift +++ b/Sources/ContainerLog/StderrLogHandler.swift @@ -34,36 +34,28 @@ public struct StderrLogHandler: LogHandler { public init() {} - public func log( - level: Logger.Level, - message: Logger.Message, - metadata: Logger.Metadata?, - source: String, - file: String, - function: String, - line: UInt - ) { + public func log(event: LogEvent) { let data: Data switch logLevel { case .debug, .trace: let timestamp = isoTimestamp() - if let metadata, !metadata.isEmpty { + if let metadata = event.metadata, !metadata.isEmpty { data = - "\(timestamp) \(message.description): \(metadata.description)\n" + "\(timestamp) \(event.message.description): \(metadata.description)\n" .data(using: .utf8) ?? Data() } else { data = - "\(timestamp) \(message.description)\n" + "\(timestamp) \(event.message.description)\n" .data(using: .utf8) ?? Data() } default: - if let metadata, !metadata.isEmpty { + if let metadata = event.metadata, !metadata.isEmpty { data = - "\(message.description): \(metadata.description)\n" + "\(event.message.description): \(metadata.description)\n" .data(using: .utf8) ?? Data() } else { data = - "\(message.description)\n" + "\(event.message.description)\n" .data(using: .utf8) ?? Data() } }