Skip to content

Commit c191e11

Browse files
committed
build: fix the 6.0 build, there's no package traits below 6.1
1 parent 19ac881 commit c191e11

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

Package.swift

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ let package = Package(
3838
products: [
3939
.library(name: "AsyncHTTPClient", targets: ["AsyncHTTPClient"])
4040
],
41-
traits: [
42-
.trait(name: "TracingSupport"),
43-
.default(enabledTraits: ["TracingSupport"]),
44-
],
4541
dependencies: [
4642
.package(url: "https://github.com/apple/swift-nio.git", from: "2.81.0"),
4743
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.30.0"),
@@ -79,11 +75,8 @@ let package = Package(
7975
.product(name: "Atomics", package: "swift-atomics"),
8076
.product(name: "Algorithms", package: "swift-algorithms"),
8177
// Observability support
82-
.product(
83-
name: "Tracing",
84-
package: "swift-distributed-tracing",
85-
condition: .when(traits: ["TracingSupport"])
86-
),
78+
.product(name: "Tracing", package: "swift-distributed-tracing"),
79+
.product(name: "InMemoryTracing", package: "swift-distributed-tracing"),
8780
],
8881
swiftSettings: strictConcurrencySettings
8982
),
@@ -103,6 +96,9 @@ let package = Package(
10396
.product(name: "Logging", package: "swift-log"),
10497
.product(name: "Atomics", package: "swift-atomics"),
10598
.product(name: "Algorithms", package: "swift-algorithms"),
99+
// Observability support
100+
.product(name: "Tracing", package: "swift-distributed-tracing"),
101+
.product(name: "InMemoryTracing", package: "swift-distributed-tracing"),
106102
],
107103
resources: [
108104
.copy("Resources/self_signed_cert.pem"),

Sources/AsyncHTTPClient/HTTPClient.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ public final class HTTPClient: Sendable {
711711
eventLoop eventLoopPreference: EventLoopPreference,
712712
deadline: NIODeadline? = nil,
713713
logger originalLogger: Logger?,
714-
redirectState: RedirectState?,
714+
redirectState: RedirectState?
715715
) -> Task<Delegate.Response> {
716716
let logger = (originalLogger ?? HTTPClient.loggingDisabled).attachingRequestInformation(
717717
request,

0 commit comments

Comments
 (0)