Merge branch 'main' into fix-metrics-thread-races

Author: Ignacio Bonafonte

Sources/OpenTelemetrySdk/Trace/AttributesDictionary.swift

@@ -29,7 +29,7 @@ public struct AttributesDictionary {
         }
         set {
             if newValue == nil {
-                removeValueForKey(key: key)
+                _ = removeValueForKey(key: key)
             } else {
                 _ = updateValue(value: newValue!, forKey: key)
             }
@@ -81,11 +81,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) {

Sources/OpenTelemetrySdk/Trace/RecordEventsReadableSpan.swift

@@ -242,7 +242,10 @@ public class RecordEventsReadableSpan: ReadableSpan {
             }
 
             if value == nil {
-                attributes.removeValueForKey(key: key)
+                if attributes.removeValueForKey(key: key) != nil {
+                    totalAttributeCount -= 1
+                }
+                return
             }
             totalAttributeCount += 1
             if attributes[key] == nil, totalAttributeCount > maxNumberOfAttributes {

Tests/OpenTelemetrySdkTests/Trace/RecordEventsReadableSpanTests.swift

@@ -235,14 +235,24 @@ class RecordEventsReadableSpanTest: XCTestCase {
         let spanData = span.toSpanData()
         XCTAssertEqual(spanData.events.count, 2)
     }
-    
+
     func testWithInitializedAttributes() {
-        
-        let attributes =  ["hello" : AttributeValue.string("world")]
-        
+        let attributes = ["hello": AttributeValue.string("world")]
+
         let span = createTestSpan(attributes: attributes)
-        
+
         XCTAssertEqual(attributes.count, span.totalAttributeCount, "total attributes not counted properly")
+        XCTAssertEqual(span.toSpanData().attributes.count, span.totalAttributeCount, "total attributes not counted properly")
+
+    }
+
+    func testRemovingAttributes() {
+        let attributes = ["remove": AttributeValue.string("me")]
+        let span = createTestSpan(attributes: attributes)
+        span.setAttribute(key: "keep", value: "me")
+        span.setAttribute(key: "remove", value: nil)
+        XCTAssertEqual(1, span.totalAttributeCount, "total attributes not counted properly")
+        XCTAssertEqual(span.toSpanData().attributes.count, span.totalAttributeCount, "total attributes not counted properly")
     }
 
     func testDroppingAttributes() {