Skip to content

Commit 68be940

Browse files
Retain behaviour on null resource
Keep returning an empty resource if incoming resource is null. Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
1 parent 4119b43 commit 68be940

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/attributes/CloudFoundryResourceCustomizer.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ public Resource apply(Resource resource, ConfigProperties configProperties) {
3838
return Resource.empty();
3939
}
4040

41-
if (resource == null || resource.getAttributes().isEmpty()) {
41+
if (resource == null) {
42+
LOG.config("Not running in CF. Cannot obtain CF resource.");
43+
return Resource.empty();
44+
}
45+
46+
if (resource.getAttributes().isEmpty()) {
4247
LOG.config("Not running in CF. Cannot obtain CF resource attributes.");
4348
return resource;
4449
}

cf-java-logging-support-opentelemetry-agent-extension/src/test/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/attributes/CloudFoundryResourceCustomizerTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ public class CloudFoundryResourceCustomizerTest {
2020
.put("cloudfoundry.process.type", "test-process-type").put("cloudfoundry.space.id", "test-space-id")
2121
.put("cloudfoundry.space.name", "test-space").build();
2222

23+
@Test
24+
void emptyResourceWithNullResource() {
25+
CloudFoundryResourceCustomizer customizer = new CloudFoundryResourceCustomizer();
26+
Resource resource = customizer.apply(null, DefaultConfigProperties.create(new HashMap<>()));
27+
assertTrue(resource.getAttributes().isEmpty());
28+
}
29+
2330
@Test
2431
void emptyResourceWhenNotInCf() {
2532
CloudFoundryResourceCustomizer customizer = new CloudFoundryResourceCustomizer();

0 commit comments

Comments
 (0)