Fix task local stack was not being handled correctly, it could set external values

Ignacio Bonafonte · Ignacio Bonafonte · commit 73d6eb7a0ebe · 2021-12-16T09:40:57.000+01:00
diff --git a/Sources/OpenTelemetryApi/Context/ActivityContextManager.swift b/Sources/OpenTelemetryApi/Context/ActivityContextManager.swift
@@ -139,15 +139,15 @@ class ActivityContextManager: ContextManager {
             if #available(macOS 12.0, iOS 15.0, tvOS 15.0, *) {
                 // If there is a parent activity, set its content as the task local
                 ActivityContextManager.taskLocalContextManager.removeContextValue(forKey: key, value: value)
-                if let currentContext = self.getCurrentContextValue(forKey: key) {
+                if let currentContext = ActivityContextManager.taskLocalContextManager.getCurrentContextValue(forKey: key) {
                     ActivityContextManager.taskLocalContextManager.setCurrentContextValue(forKey: key, value: currentContext)
                 }
             }
 #else
             // If there is a parent activity, set its content as the task local
             if #available(macOS 10.15, iOS 13.0, tvOS 13.0, *) {
                 ActivityContextManager.taskLocalContextManager.removeContextValue(forKey: key, value: value)
-                if let currentContext = self.getCurrentContextValue(forKey: key) {
+                if let currentContext = ActivityContextManager.taskLocalContextManager.getCurrentContextValue(forKey: key) {
                     ActivityContextManager.taskLocalContextManager.setCurrentContextValue(forKey: key, value: currentContext)
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -139,15 +139,15 @@ class ActivityContextManager: ContextManager {`
`139`	`139`	`if #available(macOS 12.0, iOS 15.0, tvOS 15.0, *) {`
`140`	`140`	`// If there is a parent activity, set its content as the task local`
`141`	`141`	`ActivityContextManager.taskLocalContextManager.removeContextValue(forKey: key, value: value)`
`142`		`- if let currentContext = self.getCurrentContextValue(forKey: key) {`
	`142`	`+ if let currentContext = ActivityContextManager.taskLocalContextManager.getCurrentContextValue(forKey: key) {`
`143`	`143`	`ActivityContextManager.taskLocalContextManager.setCurrentContextValue(forKey: key, value: currentContext)`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`#else`
`147`	`147`	`// If there is a parent activity, set its content as the task local`
`148`	`148`	`if #available(macOS 10.15, iOS 13.0, tvOS 13.0, *) {`
`149`	`149`	`ActivityContextManager.taskLocalContextManager.removeContextValue(forKey: key, value: value)`
`150`		`- if let currentContext = self.getCurrentContextValue(forKey: key) {`
	`150`	`+ if let currentContext = ActivityContextManager.taskLocalContextManager.getCurrentContextValue(forKey: key) {`
`151`	`151`	`ActivityContextManager.taskLocalContextManager.setCurrentContextValue(forKey: key, value: currentContext)`
`152`	`152`	`}`
`153`	`153`	`}`