Release lock after context value has been removed (#446)

mattxw · web-flow · commit 46c8adca4ba0 · 2023-08-03T17:32:32.000+02:00
diff --git a/Sources/OpenTelemetryApi/Context/ActivityContextManager.swift b/Sources/OpenTelemetryApi/Context/ActivityContextManager.swift
@@ -74,11 +74,11 @@ class ActivityContextManager: ContextManager {
         if contextMap[activityIdent]?.isEmpty ?? false {
             contextMap[activityIdent] = nil
         }
-        rlock.unlock()
         if let scope = objectScope.object(forKey: value) {
             var scope = scope.scope
             os_activity_scope_leave(&scope)
             objectScope.removeObject(forKey: value)
         }
+        rlock.unlock()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,11 @@ class ActivityContextManager: ContextManager {`
`74`	`74`	`if contextMap[activityIdent]?.isEmpty ?? false {`
`75`	`75`	`contextMap[activityIdent] = nil`
`76`	`76`	`}`
`77`		`- rlock.unlock()`
`78`	`77`	`if let scope = objectScope.object(forKey: value) {`
`79`	`78`	`var scope = scope.scope`
`80`	`79`	`os_activity_scope_leave(&scope)`
`81`	`80`	`objectScope.removeObject(forKey: value)`
`82`	`81`	`}`
	`82`	`+ rlock.unlock()`
`83`	`83`	`}`
`84`	`84`	`}`