Fix existing code and tests for the fixed merging logic

Ignacio Bonafonte · Ignacio Bonafonte · commit d83a571e6ac8 · 2021-05-20T16:19:07.000+02:00
diff --git a/Sources/Instrumentation/SDKResourceExtension/DefaultResources.swift b/Sources/Instrumentation/SDKResourceExtension/DefaultResources.swift
@@ -31,7 +31,7 @@ public class DefaultResources {
         let mirror = Mirror(reflecting: self)
         for children in mirror.children {
             if let provider = children.value as? ResourceProvider {
-                resource = provider.create().merging(other: resource)
+                resource.merge(other: provider.create())
             }
         }
         return resource
diff --git a/Tests/OpenTelemetrySdkTests/Resource/ResourceTest.swift b/Tests/OpenTelemetrySdkTests/Resource/ResourceTest.swift
@@ -46,7 +46,7 @@ class ResourceTest: XCTestCase {
     }
 
     func testMergeResources() {
-        let expectedLabelMap = ["a": AttributeValue.string("1"), "b": AttributeValue.string("2"), "c": AttributeValue.string("4")]
+        let expectedLabelMap = ["a": AttributeValue.string("1"), "b": AttributeValue.string("3"), "c": AttributeValue.string("4")]
         let resource = defaultResource.merging(other: resource1).merging(other: resource2)
         XCTAssertEqual(resource.attributes, expectedLabelMap)
     }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public class DefaultResources {`
`31`	`31`	`let mirror = Mirror(reflecting: self)`
`32`	`32`	`for children in mirror.children {`
`33`	`33`	`if let provider = children.value as? ResourceProvider {`
`34`		`- resource = provider.create().merging(other: resource)`
	`34`	`+ resource.merge(other: provider.create())`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`return resource`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class ResourceTest: XCTestCase {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`func testMergeResources() {`
`49`		`- let expectedLabelMap = ["a": AttributeValue.string("1"), "b": AttributeValue.string("2"), "c": AttributeValue.string("4")]`
	`49`	`+ let expectedLabelMap = ["a": AttributeValue.string("1"), "b": AttributeValue.string("3"), "c": AttributeValue.string("4")]`
`50`	`50`	`let resource = defaultResource.merging(other: resource1).merging(other: resource2)`
`51`	`51`	`XCTAssertEqual(resource.attributes, expectedLabelMap)`
`52`	`52`	`}`