Skip to content

Commit fdc77fd

Browse files
author
Ignacio Bonafonte
authored
Merge pull request #239 from open-telemetry/fix-ios-compiling
2 parents e437e92 + ea6f95d commit fdc77fd

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

Sources/Exporters/DatadogExporter/Utils/DataCompression/DataCompression.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import Foundation
3131
import Compression
3232

33-
public extension Data
33+
extension Data
3434
{
3535
/// Compresses the data.
3636
/// - parameter withAlgorithm: Compression algorithm to use. See the `CompressionAlgorithm` type
@@ -268,7 +268,7 @@ public extension Data
268268

269269

270270
/// Struct based type representing a Crc32 checksum.
271-
public struct Crc32: CustomStringConvertible
271+
struct Crc32: CustomStringConvertible
272272
{
273273
private static let zLibCrc32: ZLibCrc32FuncPtr? = loadCrc32fromZLib()
274274

@@ -367,7 +367,7 @@ public struct Crc32: CustomStringConvertible
367367

368368

369369
/// Struct based type representing a Adler32 checksum.
370-
public struct Adler32: CustomStringConvertible
370+
struct Adler32: CustomStringConvertible
371371
{
372372
private static let zLibAdler32: ZLibAdler32FuncPtr? = loadAdler32fromZLib()
373373

Sources/Instrumentation/NetworkStatus/NetworkMonitor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import Foundation
77

88
public class NetworkMonitor: NetworkMonitorProtocol {
9-
public private(set) var reachability: Reachability
9+
var reachability: Reachability
1010

1111
public init() throws {
1212
reachability = try Reachability()

Sources/Instrumentation/NetworkStatus/NetworkStatus.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import CoreTelephony
88
import Foundation
99
import Network
10-
import Reachability
1110

1211
public class NetworkStatus {
1312
public private(set) var networkInfo: CTTelephonyNetworkInfo

Sources/Instrumentation/NetworkStatus/Reachability/Reachability.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
2828
import SystemConfiguration
2929
import Foundation
3030

31-
public enum ReachabilityError: Error {
31+
enum ReachabilityError: Error {
3232
case failedToCreateWithAddress(sockaddr, Int32)
3333
case failedToCreateWithHostname(String, Int32)
3434
case unableToSetCallback(Int32)
@@ -37,13 +37,13 @@ public enum ReachabilityError: Error {
3737
}
3838

3939
@available(*, unavailable, renamed: "Notification.Name.reachabilityChanged")
40-
public let ReachabilityChangedNotification = NSNotification.Name("ReachabilityChangedNotification")
40+
let ReachabilityChangedNotification = NSNotification.Name("ReachabilityChangedNotification")
4141

42-
public extension Notification.Name {
42+
extension Notification.Name {
4343
static let reachabilityChanged = Notification.Name("reachabilityChanged")
4444
}
4545

46-
public class Reachability {
46+
class Reachability {
4747

4848
public typealias NetworkReachable = (Reachability) -> ()
4949
public typealias NetworkUnreachable = (Reachability) -> ()
@@ -166,7 +166,7 @@ public class Reachability {
166166
}
167167
}
168168

169-
public extension Reachability {
169+
extension Reachability {
170170

171171
// MARK: - *** Notifier methods ***
172172
func startNotifier() throws {

Sources/Instrumentation/URLSession/URLSessionLogger.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import OpenTelemetryApi
88
import OpenTelemetrySdk
99
import os.log
1010
#if os(iOS) && !targetEnvironment(macCatalyst)
11-
1211
import NetworkStatus
1312
#endif // os(iOS) && !targetEnvironment(macCatalyst)
1413

@@ -79,7 +78,7 @@ class URLSessionLogger {
7978
}
8079

8180
var returnRequest: URLRequest?
82-
if shouldInjectHeaders && (instrumentation.configuration.shouldInjectTracingHeaders?(request) ?? true) {
81+
if shouldInjectHeaders, instrumentation.configuration.shouldInjectTracingHeaders?(request) ?? true {
8382
returnRequest = instrumentedRequest(for: request, span: span, instrumentation: instrumentation)
8483
}
8584

0 commit comments

Comments
 (0)