Skip to content

Port Changes from Main to Release-4 #221

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 3 commits into from
Oct 24, 2025
Merged

Port Changes from Main to Release-4 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09000ca
Upgrade OTel SDK Dependency
KarstenSchnitter Jul 29, 2025
7316ccb
Bump org.apache.commons:commons-lang3 in /cf-java-logging-support-core
dependabot[bot] Jul 29, 2025
31e7679
Adjust Maven Central Deployment after OSSRH sunset
KarstenSchnitter Aug 10, 2025
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
2 changes: 1 addition & 1 deletion cf-java-logging-support-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<version>3.18.0</version>
</dependency>
</dependencies>

Expand Down
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.31.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-jupiter</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
11 changes: 6 additions & 5 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 @@ -23,15 +23,15 @@ public class CloudFoundryResourceCustomizerTest {
@Test
void emptyResourceWithNullResource() {
CloudFoundryResourceCustomizer customizer = new CloudFoundryResourceCustomizer();
Resource resource = customizer.apply(null, DefaultConfigProperties.create(new HashMap<>()));
Resource resource = customizer.apply(null, DefaultConfigProperties.createFromMap(new HashMap<>()));
assertTrue(resource.getAttributes().isEmpty());
}

@Test
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 @@ -42,7 +42,8 @@ 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());
}

Expand All @@ -51,7 +52,7 @@ 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()));
assertStringAttribute(resource, "service.name").isEqualTo("test-application");
assertStringAttribute(resource, "sap.cf.app_name").isEqualTo("test-application");
assertStringAttribute(resource, "sap.cf.app_id").isEqualTo("test-app-id");
Expand All @@ -69,7 +70,7 @@ 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
14 changes: 12 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
<httpclient.version>4.5.14</httpclient.version>
<servlet.api.version>5.0.0</servlet.api.version>
<jetty.version>11.0.14</jetty.version>
<sonatype.plugin.version>0.8.0</sonatype.plugin.version>
</properties>

<modules>
Expand Down Expand Up @@ -229,7 +230,7 @@
</build>
<profiles>
<profile>
<id>ossrh</id>
<id>central</id>
<build>
<plugins>
<plugin>
Expand All @@ -239,7 +240,7 @@
<executions>
<execution>
<id>attach-sources</id>
<phase>validate</phase>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
Expand Down Expand Up @@ -274,6 +275,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${sonatype.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down