Merge pull request #482 from open-telemetry/library-evolution-support

Library evolution support

Author: bryce-b

Package.resolved

@@ -42,7 +42,6 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.20.2"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.4.4"),
         .package(url: "https://github.com/apple/swift-metrics.git", from: "2.1.1"),
-        .package(url: "https://github.com/ashleymills/Reachability.swift", from: "5.1.0")
     ],
     targets: [
         .target(name: "OpenTelemetryApi",
@@ -60,7 +59,6 @@ let package = Package(
         .target(name: "NetworkStatus",
                 dependencies: [
                     "OpenTelemetryApi",
-                    .product(name: "Reachability", package: "Reachability.swift", condition: .when(platforms: [.iOS, .macOS, .tvOS, .macCatalyst, .linux]))
                 ],
                 path: "Sources/Instrumentation/NetworkStatus",
                 linkerSettings: [.linkedFramework("CoreTelephony", .when(platforms: [.iOS], configuration: nil))]),
@@ -124,7 +122,6 @@ let package = Package(
         .testTarget(name: "NetworkStatusTests",
                     dependencies: [
                         "NetworkStatus",
-                        .product(name: "Reachability", package: "Reachability.swift", condition: .when(platforms: [.iOS, .macOS, .tvOS, .macCatalyst, .linux]))
                     ],
                     path: "Tests/InstrumentationTests/NetworkStatusTests"),
         .testTarget(name: "OpenTelemetryApiTests",

[email protected]

@@ -6,6 +6,79 @@
 #if !os(watchOS)
 
 import Foundation
+
+
+#if swift(>=5.9)
+import Network
+public class NetworkMonitor : NetworkMonitorProtocol {
+    let monitor = NWPathMonitor()
+    var connection : Connection = .unavailable
+    let monitorQueue = DispatchQueue(label: "OTel-Network-Monitor")
+    let lock = NSLock()
+
+    deinit {
+        monitor.cancel()
+    }
+    
+    public init() throws {
+        let pathHandler = { (path: NWPath) in
+            let availableInterfaces = path.availableInterfaces
+            let wifiInterface = self.getWifiInterface(interfaces: availableInterfaces)
+            let cellInterface = self.getCellInterface(interfaces: availableInterfaces)
+            var availableInterface : Connection = .unavailable
+            if let _ = cellInterface {
+                availableInterface = .cellular
+            }
+            if let _ = wifiInterface {
+                availableInterface = .wifi
+            }
+            self.lock.lock()
+            switch path.status {
+            case .requiresConnection, .satisfied:
+                self.connection = availableInterface
+            case .unsatisfied:
+                self.connection = .unavailable
+            @unknown default:
+                fatalError()
+            }
+            self.lock.unlock()
+
+        }
+        monitor.pathUpdateHandler = pathHandler
+        monitor.start(queue: monitorQueue)
+    }
+    public func getConnection() -> Connection {
+        lock.lock()
+        defer {
+            lock.unlock()
+        }
+        return connection
+        
+    }
+    
+    func getCellInterface(interfaces: [NWInterface]) -> NWInterface? {
+        var foundInterface : NWInterface? = nil
+        interfaces.forEach { interface in
+            if interface.type == .cellular {
+                foundInterface = interface
+            }
+        }
+        return foundInterface
+    }
+    func getWifiInterface(interfaces: [NWInterface]) -> NWInterface? {
+        var foundInterface : NWInterface? = nil
+        interfaces.forEach { interface in
+            if interface.type == .wifi {
+                foundInterface = interface
+            }
+        }
+        return foundInterface
+    }
+}
+
+
+
+#else
 import Reachability
 
 public class NetworkMonitor: NetworkMonitorProtocol {
@@ -31,5 +104,5 @@ public class NetworkMonitor: NetworkMonitorProtocol {
         }
     }
 }
-
+#endif
 #endif

Sources/Instrumentation/NetworkStatus/NetworkMonitor.swift

@@ -7,7 +7,7 @@
     import CoreTelephony
     import Foundation
     @testable import NetworkStatus
-    import Reachability
+
     import XCTest
 
     class MockNetworkMonitor: NetworkMonitorProtocol {