Merge pull request #365 from DataDog/buranmert/RUMM-976-parent-baggag…

…eItems-fix RUMM-976 GH Issue #363
DataDog · Jan 12, 2021 · a07293b · a07293b
2 parents 6ba6103 + 034ed84
commit a07293b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Sources/Datadog/Tracing/DDSpanContext.swift b/Sources/Datadog/Tracing/DDSpanContext.swift
@@ -49,7 +49,7 @@ internal class BaggageItems {
     }
 
     func get(key: String) -> String? {
-        queue.sync { self.unsafeItems[key] }
+        queue.sync { self.unsafeAll[key] }
     }
 
     var all: [String: String] {

diff --git a/Tests/DatadogTests/Datadog/Tracing/DDSpanContextTests.swift b/Tests/DatadogTests/Datadog/Tracing/DDSpanContextTests.swift
@@ -49,4 +49,17 @@ class DDSpanContextTests: XCTestCase {
         XCTAssertEqual(parentBaggageItems.all["foo"], "a")
         XCTAssertEqual(childBaggageItems.all["foo"], "b")
     }
+
+    func testChildItemsGetParentItems() {
+        let parentBaggageItems = BaggageItems(targetQueue: queue, parentSpanItems: nil)
+        let childBaggageItems = BaggageItems(targetQueue: queue, parentSpanItems: parentBaggageItems)
+
+        parentBaggageItems.set(key: "foo", value: "a")
+        childBaggageItems.set(key: "bar", value: "b")
+
+        XCTAssertEqual(childBaggageItems.get(key: "foo"), "a")
+
+        XCTAssertNil(parentBaggageItems.get(key: "bar"))
+        XCTAssertEqual(childBaggageItems.get(key: "bar"), "b")
+    }
 }