Skip to content

Commit 36d66d2

Browse files
Upgrade OTel SDK Dependency
Slight adaptations of the code to the changed API. The additional test dependency is required as the original dependency is no longer transitive but "provided". Signed-off-by: Karsten Schnitter <[email protected]>
1 parent 7e4983e commit 36d66d2

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

cf-java-logging-support-opentelemetry-agent-extension/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<properties>
1919
<maven.compiler.source>11</maven.compiler.source>
2020
<maven.compiler.target>11</maven.compiler.target>
21-
<opentelemetry.sdk.version>1.50.0</opentelemetry.sdk.version>
21+
<opentelemetry.sdk.version>1.52.0</opentelemetry.sdk.version>
2222
</properties>
2323

2424
<dependencyManagement>
@@ -64,6 +64,12 @@
6464
<artifactId>jackson-core</artifactId>
6565
<version>${jackson-jr.version}</version>
6666
</dependency>
67+
<dependency>
68+
<groupId>com.squareup.okhttp3</groupId>
69+
<artifactId>okhttp</artifactId>
70+
<version>4.9.3</version>
71+
<scope>test</scope>
72+
</dependency>
6773
<dependency>
6874
<groupId>uk.org.webcompere</groupId>
6975
<artifactId>system-stubs-junit4</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ private static ConfigProperties getDefaultProperties() {
3636
defaults.put("com.sap.otel.extension.cloud-logging.label", "cloud-logging");
3737
defaults.put("com.sap.otel.extension.cloud-logging.tag", "Cloud Logging");
3838
defaults.put("otel.javaagent.extension.sap.cf.binding.user-provided.label", "user-provided");
39-
return DefaultConfigProperties.create(defaults);
39+
return DefaultConfigProperties.createFromMap(defaults);
4040
}
4141

4242
private static boolean isBlank(String text) {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class CloudFoundryResourceCustomizerTest {
2424
public void emptyResourceWhenNotInCf() {
2525
CloudFoundryResourceCustomizer customizer = new CloudFoundryResourceCustomizer();
2626
Resource resource =
27-
customizer.apply(Resource.builder().build(), DefaultConfigProperties.create(new HashMap<>()));
27+
customizer.apply(Resource.builder().build(), DefaultConfigProperties.createFromMap(new HashMap<>()));
2828
assertTrue(resource.getAttributes().isEmpty());
2929
}
3030

@@ -35,15 +35,16 @@ public void emptyResourceWhenDisabledByProperty() {
3535
properties.put("otel.javaagent.extension.sap.cf.resource.enabled", "false");
3636

3737
CloudFoundryResourceCustomizer customizer = new CloudFoundryResourceCustomizer();
38-
Resource resource = customizer.apply(Resource.builder().build(), DefaultConfigProperties.create(properties));
38+
Resource resource =
39+
customizer.apply(Resource.builder().build(), DefaultConfigProperties.createFromMap(properties));
3940
assertTrue(resource.getAttributes().isEmpty());
4041
}
4142

4243
@Test
4344
public void fillsResourceFromVcapApplication() {
4445
CloudFoundryResourceCustomizer customizer = new CloudFoundryResourceCustomizer();
4546
Resource resource =
46-
customizer.apply(DEFAULT_CF_RESOURCE, DefaultConfigProperties.create(Collections.emptyMap()));
47+
customizer.apply(DEFAULT_CF_RESOURCE, DefaultConfigProperties.createFromMap(Collections.emptyMap()));
4748
assertEquals("test-application", resource.getAttribute(AttributeKey.stringKey("service.name")));
4849
assertEquals("test-application", resource.getAttribute(AttributeKey.stringKey("sap.cf.app_name")));
4950
assertEquals("test-app-id", resource.getAttribute(AttributeKey.stringKey("sap.cf.app_id")));
@@ -62,7 +63,7 @@ public void keepsOriginalResourceOnOTelResourceFormat() {
6263
HashMap<String, String> config = new HashMap<String, String>() {{
6364
put("otel.javaagent.extension.sap.cf.resource.format", "opentelemetry");
6465
}};
65-
Resource resource = customizer.apply(DEFAULT_CF_RESOURCE, DefaultConfigProperties.create(config));
66+
Resource resource = customizer.apply(DEFAULT_CF_RESOURCE, DefaultConfigProperties.createFromMap(config));
6667

6768
assertEquals(DEFAULT_CF_RESOURCE, resource);
6869
}

0 commit comments

Comments
 (0)