Skip to content

Commit b42d1db

Browse files
committed
formatting
1 parent bf2f8c9 commit b42d1db

File tree

2 files changed

+21
-25
lines changed

2 files changed

+21
-25
lines changed

Tests/TracingTests/DynamicTracepointTracerTests.swift

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,19 @@ final class DynamicTracepointTracerTests: XCTestCase {
3131
InstrumentationSystem.bootstrapInternal(NoOpTracer())
3232
}
3333

34-
3534
let fileID = #fileID
3635
let line: UInt = 7777 // trick number, see withSpan below.
3736
tracer.enableTracepoint(fileID: fileID, line: line)
3837
// Imagine this is set via some "ops command", e.g. `<control> <pid, or ssh or something> trace enable Sample.swift:1234`
3938
// Effectively enabling tracepoints is similar to tracer bullets, tho bullets are generally "one off",
4039
// but here we could attach a trace-rate, so e.g.: control `<pid> trace enable Sample:1234 .2` to set 20% sampling rate etc.
4140

42-
tracer.withSpan("dont") { span in
41+
tracer.withSpan("dont") { _ in
4342
// don't capture this span...
4443
}
45-
tracer.withSpan("yes", file: #fileID, line: 7777) { span in
44+
tracer.withSpan("yes", file: #fileID, line: 7777) { _ in
4645
// do capture this span, and all child spans of it!
47-
tracer.withSpan("yes-inner", file: #fileID, line: 8888) { inner in
46+
tracer.withSpan("yes-inner", file: #fileID, line: 8888) { _ in
4847
// since the parent of this span was captured, this shall be captured as well
4948
}
5049
}
@@ -56,7 +55,6 @@ final class DynamicTracepointTracerTests: XCTestCase {
5655
XCTAssertEqual(tracer.spans[0].baggage.spanID, "span-id-fake-\(fileID)-\(line)")
5756
XCTAssertEqual(tracer.spans[1].baggage.spanID, "span-id-fake-\(fileID)-8888")
5857
}
59-
6058
}
6159

6260
final class DynamicTracepointTestTracer: Tracer {
@@ -75,28 +73,28 @@ final class DynamicTracepointTestTracer: Tracer {
7573
ofKind kind: Tracing.SpanKind,
7674
at time: DispatchWallTime,
7775
file fileID: String,
78-
line: UInt) -> Tracing.Span {
79-
76+
line: UInt) -> Tracing.Span
77+
{
8078
let tracepoint = TracepointID(fileID: fileID, line: line)
81-
guard shouldRecord(tracepoint: tracepoint) else {
79+
guard self.shouldRecord(tracepoint: tracepoint) else {
8280
return NoOpTracer.NoOpSpan(baggage: baggage)
8381
}
8482

8583
let span = TracepointSpan(
86-
operationName: operationName,
87-
startTime: time,
88-
baggage: baggage,
89-
kind: kind,
90-
file: fileID,
91-
line: line,
92-
onEnd: onEndSpan
84+
operationName: operationName,
85+
startTime: time,
86+
baggage: baggage,
87+
kind: kind,
88+
file: fileID,
89+
line: line,
90+
onEnd: onEndSpan
9391
)
9492
self.spans.append(span)
9593
return span
9694
}
9795

9896
private func shouldRecord(tracepoint: TracepointID) -> Bool {
99-
if isActive(tracepoint: tracepoint) {
97+
if self.isActive(tracepoint: tracepoint) {
10098
// this tracepoint was specifically activated!
10199
return true
102100
}
@@ -117,16 +115,15 @@ final class DynamicTracepointTestTracer: Tracer {
117115
}
118116

119117
func isActive(tracepoint: TracepointID) -> Bool {
120-
activeTracepoints.contains(tracepoint)
118+
self.activeTracepoints.contains(tracepoint)
121119
}
122120

123121
@discardableResult
124122
func enableTracepoint(fileID: String, line: UInt) -> Bool {
125-
return self.activeTracepoints.insert(TracepointID(fileID: fileID, line: line)).inserted
123+
self.activeTracepoints.insert(TracepointID(fileID: fileID, line: line)).inserted
126124
}
127125

128-
func forceFlush() {
129-
}
126+
func forceFlush() {}
130127

131128
func extract<Carrier, Extract>(_ carrier: Carrier, into baggage: inout Baggage, using extractor: Extract) where Extract: Extractor, Extract.Carrier == Carrier {
132129
let traceID = extractor.extract(key: "trace-id", from: carrier) ?? UUID().uuidString
@@ -162,8 +159,8 @@ extension DynamicTracepointTestTracer {
162159
kind: SpanKind,
163160
file fileID: String,
164161
line: UInt,
165-
onEnd: @escaping (Span) -> Void
166-
) {
162+
onEnd: @escaping (Span) -> Void)
163+
{
167164
self.operationName = operationName
168165
self.startTime = startTime
169166
self.baggage = baggage
@@ -201,7 +198,5 @@ extension DynamicTracepointTestTracer {
201198
self.endTime = time
202199
self.onEnd(self)
203200
}
204-
205201
}
206-
207-
}
202+
}

Tests/TracingTests/TestTracer.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ extension TestTracer {
6666
enum TraceIDKey: BaggageKey {
6767
typealias Value = String
6868
}
69+
6970
enum SpanIDKey: BaggageKey {
7071
typealias Value = String
7172
}

0 commit comments

Comments
 (0)