chore: update opentelemetry swift

.github/workflows/ci.yml

@@ -19,11 +19,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - name: Print Swift version
+        run: swift --version
       - name: Build xcframework
         working-directory: ./SplunkRumWorkspace/SplunkRum
         run: ./build_binaries.sh
       - name: Upload xcframework
         uses: actions/upload-artifact@v3
         with:
           name: SplunkOtel.xcframework
-          path: ./SplunkRumWorkspace/SplunkRum/xcframeworks/SplunkOtel.xcframework
+          path: ./SplunkRumWorkspace/SplunkRum/xcframeworks/SplunkOtel.xcframework

.swiftlint.yml

@@ -11,9 +11,9 @@ disabled_rules:
  - force_cast
  - private_over_fileprivate
  - cyclomatic_complexity
+ - missing_docs
 # Not really sure about a bunch of these, just turning most stuff in the 'performance' and 'lint' categories
 opt_in_rules:
- - missing_docs
  - unowned_variable_capture
  - array_init
  - identical_operands

SplunkRumWorkspace/SmokeTest/SmokeTestUITests/SmokeTestUITests.swift

@@ -43,6 +43,7 @@ class SmokeTestUITests: XCTestCase {
 
         // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
     }
+    // swiftlint:enable overridden_super_call
 
     let SLEEP_TIME: UInt32 = 30 // batch is currently every 5 so this should be plenty
 

SplunkRumWorkspace/SplunkRum/SplunkRum/NetworkInstrumentation.swift

