From 09000cadd50220a708ef366fbad0858f174baf7c Mon Sep 17 00:00:00 2001 From: Karsten Schnitter Date: Tue, 29 Jul 2025 13:32:22 +0200 Subject: [PATCH 1/3] 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 --- .../pom.xml | 8 +++++++- .../CloudLoggingBindingPropertiesSupplier.java | 2 +- .../CloudFoundryResourceCustomizerTest.java | 11 ++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/cf-java-logging-support-opentelemetry-agent-extension/pom.xml b/cf-java-logging-support-opentelemetry-agent-extension/pom.xml index 0e3013bc..fd6ddc58 100644 --- a/cf-java-logging-support-opentelemetry-agent-extension/pom.xml +++ b/cf-java-logging-support-opentelemetry-agent-extension/pom.xml @@ -18,7 +18,7 @@ 11 11 - 1.31.0 + 1.52.0 @@ -64,6 +64,12 @@ jackson-core ${jackson-jr.version} + + com.squareup.okhttp3 + okhttp + 4.9.3 + test + uk.org.webcompere system-stubs-jupiter diff --git a/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CloudLoggingBindingPropertiesSupplier.java b/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CloudLoggingBindingPropertiesSupplier.java index 34220088..62df817d 100644 --- a/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CloudLoggingBindingPropertiesSupplier.java +++ b/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CloudLoggingBindingPropertiesSupplier.java @@ -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) { diff --git a/cf-java-logging-support-opentelemetry-agent-extension/src/test/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/attributes/CloudFoundryResourceCustomizerTest.java b/cf-java-logging-support-opentelemetry-agent-extension/src/test/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/attributes/CloudFoundryResourceCustomizerTest.java index 5df2eee3..cf96401d 100644 --- a/cf-java-logging-support-opentelemetry-agent-extension/src/test/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/attributes/CloudFoundryResourceCustomizerTest.java +++ b/cf-java-logging-support-opentelemetry-agent-extension/src/test/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/attributes/CloudFoundryResourceCustomizerTest.java @@ -23,7 +23,7 @@ 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()); } @@ -31,7 +31,7 @@ void emptyResourceWithNullResource() { 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()); } @@ -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()); } @@ -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"); @@ -69,7 +70,7 @@ void keepsOriginalResourceOnOTelResourceFormat() { HashMap config = new HashMap() {{ 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); } From 7316ccb29efaf29f0a02ea993a76d5bf67892917 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Jul 2025 13:42:41 +0000 Subject: [PATCH 2/3] Bump org.apache.commons:commons-lang3 in /cf-java-logging-support-core Bumps org.apache.commons:commons-lang3 from 3.12.0 to 3.18.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-version: 3.18.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] (cherry picked from commit a5312b25531dbf468ce76aedea568d7b0f17ada5) --- cf-java-logging-support-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf-java-logging-support-core/pom.xml b/cf-java-logging-support-core/pom.xml index 72bc3f0e..03b1863e 100644 --- a/cf-java-logging-support-core/pom.xml +++ b/cf-java-logging-support-core/pom.xml @@ -25,7 +25,7 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.18.0 From 31e76791e0186e8c61a3f4749d019d9c98da9795 Mon Sep 17 00:00:00 2001 From: Karsten Schnitter Date: Sun, 10 Aug 2025 11:26:53 +0200 Subject: [PATCH 3/3] Adjust Maven Central Deployment after OSSRH sunset Signed-off-by: Karsten Schnitter (cherry picked from commit edca148083a2eee4b3e31bea91e856760f44d17e) --- pom.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a0a32357..970b6ae9 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,7 @@ 4.5.14 5.0.0 11.0.14 + 0.8.0 @@ -229,7 +230,7 @@ - ossrh + central @@ -239,7 +240,7 @@ attach-sources - validate + package jar-no-fork @@ -274,6 +275,15 @@ + + org.sonatype.central + central-publishing-maven-plugin + ${sonatype.plugin.version} + true + + central + +