[ROLLBACK] removed usage of eventsSyncLock

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