Skip to content

Conversation

@KarstenSchnitter
Copy link
Contributor

These are the last cherry-pick to port changes from the main branch to the release-4.
After this change the rc1 can be created and uploaded.

KarstenSchnitter and others added 3 commits October 22, 2025 14:40
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 <k.schnitter@sap.com>
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] <support@github.com>
(cherry picked from commit a5312b2)
Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
(cherry picked from commit edca148)
@juergen-walter
Copy link
Member

juergen-walter commented Oct 24, 2025

From the description of the change from "Upgrade OTel SDK Dependency" https://github.com/SAP/cf-java-logging-support/pull/212/files, i cannot understande the change from create -> createFromMap as behavior did not change afaik

https://github.com/open-telemetry/opentelemetry-java/blame/v1.50.0/sdk-extensions/autoconfigure-spi/src/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal/DefaultConfigProperties.java

@juergen-walter
Copy link
Member

Would be nice if you could cherry-pick with a reference to the original commit, as this would also link the original PRs

git cherry-pick -x adds an automatic reference

@KarstenSchnitter KarstenSchnitter merged commit 27cac79 into SAP:release-4 Oct 24, 2025
2 checks passed
KarstenSchnitter added a commit that referenced this pull request Dec 3, 2025
#221 upgraded the OpenTelemetry SDK version. This changed the construction
of the `DefaultConfigProperties` in an incompatible way. This lead to ignored
configuration properties. This change ensures, that the original behavior is restored.

The now used method reads the environment variables and system properties again.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
KarstenSchnitter added a commit that referenced this pull request Dec 3, 2025
#221 upgraded the OpenTelemetry SDK version. This changed the construction
of the `DefaultConfigProperties` in an incompatible way. This lead to ignored
configuration properties. This change ensures, that the original behavior is restored.

The now used method reads the environment variables and system properties again.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants