Skip to content

Upgrade OTel SDK Dependency #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KarstenSchnitter merged 1 commit into from
Jul 29, 2025
Merged

Upgrade OTel SDK Dependency #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion cf-java-logging-support-opentelemetry-agent-extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<opentelemetry.sdk.version>1.50.0</opentelemetry.sdk.version>
<opentelemetry.sdk.version>1.52.0</opentelemetry.sdk.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -64,6 +64,12 @@
<artifactId>jackson-core</artifactId>
<version>${jackson-jr.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.9.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.org.webcompere</groupId>
<artifactId>system-stubs-junit4</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...hcf/cf/logging/opentelemetry/agent/ext/binding/CloudLoggingBindingPropertiesSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ private static ConfigProperties getDefaultProperties() {
defaults.put("com.sap.otel.extension.cloud-logging.label", "cloud-logging");
defaults.put("com.sap.otel.extension.cloud-logging.tag", "Cloud Logging");
defaults.put("otel.javaagent.extension.sap.cf.binding.user-provided.label", "user-provided");
return DefaultConfigProperties.create(defaults);
return DefaultConfigProperties.createFromMap(defaults);
}

private static boolean isBlank(String text) {
Expand Down
9 changes: 5 additions & 4 deletions ...hcf/cf/logging/opentelemetry/agent/ext/attributes/CloudFoundryResourceCustomizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class CloudFoundryResourceCustomizerTest {
public void emptyResourceWhenNotInCf() {
CloudFoundryResourceCustomizer customizer = new CloudFoundryResourceCustomizer();
Resource resource =
customizer.apply(Resource.builder().build(), DefaultConfigProperties.create(new HashMap<>()));
customizer.apply(Resource.builder().build(), DefaultConfigProperties.createFromMap(new HashMap<>()));
assertTrue(resource.getAttributes().isEmpty());
}

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

CloudFoundryResourceCustomizer customizer = new CloudFoundryResourceCustomizer();
Resource resource = customizer.apply(Resource.builder().build(), DefaultConfigProperties.create(properties));
Resource resource =
customizer.apply(Resource.builder().build(), DefaultConfigProperties.createFromMap(properties));
assertTrue(resource.getAttributes().isEmpty());
}

@Test
public void fillsResourceFromVcapApplication() {
CloudFoundryResourceCustomizer customizer = new CloudFoundryResourceCustomizer();
Resource resource =
customizer.apply(DEFAULT_CF_RESOURCE, DefaultConfigProperties.create(Collections.emptyMap()));
customizer.apply(DEFAULT_CF_RESOURCE, DefaultConfigProperties.createFromMap(Collections.emptyMap()));
assertEquals("test-application", resource.getAttribute(AttributeKey.stringKey("service.name")));
assertEquals("test-application", resource.getAttribute(AttributeKey.stringKey("sap.cf.app_name")));
assertEquals("test-app-id", resource.getAttribute(AttributeKey.stringKey("sap.cf.app_id")));
Expand All @@ -62,7 +63,7 @@ public void keepsOriginalResourceOnOTelResourceFormat() {
HashMap<String, String> config = new HashMap<String, String>() {{
put("otel.javaagent.extension.sap.cf.resource.format", "opentelemetry");
}};
Resource resource = customizer.apply(DEFAULT_CF_RESOURCE, DefaultConfigProperties.create(config));
Resource resource = customizer.apply(DEFAULT_CF_RESOURCE, DefaultConfigProperties.createFromMap(config));

assertEquals(DEFAULT_CF_RESOURCE, resource);
}
Expand Down