Added also the usage of eventsSyncLock to wrap the toSpanData operation

open-telemetry · Nov 6, 2024 · fcc80ee · fcc80ee
1 parent 1137364
commit fcc80ee
Showing 1 changed file with 23 additions and 21 deletions.
diff --git a/Sources/OpenTelemetrySdk/Trace/RecordEventsReadableSpan.swift b/Sources/OpenTelemetrySdk/Trace/RecordEventsReadableSpan.swift
@@ -192,27 +192,29 @@ public class RecordEventsReadableSpan: ReadableSpan {
     }
 
     public func toSpanData() -> SpanData {
-        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)
+        eventsSyncLock.withLock {
+            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)
+            }
         }
     }