[InMemory] Simplify locking and avoid double-storing same values

Author: ktoso

Sources/InMemoryTracing/InMemorySpan.swift

@@ -20,7 +20,9 @@ import Tracing
 public struct InMemorySpan: Span {
 
     public let context: ServiceContext
-    public let spanContext: InMemorySpanContext
+    public var spanContext: InMemorySpanContext {
+        context.inMemorySpanContext!
+    }
 
     /// The ID of the overall trace this span belongs to.
     public var traceID: String {
@@ -57,8 +59,9 @@ public struct InMemorySpan: Span {
         onEnd: @escaping @Sendable (FinishedInMemorySpan) -> Void
     ) {
         self._operationName = LockedValueBox(operationName)
+        var context = context
+        context.inMemorySpanContext = spanContext
         self.context = context
-        self.spanContext = spanContext
         self.kind = kind
         self.startInstant = startInstant
         self.onEnd = onEnd
@@ -143,7 +146,6 @@ public struct InMemorySpan: Span {
         let finishedSpan = FinishedInMemorySpan(
             operationName: operationName,
             context: context,
-            spanContext: spanContext,
             kind: kind,
             startInstant: startInstant,
             endInstant: instant(),
@@ -169,7 +171,14 @@ public struct FinishedInMemorySpan: Sendable {
     public var operationName: String
 
     public var context: ServiceContext
-    public var spanContext: InMemorySpanContext
+    public var spanContext: InMemorySpanContext {
+        get {
+            context.inMemorySpanContext!
+        } 
+        set { 
+            context.inMemorySpanContext = newValue
+        }
+    }
 
     /// The ID of the overall trace this span belongs to.
     public var traceID: String {

Sources/InMemoryTracing/InMemoryTracer.swift

@@ -33,12 +33,16 @@ public struct InMemoryTracer: Tracer {
     public let recordInjections: Bool
     public let recordExtractions: Bool
 
-    private let _activeSpans = LockedValueBox<[InMemorySpanContext: InMemorySpan]>([:])
-    private let _finishedSpans = LockedValueBox<[FinishedInMemorySpan]>([])
-    private let _numberOfForceFlushes = LockedValueBox<Int>(0)
+    struct State {
+        var _activeSpans: [InMemorySpanContext: InMemorySpan] = [:]
+        var _finishedSpans: [FinishedInMemorySpan] = []
+        var _numberOfForceFlushes: Int = 0
 
-    private let _injections = LockedValueBox<[Injection]>([])
-    private let _extractions = LockedValueBox<[Extraction]>([])
+        var _injections: [Injection] = []
+        var _extractions: [Extraction] = []
+    }
+    var _state = LockedValueBox<State>(.init())
+    
 
     /// Create a new ``InMemoryTracer``.
     ///
@@ -98,15 +102,17 @@ extension InMemoryTracer {
             kind: kind,
             startInstant: instant()
         ) { finishedSpan in
-            _activeSpans.withValue { $0[spanContext] = nil }
-            _finishedSpans.withValue { $0.append(finishedSpan) }
+            _state.withValue { 
+                $0._activeSpans[spanContext] = nil 
+                $0._finishedSpans.append(finishedSpan)
+            }
         }
-        _activeSpans.withValue { $0[spanContext] = span }
+        _state.withValue { $0._activeSpans[spanContext] = span }
         return span
     }
 
     public func forceFlush() {
-        _numberOfForceFlushes.withValue { $0 += 1 }
+        _state.withValue { $0._numberOfForceFlushes += 1 }
     }
 }
 
@@ -116,48 +122,50 @@ extension InMemoryTracer {
 
     /// Array of active spans, i.e. spans which have been started but have not yet finished (by calling `Span/end()`).
     public var activeSpans: [InMemorySpan] {
-        _activeSpans.withValue { active in Array(active.values) }
+        _state.withValue { Array($0._activeSpans.values) }
     }
 
     /// Retrives a specific _active_ span, identified by the specific span, trace, and parent ID's
     /// stored in the `inMemorySpanContext`
     public func activeSpan(identifiedBy context: ServiceContext) -> InMemorySpan? {
         guard let spanContext = context.inMemorySpanContext else { return nil }
-        return _activeSpans.withValue { $0[spanContext] }
+        return _state.withValue { $0._activeSpans[spanContext] }
     }
 
     /// Count of the number of times ``Tracer/forceFlush()`` was called on this tracer.
     public var numberOfForceFlushes: Int {
-        _numberOfForceFlushes.withValue { $0 }
+        _state.withValue { $0._numberOfForceFlushes }
     }
 
     /// Gets, without removing, all the finished spans recorded by this tracer.
     ///
     /// - SeeAlso: `popFinishedSpans()`
     public var finishedSpans: [FinishedInMemorySpan] {
-        _finishedSpans.withValue { $0 }
+        _state.withValue { $0._finishedSpans }
     }
 
     /// Returns, and removes, all finished spans recorded by this tracer.
     public func popFinishedSpans() -> [FinishedInMemorySpan] {
-        _finishedSpans.withValue { spans in
-            defer { spans = [] }
-            return spans
+        _state.withValue { state in 
+            defer { state._finishedSpans = [] }
+            return state._finishedSpans
         }
     }
 
     /// Atomically clears any stored finished spans in this tracer.
     public func clearFinishedSpans() {
-        _finishedSpans.withValue { $0 = [] }
+        _state.withValue { $0._finishedSpans = [] }
     }
 
     /// Clears all registered finished spans, as well as injections/extractions performed by this tracer.
     public func clearAll(includingActive: Bool = false) {
-        _finishedSpans.withValue { $0 = [] }
-        _injections.withValue { $0 = [] }
-        _extractions.withValue { $0 = [] }
-        if includingActive {
-            _activeSpans.withValue { $0 = [:] }
+        _state.withValue { 
+            $0._finishedSpans = []
+            $0._injections = [] 
+            $0._extractions = [] 
+            if includingActive {
+                $0._activeSpans = [:]
+            }
         }
     }
 }
@@ -185,19 +193,19 @@ extension InMemoryTracer {
 
         if recordInjections {
             let injection = Injection(context: context, values: values)
-            _injections.withValue { $0.append(injection) }
+            _state.withValue { $0._injections.append(injection) }
         }
     }
 
     /// Lists all recorded calls to this tracer's ``Instrument/inject(_:into:using:)`` method.
     /// This may be used to inspect what span identifiers are being propagated by this tracer.
     public var performedContextInjections: [Injection] {
-        _injections.withValue { $0 }
+        _state.withValue { $0._injections }
     }
 
     /// Clear the list of recorded context injections (calls to ``Instrument/inject(_:into:using:)``).
     public func clearPerformedContextInjections() {
-        _injections.withValue { $0 = [] }
+        _state.withValue { $0._injections = [] }
     }
 
     /// Represents a recorded call to the InMemoryTracer's ``Instrument/inject(_:into:using:)`` method.
@@ -219,7 +227,7 @@ extension InMemoryTracer {
         defer {
             if self.recordExtractions {
                 let extraction = Extraction(carrier: carrier, context: context)
-                _extractions.withValue { $0.append(extraction) }
+                _state.withValue { $0._extractions.append(extraction) }
             }
         }
 
@@ -235,7 +243,7 @@ extension InMemoryTracer {
     /// Lists all recorded calls to this tracer's ``Instrument/extract(_:into:using:)`` method.
     /// This may be used to inspect what span identifiers were extracted from an incoming carrier object into ``ServiceContext``.
     public var performedContextExtractions: [Extraction] {
-        _extractions.withValue { $0 }
+        _state.withValue { $0._extractions }
     }
 
     /// Represents a recorded call to the InMemoryTracer's ``Instrument/extract(_:into:using:)`` method.