Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 14 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
[![Build Status](https://travis-ci.com/SAP/cf-java-logging-support.svg?branch=master)](https://travis-ci.com/SAP/cf-java-logging-support)
[![REUSE status](https://api.reuse.software/badge/github.com/SAP/cf-java-logging-support)](https://api.reuse.software/info/github.com/SAP/cf-java-logging-support)

**Note: The default branch has been renamed from master to main.**
Please execute on your local repository:
**Warning: The `main` branch was force-pushed on October 30th, 2025.**

If you cloned or checked out this repository before that date, you may encounter issues when pulling new changes. To
resolve this, reset your local `main` branch to match the remote:

```shell
git fetch origin git checkout main git reset --hard origin/main
```
git branch -m master main
git fetch origin
git branch -u origin/main main
git remote set-head origin -a
```

**Caution:** This will discard any local changes on your `main` branch.

## Summary

Expand Down Expand Up @@ -62,16 +63,16 @@ All in all, you should do the following:
4. Adjust your logging configuration accordingly.

Let's say you want to make use of the *servlet filter* feature, then you need to add the following dependency to your
POM with property `cf-logging-version` referring to the latest nexus version (currently `4.0.0-RC1`):
POM with property `cf-logging-version` referring to the latest nexus version (currently `4.0.0-RC2`):

```xml

<properties>
<cf-logging-version>4.0.0-RC1</cf-logging-version>
<cf-logging-version>4.0.0-RC2</cf-logging-version>
</properties>
```

``` xml

<dependency>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-servlet</artifactId>
Expand Down Expand Up @@ -106,7 +107,7 @@ corresponding dependencies in your POM file:
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.11</version>
<version>1.5.20</version>
</dependency>
```

Expand All @@ -121,12 +122,12 @@ corresponding dependencies in your POM file:
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.20.0</version>
<version>2.25.2</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.20.0</version>
<version>2.25.2</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion cf-java-logging-support-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>4.0.0-RC1</version>
<version>4.0.0-RC2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion cf-java-logging-support-log4j2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<relativePath>../pom.xml</relativePath>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>4.0.0-RC1</version>
<version>4.0.0-RC2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion cf-java-logging-support-logback/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<relativePath>../pom.xml</relativePath>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>4.0.0-RC1</version>
<version>4.0.0-RC2</version>
</parent>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<artifactId>cf-java-logging-support-parent</artifactId>
<groupId>com.sap.hcp.cf.logging</groupId>
<version>4.0.0-RC1</version>
<version>4.0.0-RC2</version>
</parent>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
public class CloudLoggingConfigurationCustomizerProvider implements AutoConfigurationCustomizerProvider {

private static final Logger LOG = Logger.getLogger(CloudLoggingConfigurationCustomizerProvider.class.getName());
private static final String VERSION = "4.0.0-RC1";
private static final String VERSION = "4.0.0-RC2";

@Override
public void customize(AutoConfigurationCustomizer autoConfiguration) {
Expand Down
2 changes: 1 addition & 1 deletion cf-java-logging-support-servlet-dynlog-jwt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>4.0.0-RC1</version>
<version>4.0.0-RC2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cf-java-logging-support-servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>4.0.0-RC1</version>
<version>4.0.0-RC2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>4.0.0-RC1</version>
<version>4.0.0-RC2</version>
<packaging>pom</packaging>

<name>Cloud Foundry Java logging support components</name>
Expand Down
4 changes: 2 additions & 2 deletions sample-spring-boot/manifest-otel-javaagent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ applications:
#
- name: otel-sample-app
instances: 1
path: target/sample-app-spring-boot-4.0.0-RC1.jar
path: target/sample-app-spring-boot-4.0.0-RC2.jar
buildpack: sap_java_buildpack
memory: 256M
random-route: true
Expand All @@ -16,7 +16,7 @@ applications:
LOG_REFERER: false
JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
JBP_CONFIG_SAP_MACHINE_JRE: '{ use_offline_repository: false, version: 17.+ }'
JBP_CONFIG_JAVA_OPTS: '[from_environment: false, java_opts: ''-javaagent:BOOT-INF/lib/opentelemetry-javaagent-1.31.0.jar -Dotel.javaagent.extensions=BOOT-INF/lib/cf-java-logging-support-opentelemetry-agent-extension-4.0.0-RC1.jar -Dotel.logs.exporter=cloud-logging -Dotel.metrics.exporter=cloud-logging,dynatrace -Dotel.traces.exporter=cloud-logging -Dotel.instrumentation.logback-appender.experimental.capture-mdc-attributes=* -Dotel.instrumentation.logback-appender.experimental.capture-key-value-pair-attributes=true -Dotel.instrumentation.logback-appender.experimental.capture-code-attributes=true -Dotel.instrumentation.logback-appender.experimental-log-attributes=true -Dotel.experimental.resource.disabled-keys=process.command_line,process.command_args,process.executable.path -Dotel.javaagent.extension.sap.cf.binding.dynatrace.metrics.token-name=ingest_token'']'
JBP_CONFIG_JAVA_OPTS: '[from_environment: false, java_opts: ''-javaagent:BOOT-INF/lib/opentelemetry-javaagent-2.21.0.jar -Dotel.javaagent.extensions=BOOT-INF/lib/cf-java-logging-support-opentelemetry-agent-extension-4.0.0-RC2.jar -Dotel.logs.exporter=cloud-logging -Dotel.metrics.exporter=cloud-logging,dynatrace -Dotel.traces.exporter=cloud-logging -Dotel.instrumentation.logback-appender.experimental.capture-mdc-attributes=* -Dotel.instrumentation.logback-appender.experimental.capture-key-value-pair-attributes=true -Dotel.instrumentation.logback-appender.experimental.capture-code-attributes=true -Dotel.instrumentation.logback-appender.experimental-log-attributes=true -Dotel.experimental.resource.disabled-keys=process.command_line,process.command_args,process.executable.path -Dotel.javaagent.extension.sap.cf.binding.dynatrace.metrics.token-name=ingest_token'']'
services:
- cloud-logging
- dynatrace-service
Expand Down
2 changes: 1 addition & 1 deletion sample-spring-boot/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ applications:
#
- name: logging-sample-app
instances: 1
path: target/sample-app-spring-boot-4.0.0-RC1.jar
path: target/sample-app-spring-boot-4.0.0-RC2.jar
buildpack: sap_java_buildpack
env:
# Set LOG_*: true to activate logging of respective field
Expand Down
2 changes: 1 addition & 1 deletion sample-spring-boot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.sap.hcp.cf.logging</groupId>
<artifactId>cf-java-logging-support-parent</artifactId>
<version>4.0.0-RC1</version>
<version>4.0.0-RC2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down