Skip to content

Commit 378b6e8

Browse files
authored
Add client and server tracing interceptors (#1756)
1 parent 917f37d commit 378b6e8

File tree

7 files changed

+927
-1
lines changed

7 files changed

+927
-1
lines changed

Package.swift

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ let packageDependencies: [Package.Dependency] = [
7272
url: "https://github.com/apple/swift-docc-plugin",
7373
from: "1.0.0"
7474
),
75+
.package(
76+
url: "https://github.com/apple/swift-distributed-tracing.git",
77+
from: "1.0.0"
78+
),
7579
].appending(
7680
.package(
7781
url: "https://github.com/apple/swift-nio-ssl.git",
@@ -131,9 +135,11 @@ extension Target.Dependency {
131135
)
132136
static let dequeModule: Self = .product(name: "DequeModule", package: "swift-collections")
133137
static let atomics: Self = .product(name: "Atomics", package: "swift-atomics")
138+
static let tracing: Self = .product(name: "Tracing", package: "swift-distributed-tracing")
134139

135140
static let grpcCore: Self = .target(name: "GRPCCore")
136141
static let grpcInProcessTransport: Self = .target(name: "GRPCInProcessTransport")
142+
static let grpcInterceptors: Self = .target(name: "GRPCInterceptors")
137143
static let grpcHTTP2Core: Self = .target(name: "GRPCHTTP2Core")
138144
static let grpcHTTP2TransportNIOPosix: Self = .target(name: "GRPCHTTP2TransportNIOPosix")
139145
static let grpcHTTP2TransportNIOTransportServices: Self = .target(name: "GRPCHTTP2TransportNIOTransportServices")
@@ -181,6 +187,14 @@ extension Target {
181187
]
182188
)
183189

190+
static let grpcInterceptors: Target = .target(
191+
name: "GRPCInterceptors",
192+
dependencies: [
193+
.grpcCore,
194+
.tracing
195+
]
196+
)
197+
184198
static let grpcHTTP2Core: Target = .target(
185199
name: "GRPCHTTP2Core",
186200
dependencies: [
@@ -274,10 +288,20 @@ extension Target {
274288
name: "GRPCInProcessTransportTests",
275289
dependencies: [
276290
.grpcCore,
277-
.grpcInProcessTransport,
291+
.grpcInProcessTransport
278292
]
279293
)
280294

295+
static let grpcInterceptorsTests: Target = .testTarget(
296+
name: "GRPCInterceptorsTests",
297+
dependencies: [
298+
.grpcCore,
299+
.tracing,
300+
.nioCore,
301+
.grpcInterceptors
302+
]
303+
)
304+
281305
static let grpcHTTP2CoreTests: Target = .testTarget(
282306
name: "GRPCHTTP2CoreTests",
283307
dependencies: [
@@ -638,6 +662,7 @@ let package = Package(
638662
.grpcCore,
639663
.grpcInProcessTransport,
640664
.grpcCodeGen,
665+
.grpcInterceptors,
641666
.grpcHTTP2Core,
642667
.grpcHTTP2TransportNIOPosix,
643668
.grpcHTTP2TransportNIOTransportServices,
@@ -646,6 +671,7 @@ let package = Package(
646671
.grpcCoreTests,
647672
.grpcInProcessTransportTests,
648673
.grpcCodeGenTests,
674+
.grpcInterceptorsTests,
649675
.grpcHTTP2CoreTests,
650676
.grpcHTTP2TransportNIOPosixTests,
651677
.grpcHTTP2TransportNIOTransportServicesTests
Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
/*
2+
* Copyright 2024, gRPC Authors All rights reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
import GRPCCore
18+
import Tracing
19+
20+
/// A client interceptor that injects tracing information into the request.
21+
///
22+
/// The tracing information is taken from the current `ServiceContext`, and injected into the request's
23+
/// metadata. It will then be picked up by the server-side ``ServerTracingInterceptor``.
24+
///
25+
/// For more information, refer to the documentation for `swift-distributed-tracing`.
26+
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
27+
public struct ClientTracingInterceptor: ClientInterceptor {
28+
private let injector: ClientRequestInjector
29+
private let emitEventOnEachWrite: Bool
30+
31+
/// Create a new instance of a ``ClientTracingInterceptor``.
32+
///
33+
/// - Parameter emitEventOnEachWrite: If `true`, each request part sent and response part
34+
/// received will be recorded as a separate event in a tracing span. Otherwise, only the request/response
35+
/// start and end will be recorded as events.
36+
public init(emitEventOnEachWrite: Bool = false) {
37+
self.injector = ClientRequestInjector()
38+
self.emitEventOnEachWrite = emitEventOnEachWrite
39+
}
40+
41+
/// This interceptor will inject as the request's metadata whatever `ServiceContext` key-value pairs
42+
/// have been made available by the tracing implementation bootstrapped in your application.
43+
///
44+
/// Which key-value pairs are injected will depend on the specific tracing implementation
45+
/// that has been configured when bootstrapping `swift-distributed-tracing` in your application.
46+
public func intercept<Input, Output>(
47+
request: ClientRequest.Stream<Input>,
48+
context: ClientInterceptorContext,
49+
next: @Sendable (ClientRequest.Stream<Input>, ClientInterceptorContext) async throws ->
50+
ClientResponse.Stream<Output>
51+
) async throws -> ClientResponse.Stream<Output> where Input: Sendable, Output: Sendable {
52+
var request = request
53+
let tracer = InstrumentationSystem.tracer
54+
let serviceContext = ServiceContext.current ?? .topLevel
55+
56+
tracer.inject(
57+
serviceContext,
58+
into: &request.metadata,
59+
using: self.injector
60+
)
61+
62+
return try await tracer.withSpan(
63+
context.descriptor.fullyQualifiedMethod,
64+
context: serviceContext,
65+
ofKind: .client
66+
) { span in
67+
span.addEvent("Request started")
68+
69+
if self.emitEventOnEachWrite {
70+
let wrappedProducer = request.producer
71+
request.producer = { writer in
72+
let eventEmittingWriter = HookedWriter(
73+
wrapping: writer,
74+
beforeEachWrite: {
75+
span.addEvent("Sending request part")
76+
},
77+
afterEachWrite: {
78+
span.addEvent("Sent request part")
79+
}
80+
)
81+
82+
do {
83+
try await wrappedProducer(RPCWriter(wrapping: eventEmittingWriter))
84+
} catch {
85+
span.addEvent("Error encountered")
86+
throw error
87+
}
88+
89+
span.addEvent("Request end")
90+
}
91+
}
92+
93+
var response: ClientResponse.Stream<Output>
94+
do {
95+
response = try await next(request, context)
96+
} catch {
97+
span.addEvent("Error encountered")
98+
throw error
99+
}
100+
101+
switch response.accepted {
102+
case .success(var success):
103+
if self.emitEventOnEachWrite {
104+
let onEachPartRecordingSequence = success.bodyParts.map { element in
105+
span.addEvent("Received response part")
106+
return element
107+
}
108+
let onFinishRecordingSequence = OnFinishAsyncSequence(
109+
wrapping: onEachPartRecordingSequence
110+
) {
111+
span.addEvent("Received response end")
112+
}
113+
success.bodyParts = RPCAsyncSequence(wrapping: onFinishRecordingSequence)
114+
response.accepted = .success(success)
115+
} else {
116+
let onFinishRecordingSequence = OnFinishAsyncSequence(wrapping: success.bodyParts) {
117+
span.addEvent("Received response end")
118+
}
119+
success.bodyParts = RPCAsyncSequence(wrapping: onFinishRecordingSequence)
120+
response.accepted = .success(success)
121+
}
122+
case .failure:
123+
span.addEvent("Received error response")
124+
}
125+
126+
return response
127+
}
128+
}
129+
}
130+
131+
/// An injector responsible for injecting the required instrumentation keys from the `ServiceContext` into
132+
/// the request metadata.
133+
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
134+
struct ClientRequestInjector: Instrumentation.Injector {
135+
typealias Carrier = Metadata
136+
137+
func inject(_ value: String, forKey key: String, into carrier: inout Carrier) {
138+
carrier.addString(value, forKey: key)
139+
}
140+
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Copyright 2024, gRPC Authors All rights reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
import GRPCCore
17+
import Tracing
18+
19+
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
20+
struct HookedWriter<Element>: RPCWriterProtocol {
21+
private let writer: any RPCWriterProtocol<Element>
22+
private let beforeEachWrite: @Sendable () -> Void
23+
private let afterEachWrite: @Sendable () -> Void
24+
25+
init(
26+
wrapping other: some RPCWriterProtocol<Element>,
27+
beforeEachWrite: @Sendable @escaping () -> Void,
28+
afterEachWrite: @Sendable @escaping () -> Void
29+
) {
30+
self.writer = other
31+
self.beforeEachWrite = beforeEachWrite
32+
self.afterEachWrite = afterEachWrite
33+
}
34+
35+
func write(contentsOf elements: some Sequence<Element>) async throws {
36+
self.beforeEachWrite()
37+
try await self.writer.write(contentsOf: elements)
38+
self.afterEachWrite()
39+
}
40+
}
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
* Copyright 2024, gRPC Authors All rights reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
18+
struct OnFinishAsyncSequence<Element: Sendable>: AsyncSequence, Sendable {
19+
private let _makeAsyncIterator: @Sendable () -> AsyncIterator
20+
21+
init<S: AsyncSequence>(
22+
wrapping other: S,
23+
onFinish: @escaping () -> Void
24+
) where S.Element == Element {
25+
self._makeAsyncIterator = {
26+
AsyncIterator(wrapping: other.makeAsyncIterator(), onFinish: onFinish)
27+
}
28+
}
29+
30+
func makeAsyncIterator() -> AsyncIterator {
31+
self._makeAsyncIterator()
32+
}
33+
34+
struct AsyncIterator: AsyncIteratorProtocol {
35+
private var iterator: any AsyncIteratorProtocol
36+
private var onFinish: (() -> Void)?
37+
38+
fileprivate init<Iterator>(
39+
wrapping other: Iterator,
40+
onFinish: @escaping () -> Void
41+
) where Iterator: AsyncIteratorProtocol, Iterator.Element == Element {
42+
self.iterator = other
43+
self.onFinish = onFinish
44+
}
45+
46+
mutating func next() async throws -> Element? {
47+
let elem = try await self.iterator.next()
48+
49+
if elem == nil {
50+
self.onFinish?()
51+
self.onFinish = nil
52+
}
53+
54+
return elem as? Element
55+
}
56+
}
57+
}

0 commit comments

Comments
 (0)