Modify toSpanData to happen inside attributesLock to prevent data…

… races (#632)
open-telemetry · Nov 7, 2024 · 0cd4a4c · 0cd4a4c
1 parent d0006d3
commit 0cd4a4c
Showing 1 changed file with 22 additions and 20 deletions.
diff --git a/Sources/OpenTelemetrySdk/Trace/RecordEventsReadableSpan.swift b/Sources/OpenTelemetrySdk/Trace/RecordEventsReadableSpan.swift
@@ -192,26 +192,28 @@ public class RecordEventsReadableSpan: ReadableSpan {
     }
 
     public func toSpanData() -> SpanData {
-        return SpanData(traceId: context.traceId,
-                        spanId: context.spanId,
-                        traceFlags: context.traceFlags,
-                        traceState: context.traceState,
-                        parentSpanId: parentContext?.spanId,
-                        resource: resource,
-                        instrumentationScope: instrumentationScopeInfo,
-                        name: name,
-                        kind: kind,
-                        startTime: startTime,
-                        attributes: attributes.attributes,
-                        events: adaptEvents(),
-                        links: adaptLinks(),
-                        status: status,
-                        endTime: endTime ?? clock.now,
-                        hasRemoteParent: hasRemoteParent,
-                        hasEnded: hasEnded,
-                        totalRecordedEvents: getTotalRecordedEvents(),
-                        totalRecordedLinks: totalRecordedLinks,
-                        totalAttributeCount: totalAttributeCount)
+        attributesSyncLock.withLock {
+            return SpanData(traceId: context.traceId,
+                            spanId: context.spanId,
+                            traceFlags: context.traceFlags,
+                            traceState: context.traceState,
+                            parentSpanId: parentContext?.spanId,
+                            resource: resource,
+                            instrumentationScope: instrumentationScopeInfo,
+                            name: name,
+                            kind: kind,
+                            startTime: startTime,
+                            attributes: attributes.attributes,
+                            events: adaptEvents(),
+                            links: adaptLinks(),
+                            status: status,
+                            endTime: endTime ?? clock.now,
+                            hasRemoteParent: hasRemoteParent,
+                            hasEnded: hasEnded,
+                            totalRecordedEvents: getTotalRecordedEvents(),
+                            totalRecordedLinks: totalRecordedLinks,
+                            totalAttributeCount: totalAttributeCount)
+        }
     }
 
     private func adaptEvents() -> [SpanData.Event] {