Skip to content

Commit 724ad61

Browse files
author
Ignacio Bonafonte
authored
Fix Xcode 13.0 compilation (#247)
1 parent dc20104 commit 724ad61

File tree

4 files changed

+29
-27
lines changed

4 files changed

+29
-27
lines changed

Package.resolved

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sources/Exporters/DatadogExporter/Spans/SpanEncoder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ internal struct DDSpan: Encodable {
7070
self.spanID = spanData.spanId
7171
self.parentID = spanData.parentSpanId
7272

73-
if let type = spanData.attributes["type"] {
73+
if spanData.attributes["type"] != nil {
7474
self.name = spanData.name
7575
} else {
7676
self.name = spanData.name + "." + spanData.kind.rawValue

Sources/Exporters/Jaeger/Utils/UDPUtils.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ func addressesFor(host: String, port: Int) throws -> [sockaddr_storage] {
1717
guard err == 0, let start = addrList else {
1818
throw NSError(domain: NSURLErrorDomain, code: NSURLErrorCannotFindHost, userInfo: nil)
1919
}
20-
defer { free(addrList) }
21-
return sequence(first: start, next: { $0.pointee.ai_next }).map { (addr) -> sockaddr_storage in
20+
defer {
21+
free(start)
22+
}
23+
return sequence(first: start, next: { $0.pointee.ai_next }).map { addr -> sockaddr_storage in
2224
sockaddr_storage(sa: addr.pointee.ai_addr, saLen: addr.pointee.ai_addrlen)
2325
}
2426
}

Sources/Instrumentation/URLSession/InstrumentationUtils.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ enum InstrumentationUtils {
2424
var implements = false
2525
if cls.instancesRespond(to: selector) {
2626
var methodCount: UInt32 = 0
27-
let methodList = class_copyMethodList(cls, &methodCount)
28-
defer {
29-
free(methodList)
27+
guard let methodList = class_copyMethodList(cls, &methodCount) else {
28+
return implements
3029
}
31-
if let methodList = methodList, methodCount > 0 {
30+
defer { free(methodList) }
31+
if methodCount > 0 {
3232
enumerateCArray(array: methodList, count: methodCount) { _, m in
3333
let sel = method_getName(m)
3434
if sel == selector {

0 commit comments

Comments
 (0)