Fixes for Sendable and strict concurrency (#340)

Package@swift-5.9.swift

@@ -0,0 +1,115 @@
+// swift-tools-version:5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "MongoKitten",
+    platforms: [
+        .macOS(.v13),
+        .iOS(.v13)
+    ],
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "MongoKitten",
+            targets: ["MongoKitten"]),
+        .library(
+            name: "Meow",
+            targets: ["Meow"]),
+        .library(
+            name: "MongoClient",
+            targets: ["MongoClient"]),
+        .library(
+            name: "MongoCore",
+            targets: ["MongoCore"]),
+    ],
+    dependencies: [
+        // ✏️
+        .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
+
+        // 📈
+        .package(url: "https://github.com/apple/swift-metrics.git", "1.0.0" ..< "3.0.0"),
+
+        // ✅
+        .package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.0"),
+
+        // 💾
+        .package(url: "https://github.com/orlandos-nl/BSON.git", from: "8.0.9"),
+
+        // 🚀
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.43.0"),
+
+        // 📚
+        .package(url: "https://github.com/orlandos-nl/DNSClient.git", from: "2.2.1"),
+
+        // 🔑
+        .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.0.0"),
+
+        // 🔍
+        .package(url: "https://github.com/apple/swift-distributed-tracing.git", from: "1.0.0"),
+    ],
+    targets: [
+        .target(
+            name: "_MongoKittenCrypto",
+            dependencies: [],
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency=complete"),
+            ]),
+        .target(
+            name: "MongoCore",
+            dependencies: [
+                .product(name: "BSON", package: "BSON"),
+                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOSSL", package: "swift-nio-ssl"),
+                .product(name: "NIOFoundationCompat", package: "swift-nio"),
+                .product(name: "Logging", package: "swift-log"),
+                .product(name: "Metrics", package: "swift-metrics"),
+                .product(name: "Atomics", package: "swift-atomics"),
+            ],
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency=complete"),
+            ]),
+        .target(
+            name: "MongoKittenCore",
+            dependencies: ["MongoClient"],
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency=complete"),
+            ]),
+        .target(
+            name: "MongoKitten",
+            dependencies: ["MongoClient", "MongoKittenCore"],
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency=complete"),
+            ]),
+        .target(
+            name: "Meow",
+            dependencies: ["MongoKitten"],
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency=complete"),
+            ]),
+        .target(
+            name: "MongoClient",
+            dependencies: [
+                "MongoCore",
+                "_MongoKittenCrypto",
+                .product(name: "DNSClient", package: "DNSClient"),
+                .product(name: "Tracing", package: "swift-distributed-tracing")
+            ],
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency=complete"),
+            ]
+        ),
+        .testTarget(
+            name: "MongoCoreTests",
+            dependencies: ["MongoCore"]),
+        .testTarget(
+            name: "MongoKittenTests",
+            dependencies: [
+                "MongoKitten",
+            ]),
+        .testTarget(
+            name: "MeowTests",
+            dependencies: ["Meow"]),
+    ]
+)

Sources/Meow/Error.swift

@@ -1,7 +1,7 @@
 import MongoKitten
 
 /// Generic errors thrown by the generator
-public enum MeowModelError<M: BaseModel>: Swift.Error {
+public enum MeowModelError<M: BaseModel>: Swift.Error, @unchecked Sendable {
     /// The value for the given key is missing, or invalid
     case missingOrInvalidValue(key: String, expected: Any.Type, got: Any?)
 
@@ -29,7 +29,7 @@ public enum MeowModelError<M: BaseModel>: Swift.Error {
     case brokenFileReference(ObjectId)
 }
 
-enum MeowError: Swift.Error {
+enum MeowError: Swift.Error, @unchecked Sendable {
     /// A reference to `type` with id `id` cannot be resolved
     case referenceError(id: Any, type: Any.Type)
 

Sources/MongoClient/Authenticate+ChallengeResponse.swift

@@ -27,14 +27,14 @@ fileprivate struct AuthenticateCR: Encodable {
 
 extension MongoConnection {
     internal func authenticateCR(_ username: String, password: String, namespace: MongoNamespace) async throws  {
-        try await InstrumentationSystem.tracer.withSpan("MongoKitten.AuthenticateCR", ofKind: .client) { span in
+        try await _withSpan("MongoKitten.AuthenticateCR", context: .current ?? .topLevel, ofKind: .client) { spanContext in
             let nonceReply = try await self.executeCodable(
                 GetNonce(),
                 decodeAs: GetNonceResult.self,
                 namespace: namespace,
                 sessionId: nil,
                 traceLabel: "AuthenticateCR.Initiate",
-                serviceContext: span.context
+                serviceContext: spanContext
             )
 
             let nonce = nonceReply.nonce
@@ -53,7 +53,7 @@ extension MongoConnection {
                 namespace: namespace,
                 sessionId: nil,
                 traceLabel: "AuthenticateCR.Finalize",
-                serviceContext: span.context
+                serviceContext: spanContext
             )
 
             try authenticationReply.assertOK(

Sources/MongoClient/Authenticate+SASL.swift

@@ -136,7 +136,7 @@ extension MongoConnection {
     ///
     /// The Hasher `H` specifies the hashing algorithm used with SCRAM.
     func authenticateSASL<H: SASLHash>(hasher: H, namespace: MongoNamespace, username: String, password: String) async throws {
-        try await InstrumentationSystem.tracer.withSpan("MongoKitten.AuthenticateSASL", ofKind: .client) { span in
+        try await _withSpan("MongoKitten.AuthenticateSASL", ofKind: .client) { @Sendable span in
             let context = SCRAM<H>(hasher)
 
             let rawRequest = try context.authenticationString(forUser: username)

Sources/MongoClient/Cluster.swift

@@ -185,7 +185,7 @@ public final class MongoCluster: MongoConnectionPool, @unchecked Sendable {
             // Kick off the connection process
             try await resolveSettings()
 
-            await scheduleDiscovery()
+            scheduleDiscovery()
             self.completedInitialDiscovery = true
         }
     }
@@ -617,7 +617,7 @@ public final class MongoCluster: MongoConnectionPool, @unchecked Sendable {
         _ = try await self.next(for: .writable)
         await rediscover()
         self.completedInitialDiscovery = true
-        await scheduleDiscovery()
+        scheduleDiscovery()
     }
 }