Skip to content

Commit de2a6d4

Browse files
committed
Use ResourceValue enum
1 parent c41310f commit de2a6d4

File tree

1 file changed

+19
-12
lines changed

1 file changed

+19
-12
lines changed

Tests/OpenTelemetrySdkTests/Resource/EnvVarResourceTest.swift

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,41 @@ class EnvVarResourceTest: XCTestCase {
1111
func testDefaultSharedInstance() {
1212
let resource = EnvVarResource.resource
1313
XCTAssertEqual(resource.attributes.count, 4)
14-
XCTAssertTrue(resource.attributes.keys.contains("service.name"))
15-
XCTAssertTrue(resource.attributes.keys.contains("telemetry.sdk.name"))
16-
XCTAssertTrue(resource.attributes.keys.contains("telemetry.sdk.language"))
17-
XCTAssertTrue(resource.attributes.keys.contains("telemetry.sdk.version"))
14+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.serviceName.rawValue))
15+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.telemetrySdkName.rawValue))
16+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.telemetrySdkLanguage.rawValue))
17+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.telemetrySdkVersion.rawValue))
1818
}
1919

2020
func testGetUniqueInstance() {
2121
let resource = EnvVarResource.get()
2222
XCTAssertEqual(resource.attributes.count, 4)
23-
XCTAssertTrue(resource.attributes.keys.contains("service.name"))
24-
XCTAssertTrue(resource.attributes.keys.contains("telemetry.sdk.name"))
25-
XCTAssertTrue(resource.attributes.keys.contains("telemetry.sdk.language"))
26-
XCTAssertTrue(resource.attributes.keys.contains("telemetry.sdk.version"))
23+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.serviceName.rawValue))
24+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.telemetrySdkName.rawValue))
25+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.telemetrySdkLanguage.rawValue))
26+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.telemetrySdkVersion.rawValue))
2727
}
2828

2929
func testGetUniqueInstanceConsideringEnvironment() {
3030
let environment = [ "OTEL_RESOURCE_ATTRIBUTES": "unique.key=some.value,another.key=another.value"]
3131
let resource = EnvVarResource.get(environment: environment)
3232
XCTAssertEqual(resource.attributes.count, 6)
33-
XCTAssertTrue(resource.attributes.keys.contains("service.name"))
34-
XCTAssertTrue(resource.attributes.keys.contains("telemetry.sdk.name"))
35-
XCTAssertTrue(resource.attributes.keys.contains("telemetry.sdk.language"))
36-
XCTAssertTrue(resource.attributes.keys.contains("telemetry.sdk.version"))
33+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.serviceName.rawValue))
34+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.telemetrySdkName.rawValue))
35+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.telemetrySdkLanguage.rawValue))
36+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.telemetrySdkVersion.rawValue))
3737

3838
XCTAssertTrue(resource.attributes.keys.contains("unique.key"))
3939
XCTAssertEqual(resource.attributes["unique.key"]!, AttributeValue("some.value"))
4040

4141
XCTAssertTrue(resource.attributes.keys.contains("another.key"))
4242
XCTAssertEqual(resource.attributes["another.key"]!, AttributeValue("another.value"))
4343
}
44+
45+
func testSpecifyingServiceNameViaEnvironment_changesResourceAttributeValue() {
46+
let environment = [ "OTEL_RESOURCE_ATTRIBUTES": "service.name=CustomServiceName"]
47+
let resource = EnvVarResource.get(environment: environment)
48+
XCTAssertTrue(resource.attributes.keys.contains(ResourceAttributes.serviceName.rawValue))
49+
XCTAssertEqual(resource.attributes[ResourceAttributes.serviceName.rawValue], AttributeValue("CustomServiceName"))
50+
}
4451
}

0 commit comments

Comments
 (0)