Merge branch 'main' into SignPost-Integration

Author: Ignacio Bonafonte

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

Sources/OpenTelemetrySdk/Resources/Resource.swift

@@ -53,14 +53,14 @@ public struct Resource: Equatable, Hashable {
     /// In case of a collision, current Resource takes precedence.
     /// - Parameter other: the Resource that will be merged with this
     public mutating func merge(other: Resource) {
-        attributes.merge(other.attributes) { current, _ in current }
+        attributes.merge(other.attributes) { _, other in other }
     }
 
     /// Returns a new, merged Resource by merging the current Resource with the other Resource.
     /// In case of a collision, current Resource takes precedence.
     /// - Parameter other: the Resource that will be merged with this
     public func merging(other: Resource) -> Resource {
-        let labelsCopy = attributes.merging(other.attributes) { current, _ in current }
+        let labelsCopy = attributes.merging(other.attributes) { _, other in other }
         return Resource(attributes: labelsCopy)
     }
 

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)
     }