@@ -123,7 +123,6 @@ func startHttpSpan(request: URLRequest?) -> Span? {
 
 fileprivate var ASSOC_KEY_SPAN: UInt8 = 0
 
-// swiftlint:disable missing_docs
 extension URLSessionTask {
     @objc open func splunk_swizzled_setState(state: URLSessionTask.State) {
         defer {

SplunkRumWorkspace/SplunkRum/SplunkRum/NetworkType.swift

@@ -132,6 +132,7 @@ func getNetworkInfo() -> NetworkInfo {
             info.hostConnectionSubType = shortTech(technology)
         }
     }
+    // swiftlint:enable unavailable_condition
 
     return info
 }

SplunkRumWorkspace/SplunkRum/SplunkRum/OpenTelemetry/OpenTelemetryApi/OpenTelemetry.swift

@@ -9,6 +9,9 @@ import Foundation
 ///  and BaggageManager.
 ///  The telemetry objects are lazy-loaded singletons resolved via ServiceLoader mechanism.
 public struct OpenTelemetry {
+
+    public static var version = "v1.7.0"
+
     public static var instance = OpenTelemetry()
 
     /// Registered tracerProvider or default via DefaultTracerProvider.instance.

SplunkRumWorkspace/SplunkRum/SplunkRum/OpenTelemetry/OpenTelemetrySdk/Trace/AttributesDictionary.swift

@@ -28,7 +28,7 @@ public struct AttributesDictionary {
         }
         set {
             if newValue == nil {
-                removeValueForKey(key: key)
+                _ = removeValueForKey(key: key)
             } else {
                 _ = updateValue(value: newValue!, forKey: key)
             }
@@ -80,11 +80,11 @@ public struct AttributesDictionary {
         }
     }
 
-    public mutating func removeValueForKey(key: String) {
+    public mutating func removeValueForKey(key: String) -> AttributeValue? {
         keys = keys.filter {
             $0 != key
         }
-        attributes.removeValue(forKey: key)
+        return attributes.removeValue(forKey: key)
     }
 
     public mutating func removeAll(keepCapacity: Int) {

SplunkRumWorkspace/SplunkRum/SplunkRum/OpenTelemetry/OpenTelemetrySdk/Trace/RecordEventsReadableSpan.swift

@@ -8,11 +8,23 @@ import Foundation
 /// Implementation for the Span class that records trace events.
 public class RecordEventsReadableSpan: ReadableSpan {
     public var isRecording = true
+
+    fileprivate let internalStatusQueue = DispatchQueue(label: "org.opentelemetry.RecordEventsReadableSpan.internalStatusQueue", attributes: .concurrent)
     /// The displayed name of the span.
+    fileprivate var internalName: String
     public var name: String {
-        didSet {
-            if hasEnded {
-                name = oldValue
+        get {
+            var value: String = ""
+            internalStatusQueue.sync {
+                value = internalName
+            }
+            return value
+        }
+        set {
+            internalStatusQueue.sync(flags: .barrier) {
+                if !internalEnd {
+                    internalName = newValue
+                }
             }
         }
     }
@@ -54,11 +66,22 @@ public class RecordEventsReadableSpan: ReadableSpan {
     public private(set) var totalAttributeCount: Int = 0
     /// Number of events recorded.
     public private(set) var totalRecordedEvents = 0
+
     /// The status of the span.
-    public var status = Status.unset {
-        didSet {
-            if hasEnded {
-                status = oldValue
+    fileprivate var internalStatus: Status = .unset
+    public var status: Status {
+        get {
+            var value: Status = .unset
+            internalStatusQueue.sync {
+                value = internalStatus
+            }
+            return value
+        }
+        set {
+            internalStatusQueue.sync(flags: .barrier) {
+                if !internalEnd {
+                    internalStatus = newValue
+                }
             }
         }
     }
@@ -71,12 +94,13 @@ public class RecordEventsReadableSpan: ReadableSpan {
     /// The end time of the span.
     public private(set) var endTime: Date?
     /// True if the span is ended.
-    fileprivate var endAtomic = false
-    private let endSyncLock = Lock()
+    fileprivate var internalEnd = false
     public var hasEnded: Bool {
-        endSyncLock.withLock {
-            return endAtomic
+        var value = false
+        internalStatusQueue.sync {
+            value = internalEnd
         }
+        return value
     }
 
     private let eventsSyncLock = Lock()
@@ -98,7 +122,7 @@ public class RecordEventsReadableSpan: ReadableSpan {
                  startTime: Date?)
     {
         self.context = context
-        self.name = name
+        self.internalName = name
         self.instrumentationScopeInfo = instrumentationScopeInfo
         self.parentContext = parentContext
         self.hasRemoteParent = hasRemoteParent
@@ -215,8 +239,12 @@ public class RecordEventsReadableSpan: ReadableSpan {
             if !isRecording {
                 return
             }
+
             if value == nil {
-                attributes.removeValueForKey(key: key)
+                if attributes.removeValueForKey(key: key) != nil {
+                    totalAttributeCount -= 1
+                }
+                return
             }
             totalAttributeCount += 1
             if attributes[key] == nil, totalAttributeCount > maxNumberOfAttributes {
@@ -261,12 +289,16 @@ public class RecordEventsReadableSpan: ReadableSpan {
     }
 
     public func end(time: Date) {
-        var wasAlreadyEnded = false
-        endSyncLock.withLockVoid {
-            wasAlreadyEnded = endAtomic
-            endAtomic = true
+        let alreadyEnded = internalStatusQueue.sync(flags: .barrier) { () -> Bool in
+            if internalEnd {
+                return true
+            }
+
+            internalEnd = true
+            return false
         }
-        if wasAlreadyEnded {
+
+        if alreadyEnded {
             return
         }
 
@@ -276,8 +308,8 @@ public class RecordEventsReadableSpan: ReadableSpan {
             }
         }
         endTime = time
-        spanProcessor.onEnd(span: self)
         OpenTelemetry.instance.contextProvider.removeContextForSpan(self)
+        spanProcessor.onEnd(span: self)
     }
 
     public var description: String {
@@ -286,13 +318,12 @@ public class RecordEventsReadableSpan: ReadableSpan {
 
     internal func getTotalRecordedEvents() -> Int {
         eventsSyncLock.withLock {
-            return totalRecordedEvents
+            totalRecordedEvents
         }
     }
-    
+
     /// For testing purposes
     internal func getDroppedLinksCount() -> Int {
         return totalRecordedLinks - links.count
     }
-
 }

SplunkRumWorkspace/SplunkRum/SplunkRum/UIInstrumentation.swift

@@ -18,7 +18,6 @@ limitations under the License.
 import Foundation
 import UIKit
 
-// swiftlint:disable missing_docs
 extension UIApplication {
     // FIXME really only a reasonable solution for storyboard apps/components and not swiftui ones
     @objc open func splunk_swizzled_sendAction(_ action: Selector,

dependencies.txt

@@ -1,2 +1,2 @@
 https://github.com/devicekit/DeviceKit/commit/1291f3789e1a9d8142b949940d4baf0da611cb54
-https://github.com/open-telemetry/opentelemetry-swift/commit/fd99c038c954b6858e11a29a442db993d0f0247c
+https://github.com/open-telemetry/opentelemetry-swift/commit/fd2171eebddcea03dea61fb217256f1dead2ea7f