Skip to content

Commit 12d7326

Browse files
committed
formatting
1 parent 1803401 commit 12d7326

File tree

2 files changed

+50
-23
lines changed

2 files changed

+50
-23
lines changed

Sources/Tracing/Tracer.swift

+34-8
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,15 @@ extension Tracer {
7070
file fileID: String = #fileID,
7171
line: UInt = #line
7272
) -> Span {
73-
self.startSpan(operationName, baggage: baggage, ofKind: kind, at: .now(),
74-
function: function, file: fileID, line: line)
73+
self.startSpan(
74+
operationName,
75+
baggage: baggage,
76+
ofKind: kind,
77+
at: .now(),
78+
function: function,
79+
file: fileID,
80+
line: line
81+
)
7582
}
7683
}
7784

@@ -102,8 +109,15 @@ extension Tracer {
102109
line: UInt = #line,
103110
_ operation: (Span) throws -> T
104111
) rethrows -> T {
105-
let span = self.startSpan(operationName, baggage: baggage, ofKind: kind, at: .now(),
106-
function: function, file: fileID, line: line)
112+
let span = self.startSpan(
113+
operationName,
114+
baggage: baggage,
115+
ofKind: kind,
116+
at: .now(),
117+
function: function,
118+
file: fileID,
119+
line: line
120+
)
107121
defer { span.end() }
108122
do {
109123
return try operation(span)
@@ -142,8 +156,14 @@ extension Tracer {
142156
line: UInt = #line,
143157
_ operation: (Span) throws -> T
144158
) rethrows -> T {
145-
try self.withSpan(operationName, baggage: .current ?? .topLevel, ofKind: kind,
146-
function: function, file: fileID, line: line) { span in
159+
try self.withSpan(
160+
operationName,
161+
baggage: .current ?? .topLevel,
162+
ofKind: kind,
163+
function: function,
164+
file: fileID,
165+
line: line
166+
) { span in
147167
try Baggage.$current.withValue(span.baggage) {
148168
try operation(span)
149169
}
@@ -172,8 +192,14 @@ extension Tracer {
172192
line: UInt = #line,
173193
_ operation: (Span) async throws -> T
174194
) async rethrows -> T {
175-
let span = self.startSpan(operationName, baggage: .current ?? .topLevel, ofKind: kind,
176-
function: function, file: fileID, line: line)
195+
let span = self.startSpan(
196+
operationName,
197+
baggage: .current ?? .topLevel,
198+
ofKind: kind,
199+
function: function,
200+
file: fileID,
201+
line: line
202+
)
177203
defer { span.end() }
178204
do {
179205
return try await Baggage.$current.withValue(span.baggage) {

Tests/TracingTests/DynamicTracepointTracerTests.swift

+16-15
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ final class DynamicTracepointTracerTests: XCTestCase {
7171
let fakeLine: UInt = 66
7272
let fakeNextLine: UInt = fakeLine + 11
7373

74-
logic(fakeLine: 55)
75-
traceMeLogic(fakeLine: fakeLine)
74+
self.logic(fakeLine: 55)
75+
self.traceMeLogic(fakeLine: fakeLine)
7676

7777
XCTAssertEqual(tracer.spans.count, 2)
7878
for span in tracer.spans {
@@ -84,9 +84,9 @@ final class DynamicTracepointTracerTests: XCTestCase {
8484

8585
func logic(fakeLine: UInt) {
8686
InstrumentationSystem.tracer.withSpan("\(#function)-dont", line: fakeLine) { _ in
87-
8887
}
8988
}
89+
9090
func traceMeLogic(fakeLine: UInt) {
9191
InstrumentationSystem.tracer.withSpan("\(#function)-yes", line: fakeLine) { _ in
9292
InstrumentationSystem.tracer.withSpan("\(#function)-yes-inside", line: fakeLine + 11) { _ in
@@ -125,7 +125,7 @@ final class DynamicTracepointTestTracer: Tracer {
125125
}
126126
}
127127

128-
return match
128+
return match
129129
}
130130
}
131131

@@ -139,20 +139,21 @@ final class DynamicTracepointTestTracer: Tracer {
139139
at time: DispatchWallTime,
140140
function: String,
141141
file fileID: String,
142-
line: UInt) -> Tracing.Span {
142+
line: UInt) -> Tracing.Span
143+
{
143144
let tracepoint = TracepointID(function: function, fileID: fileID, line: line)
144145
guard self.shouldRecord(tracepoint: tracepoint) else {
145146
return NoOpTracer.NoOpSpan(baggage: baggage)
146147
}
147148

148149
let span = TracepointSpan(
149-
operationName: operationName,
150-
startTime: time,
151-
baggage: baggage,
152-
kind: kind,
153-
file: fileID,
154-
line: line,
155-
onEnd: onEndSpan
150+
operationName: operationName,
151+
startTime: time,
152+
baggage: baggage,
153+
kind: kind,
154+
file: fileID,
155+
line: line,
156+
onEnd: onEndSpan
156157
)
157158
self.spans.append(span)
158159
return span
@@ -198,8 +199,7 @@ final class DynamicTracepointTestTracer: Tracer {
198199
self.activeTracepoints.insert(TracepointID(function: function, fileID: fileID, line: line)).inserted
199200
}
200201

201-
func forceFlush() {
202-
}
202+
func forceFlush() {}
203203

204204
func extract<Carrier, Extract>(_ carrier: Carrier, into baggage: inout Baggage, using extractor: Extract) where Extract: Extractor, Extract.Carrier == Carrier {
205205
let traceID = extractor.extract(key: "trace-id", from: carrier) ?? UUID().uuidString
@@ -235,7 +235,8 @@ extension DynamicTracepointTestTracer {
235235
kind: SpanKind,
236236
file fileID: String,
237237
line: UInt,
238-
onEnd: @escaping (Span) -> Void) {
238+
onEnd: @escaping (Span) -> Void)
239+
{
239240
self.operationName = operationName
240241
self.startTime = startTime
241242
self.baggage = baggage

0 commit comments

Comments
 (0)