From 2270f7ab62277f9fff27a6be910fbc40db43b9e5 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 13 Nov 2020 08:54:46 +0000 Subject: [PATCH 001/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7523f50..0b1a5d1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 0.0.4 + 0.0.5-SNAPSHOT Logging support for Micronaut Endhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 0.0.4 + HEAD github From 53e95073d2c114b265fe63aa4e20f1bd866fd015 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Tue, 3 Aug 2021 09:11:57 +0200 Subject: [PATCH 002/195] Bump versions. --- lombok.config | 4 ++++ pom.xml | 6 +++--- src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java | 6 +++--- .../io/kokuwa/micronaut/logging/mdc/MDCTurboFilterTest.java | 2 +- .../io/kokuwa/micronaut/logging/request/CompositeTest.java | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 lombok.config diff --git a/lombok.config b/lombok.config new file mode 100644 index 0000000..accc767 --- /dev/null +++ b/lombok.config @@ -0,0 +1,4 @@ +config.stopBubbling = true + +lombok.addJavaxGeneratedAnnotation = true +lombok.addLombokGeneratedAnnotation = true diff --git a/pom.xml b/pom.xml index 0b1a5d1..1fd4130 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ io.kokuwa maven-parent - 0.2.3 + 0.5.0 io.kokuwa.micronaut micronaut-logging - 0.0.5-SNAPSHOT + 0.1.0-SNAPSHOT Logging support for Micronaut Endhanced logging using MDC or request header. @@ -49,7 +49,7 @@ 0.1.5 - 2.0.2 + 2.5.13 diff --git a/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java b/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java index 506e845..53960e4 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java @@ -2,11 +2,11 @@ package io.kokuwa.micronaut.logging; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.MethodOrderer.MethodName; +import org.junit.jupiter.api.MethodOrderer.DisplayName; import org.junit.jupiter.api.TestMethodOrder; import org.slf4j.MDC; -import io.micronaut.test.annotation.MicronautTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; /** * Base for tests regarding logging. @@ -14,7 +14,7 @@ import io.micronaut.test.annotation.MicronautTest; * @author Stephan Schnabel */ @MicronautTest -@TestMethodOrder(MethodName.class) +@TestMethodOrder(DisplayName.class) public abstract class AbstractTest { @BeforeEach diff --git a/src/test/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterTest.java index e964d2b..5fc80fa 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterTest.java @@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory; import org.slf4j.MDC; import io.kokuwa.micronaut.logging.AbstractTest; -import io.micronaut.test.annotation.MicronautTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; /** * Test for {@link MDCTurboFilterConfigurer}. diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java b/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java index 26e766d..c0bd1d8 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import ch.qos.logback.classic.Level; import io.kokuwa.micronaut.logging.AbstractTest; -import io.micronaut.test.annotation.MicronautTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; /** * Test for MDC and request filter combined. From c30d17a4a02ad860f82b53ce813133e4130aba48 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Thu, 28 Oct 2021 11:43:06 +0200 Subject: [PATCH 003/195] Add linter. --- .github/workflows/ci.yml | 36 ++++--- .github/workflows/release.yml | 73 ++++++++------ .github/workflows/snapshot.yml | 57 +++++++---- .markdownlint.yaml | 6 ++ .yamllint | 10 ++ README.md | 96 +++++++++++-------- .../resources/application-test-composite.yaml | 4 +- src/test/resources/application-test-mdc.yaml | 18 ++-- 8 files changed, 187 insertions(+), 113 deletions(-) create mode 100644 .markdownlint.yaml create mode 100644 .yamllint diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3616fdc..4efb2e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,18 +1,32 @@ name: PullRequest -on: [pull_request] +"on": [pull_request] jobs: + + lint-yaml: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: ibiqlik/action-yamllint@v3 + with: + format: colored + strict: true + + lint-markdown: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: docker://avtodev/markdown-lint:v1 + with: + args: /github/workspace + build: runs-on: ubuntu-latest steps: - - name: checkout - uses: actions/checkout@v2 - - name: setup - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: dependencies - run: mvn -B -q dependency:go-offline - - name: verify - run: mvn -B verify + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - run: mvn -B dependency:go-offline -q + - run: mvn -B verify diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d46f22d..e26eba4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,37 +1,52 @@ name: Release -on: +"on": workflow_dispatch: {} jobs: - build: + + lint-yaml: runs-on: ubuntu-latest steps: - - name: checkout - uses: actions/checkout@v2 - with: - token: ${{ secrets.GIT_ACTION_TOKEN }} - - name: git-configure - run: | - git config user.email "actions@github.com" - git config user.name "GitHub Actions" - - name: setup - uses: actions/setup-java@v1 - with: - java-version: 11 - server-id: sonatype-nexus - server-username: SERVER_USERNAME - server-password: SERVER_PASSWORD - gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - gpg-passphrase: GPG_PASSPHRASE - - name: dependencies - run: mvn -B -q dependency:go-offline - - name: prepare - run: mvn -B release:prepare - - name: perform - run: mvn -B release:perform - env: - SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + - uses: actions/checkout@v2 + - uses: ibiqlik/action-yamllint@v3 + with: + format: colored + strict: true + lint-markdown: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: docker://avtodev/markdown-lint:v1 + with: + args: /github/workspace + + build: + runs-on: ubuntu-latest + needs: + - lint-markdown + - lint-yaml + steps: + - uses: actions/checkout@v2 + with: + token: ${{ secrets.GIT_ACTION_TOKEN }} + - name: git-configure + run: | + git config user.email "actions@github.com" + git config user.name "GitHub Actions" + - uses: actions/setup-java@v1 + with: + java-version: 11 + server-id: sonatype-nexus + server-username: SERVER_USERNAME + server-password: SERVER_PASSWORD + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase: GPG_PASSPHRASE + - run: mvn -B dependency:go-offline -q + - run: mvn -B release:prepare + - run: mvn -B release:perform -DreleaseProfiles=oss-release + env: + SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} + SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 624ac4d..5f08a0a 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -1,28 +1,45 @@ name: Snapshot -on: +"on": push: branches: - - 'main' - - '[1-9]+.[0-9]+.x' + - 'main' + - '[1-9]+.[0-9]+.x' jobs: - build: + + lint-yaml: runs-on: ubuntu-latest steps: - - name: checkout - uses: actions/checkout@v2 - - name: setup - uses: actions/setup-java@v1 - with: - java-version: 11 - server-id: sonatype-nexus - server-username: SERVER_USERNAME - server-password: SERVER_PASSWORD - - name: dependencies - run: mvn -B -q dependency:go-offline - - name: deploy - run: mvn -B deploy - env: - SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} + - uses: actions/checkout@v2 + - uses: ibiqlik/action-yamllint@v3 + with: + format: colored + strict: true + + lint-markdown: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: docker://avtodev/markdown-lint:v1 + with: + args: /github/workspace + + build: + runs-on: ubuntu-latest + needs: + - lint-markdown + - lint-yaml + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 11 + server-id: sonatype-nexus + server-username: SERVER_USERNAME + server-password: SERVER_PASSWORD + - run: mvn -B dependency:go-offline -q + - run: mvn -B deploy -Poss + env: + SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} + SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} diff --git a/.markdownlint.yaml b/.markdownlint.yaml new file mode 100644 index 0000000..dd23793 --- /dev/null +++ b/.markdownlint.yaml @@ -0,0 +1,6 @@ +# Default state for all rules +default: true + +# MD013/line-length - Line length +MD013: + line_length: 10000 diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..9d1b12e --- /dev/null +++ b/.yamllint @@ -0,0 +1,10 @@ +extends: default + +## see https://yamllint.readthedocs.io/en/stable/rules.html +rules: + + # no need for document start + document-start: disable + + # line length is not important + line-length: disable diff --git a/README.md b/README.md index 232bb4c..05d3835 100644 --- a/README.md +++ b/README.md @@ -4,20 +4,22 @@ ### Available Appender - * console format - * Stackdriver format (with support for error reporting) +* console format +* Stackdriver format (with support for error reporting) ### Set log level based on MDC values Configuration: - * *enabled*: enable MDC filter (`true` is default) - * *key*: MDC key, is optional (will use name instead, see example `user` below) - * *level*: log level to use (`TRACE` is default) - * *loggers*: passlist of logger names, matches all loggers if empty - * *values*: values for matching MDC key, matches all values if empty + +* *enabled*: enable MDC filter (`true` is default) +* *key*: MDC key, is optional (will use name instead, see example `user` below) +* *level*: log level to use (`TRACE` is default) +* *loggers*: passlist of logger names, matches all loggers if empty +* *values*: values for matching MDC key, matches all values if empty Example for setting different values for different values/logger: -``` + +```yaml logger: levels: io.kokuwa: INFO @@ -26,36 +28,38 @@ logger: key: gateway level: DEBUG loggers: - - io.kokuwa + - io.kokuwa values: - - 6a1bae7f-eb6c-4c81-af9d-dc15396584e2 - - fb3318f1-2c73-48e9-acd4-a2be3c9f9256 + - 6a1bae7f-eb6c-4c81-af9d-dc15396584e2 + - fb3318f1-2c73-48e9-acd4-a2be3c9f9256 gateway-trace: key: gateway level: TRACE loggers: - - io.kokuwa - - io.micronaut + - io.kokuwa + - io.micronaut values: - - 257802b2-22fe-4dcc-bb99-c1db2a47861f + - 257802b2-22fe-4dcc-bb99-c1db2a47861f ``` Example for omiting level and key: -``` + +```yaml logger: levels: io.kokuwa: INFO mdc: gateway: loggers: - - io.kokuwa + - io.kokuwa values: - - 257802b2-22fe-4dcc-bb99-c1db2a47861f - - 0a44738b-0c3a-4798-8210-2495485f10b2 + - 257802b2-22fe-4dcc-bb99-c1db2a47861f + - 0a44738b-0c3a-4798-8210-2495485f10b2 ``` Example for minimal configuration: -``` + +```yaml logger: levels: io.kokuwa: INFO @@ -66,19 +70,22 @@ logger: ### Set log level based on HTTP request header Configuration for server filter (prefixed with *logger.request.filter*): - * *enabled*: enable HTTP server filter (`true` is default) - * *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/master/core/src/main/java/io/micronaut/core/order/Ordered.java) (highest is default) - * *path*: filter path (`/**` is default) - * *header*: name of HTTP header (`x-log-level` is default) - + +* *enabled*: enable HTTP server filter (`true` is default) +* *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/master/core/src/main/java/io/micronaut/core/order/Ordered.java) (highest is default) +* *path*: filter path (`/**` is default) +* *header*: name of HTTP header (`x-log-level` is default) + Configuration for client filter for propagation (prefixed with *logger.request.propagation*): - * *enabled*: enable HTTP client filter (`true` is default) - * *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/master/core/src/main/java/io/micronaut/core/order/Ordered.java) (tracing is default) - * *path*: filter path (`/**` is default) - * *header*: name of HTTP header (server header is default) + +* *enabled*: enable HTTP client filter (`true` is default) +* *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/master/core/src/main/java/io/micronaut/core/order/Ordered.java) (tracing is default) +* *path*: filter path (`/**` is default) +* *header*: name of HTTP header (server header is default) Example with default configuration: -``` + +```yaml logger: request: filter: @@ -96,13 +103,15 @@ logger: ### Add principal for request to MDC Configuration: - * *enabled*: enable HTTP principal filter (`true` is default) - * *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/master/core/src/main/java/io/micronaut/core/order/Ordered.java) ([ServerFilterPhase.SECURITY.after()](https://github.com/micronaut-projects/micronaut-core/blob/v2.0.1/http/src/main/java/io/micronaut/http/filter/ServerFilterPhase.java#L54) is default) - * *path*: filter path (`/**` is default) - * *key*: name of MDC header (`principal` is default) + +* *enabled*: enable HTTP principal filter (`true` is default) +* *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/master/core/src/main/java/io/micronaut/core/order/Ordered.java) ([ServerFilterPhase.SECURITY.after()](https://github.com/micronaut-projects/micronaut-core/blob/v2.0.1/http/src/main/java/io/micronaut/http/filter/ServerFilterPhase.java#L54) is default) +* *path*: filter path (`/**` is default) +* *key*: name of MDC header (`principal` is default) Example with default configuration: -``` + +```yaml logger: request: principal: @@ -117,25 +126,28 @@ logger: ### Dependency updates Display dependency updates: -``` + +```sh mvn versions:display-property-updates -U ``` Update dependencies: -``` + +```sh mvn versions:update-properties ``` ### Release locally Run: -``` -mvn release:prepare release:perform release:clean -B + +```sh +mvn release:prepare release:perform release:clean -B -DreleaseProfiles=oss-release ``` ## Open Topics - * configure mdc on refresh event - * add stackdriver per configuration - * add fluent per configuration - * read **serviceName** and **serviceVersion** from yaml +* configure mdc on refresh event +* add stackdriver per configuration +* add fluent per configuration +* read **serviceName** and **serviceVersion** from yaml diff --git a/src/test/resources/application-test-composite.yaml b/src/test/resources/application-test-composite.yaml index 7ba34db..d15a885 100644 --- a/src/test/resources/application-test-composite.yaml +++ b/src/test/resources/application-test-composite.yaml @@ -3,6 +3,6 @@ logger: principal: level: DEBUG loggers: - - io.kokuwa + - io.kokuwa values: - - horst + - horst diff --git a/src/test/resources/application-test-mdc.yaml b/src/test/resources/application-test-mdc.yaml index ef6bfc5..c0fd2a2 100644 --- a/src/test/resources/application-test-mdc.yaml +++ b/src/test/resources/application-test-mdc.yaml @@ -4,23 +4,23 @@ logger: key: key level: DEBUG loggers: - - io.kokuwa.a - - io.kokuwa.b + - io.kokuwa.a + - io.kokuwa.b values: - - value-1 - - value-2 + - value-1 + - value-2 key2: key: key level: TRACE loggers: - - io.kokuwa.b - - io.kokuwa.c + - io.kokuwa.b + - io.kokuwa.c values: - - value-2 + - value-2 key: level: TRACE loggers: - - io.kokuwa + - io.kokuwa values: - - value-3 + - value-3 user: {} From e802b5f7cb27789d3baed45771c34ad2c2120d50 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Oct 2021 20:22:37 +0000 Subject: [PATCH 004/195] [maven-release-plugin] prepare release 0.1.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1fd4130..7b655a4 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 0.1.0-SNAPSHOT + 0.1.0 Logging support for Micronaut Endhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 0.1.0 github From 45c5a0a4c59d9cdc3a1d45406f4a970e2fbd000d Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Oct 2021 20:22:39 +0000 Subject: [PATCH 005/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7b655a4..f44fa16 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 0.1.0 + 0.1.1-SNAPSHOT Logging support for Micronaut Endhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 0.1.0 + HEAD github From 5680a281ea5d1740f5eea4afe6f6bf90a5d2736f Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Thu, 28 Oct 2021 13:12:14 +0200 Subject: [PATCH 006/195] Add jackson layout, rename stackdriver, include no logback.xml. --- README.md | 38 ++++++++-- pom.xml | 6 -- .../configurator/DefaultConfigurator.java | 33 +++++++++ .../MicronautJoranConfigurator.java | 19 +++++ .../RootAutoSelectAppenderAction.java | 73 +++++++++++++++++++ .../GcpJsonLayout.java} | 32 +++----- .../ch.qos.logback.classic.spi.Configurator | 1 + .../io/kokuwa/logback/appender-console.xml | 12 +++ .../io/kokuwa/logback/appender-gcp.xml | 17 +++++ .../io/kokuwa/logback/appender-json.xml | 15 ++++ src/main/resources/io/kokuwa/logback/base.xml | 8 ++ .../io/kokuwa/logback/logback-default.xml | 12 +++ .../io/kokuwa/logback/logback-example.xml | 12 +++ src/main/resources/logback.xml | 25 ------- .../logging/request/TestController.java | 2 + .../resources/META-INF/build-info.properties | 2 - src/test/resources/application-test.yaml | 4 - 17 files changed, 246 insertions(+), 65 deletions(-) create mode 100644 src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java create mode 100644 src/main/java/io/kokuwa/micronaut/logging/configurator/MicronautJoranConfigurator.java create mode 100644 src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java rename src/main/java/io/kokuwa/micronaut/logging/{StackdriverJsonLayout.java => layout/GcpJsonLayout.java} (67%) create mode 100644 src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator create mode 100644 src/main/resources/io/kokuwa/logback/appender-console.xml create mode 100644 src/main/resources/io/kokuwa/logback/appender-gcp.xml create mode 100644 src/main/resources/io/kokuwa/logback/appender-json.xml create mode 100644 src/main/resources/io/kokuwa/logback/base.xml create mode 100644 src/main/resources/io/kokuwa/logback/logback-default.xml create mode 100644 src/main/resources/io/kokuwa/logback/logback-example.xml delete mode 100644 src/main/resources/logback.xml delete mode 100644 src/test/resources/META-INF/build-info.properties diff --git a/README.md b/README.md index 05d3835..79d33d2 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,35 @@ ## Features +### Default logback.xml + +If no `logback.xml` by user is provided a default [logback.xml](src/main/resources/io/kokuwa/logback/logback-default.xml) is loaded. Otherwise use custom [logback.xml](src/main/resources/io/kokuwa/logback/logback-example.xml): + +```xml + + + + + + + + +``` + ### Available Appender -* console format -* Stackdriver format (with support for error reporting) +* console with jansi for developers +* gcp logging format (with support for error reporting) +* json + +### AutoSelect appender logback.xml + +1. if `LOGBACK_APPENDER` is set this appender will be used +2. if GCP is detected gcp appender will be used +3. if Kubernetes is detected json appender will be used +4. console appender else + +*IMPORTENT*: only works without custom `logback.xml` ### Set log level based on MDC values @@ -72,14 +97,14 @@ logger: Configuration for server filter (prefixed with *logger.request.filter*): * *enabled*: enable HTTP server filter (`true` is default) -* *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/master/core/src/main/java/io/micronaut/core/order/Ordered.java) (highest is default) +* *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v2.5.13/core/src/main/java/io/micronaut/core/order/Ordered.java) (highest is default) * *path*: filter path (`/**` is default) * *header*: name of HTTP header (`x-log-level` is default) Configuration for client filter for propagation (prefixed with *logger.request.propagation*): * *enabled*: enable HTTP client filter (`true` is default) -* *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/master/core/src/main/java/io/micronaut/core/order/Ordered.java) (tracing is default) +* *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v2.5.13/core/src/main/java/io/micronaut/core/order/Ordered.java) (tracing is default) * *path*: filter path (`/**` is default) * *header*: name of HTTP header (server header is default) @@ -105,7 +130,7 @@ logger: Configuration: * *enabled*: enable HTTP principal filter (`true` is default) -* *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/master/core/src/main/java/io/micronaut/core/order/Ordered.java) ([ServerFilterPhase.SECURITY.after()](https://github.com/micronaut-projects/micronaut-core/blob/v2.0.1/http/src/main/java/io/micronaut/http/filter/ServerFilterPhase.java#L54) is default) +* *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v2.5.13/core/src/main/java/io/micronaut/core/order/Ordered.java) ([ServerFilterPhase.SECURITY.after()](https://github.com/micronaut-projects/micronaut-core/blob/v2.5.13/http/src/main/java/io/micronaut/http/filter/ServerFilterPhase.java#L54) is default) * *path*: filter path (`/**` is default) * *key*: name of MDC header (`principal` is default) @@ -148,6 +173,5 @@ mvn release:prepare release:perform release:clean -B -DreleaseProfiles=oss-relea ## Open Topics * configure mdc on refresh event -* add stackdriver per configuration -* add fluent per configuration * read **serviceName** and **serviceVersion** from yaml +* support auto select appender with custom `logback.xml` diff --git a/pom.xml b/pom.xml index f44fa16..6f17ef5 100644 --- a/pom.xml +++ b/pom.xml @@ -130,12 +130,6 @@ - - - src/test/resources - true - - diff --git a/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java b/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java new file mode 100644 index 0000000..1ebef70 --- /dev/null +++ b/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java @@ -0,0 +1,33 @@ +package io.kokuwa.micronaut.logging.configurator; + +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.Configurator; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.spi.ContextAwareBase; + +/** + * Use logback-default.xml if no configuration is provided by user. + * + * @author Stephan Schnabel + */ +public class DefaultConfigurator extends ContextAwareBase implements Configurator { + + @Override + public void configure(LoggerContext loggerContext) { + + var base = DefaultConfigurator.class.getResource("/io/kokuwa/logback/logback-default.xml"); + if (base == null) { + addError("Failed to find logback.xml from io.kokuwa:micronaut-logging"); + return; + } + + try { + addInfo("Use logback.xml from io.kokuwa:micronaut-logging"); + var configurator = new MicronautJoranConfigurator(); + configurator.setContext(loggerContext); + configurator.doConfigure(base); + } catch (JoranException e) { + addError("Failed to load logback.xml from io.kokuwa:micronaut-logging", e); + } + } +} diff --git a/src/main/java/io/kokuwa/micronaut/logging/configurator/MicronautJoranConfigurator.java b/src/main/java/io/kokuwa/micronaut/logging/configurator/MicronautJoranConfigurator.java new file mode 100644 index 0000000..f89db16 --- /dev/null +++ b/src/main/java/io/kokuwa/micronaut/logging/configurator/MicronautJoranConfigurator.java @@ -0,0 +1,19 @@ +package io.kokuwa.micronaut.logging.configurator; + +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.joran.spi.ElementSelector; +import ch.qos.logback.core.joran.spi.RuleStore; + +/** + * Add custom actions. + * + * @author Stephan Schnabel + */ +public class MicronautJoranConfigurator extends JoranConfigurator { + + @Override + public void addInstanceRules(RuleStore rs) { + super.addInstanceRules(rs); + rs.addRule(new ElementSelector("configuration/root/autoAppender"), new RootAutoSelectAppenderAction()); + } +} diff --git a/src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java b/src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java new file mode 100644 index 0000000..b490a35 --- /dev/null +++ b/src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java @@ -0,0 +1,73 @@ +package io.kokuwa.micronaut.logging.configurator; + +import java.util.Map; + +import org.xml.sax.Attributes; + +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.Appender; +import ch.qos.logback.core.joran.action.Action; +import ch.qos.logback.core.joran.action.ActionConst; +import ch.qos.logback.core.joran.spi.InterpretationContext; +import io.micronaut.core.util.StringUtils; + +/** + * Auto select appender by environment. + * + * @author Stephan Schnabel + */ +public class RootAutoSelectAppenderAction extends Action { + + private static final boolean IS_KUBERNETES = StringUtils.isNotEmpty(System.getenv("KUBERNETES_SERVICE_HOST")); + private static final boolean IS_GCP = StringUtils.isNotEmpty(System.getenv("GOOGLE_CLOUD_PROJECT")); + + private static final String APPENDER_CONSOLE = "CONSOLE"; + private static final String APPENDER_JSON = "JSON"; + private static final String APPENDER_GCP = "GCP"; + private static final String LOGBACK_APPENDER = "LOGBACK_APPENDER"; + + @Override + public void begin(InterpretationContext ic, String name, Attributes attributes) { + + var rootLogger = LoggerContext.class.cast(context).getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); + var rootLoggerAppenders = rootLogger.iteratorForAppenders(); + if (rootLoggerAppenders.hasNext()) { + addWarn("Skip because appender already found: " + rootLoggerAppenders.next().getName()); + return; + } + + var envAppender = System.getenv(LOGBACK_APPENDER); + if (envAppender != null && setAppender(ic, rootLogger, envAppender)) { + return; + } + + if (IS_KUBERNETES && setAppender(ic, rootLogger, APPENDER_JSON)) { + return; + } + if (IS_GCP && setAppender(ic, rootLogger, APPENDER_GCP)) { + return; + } + setAppender(ic, rootLogger, APPENDER_CONSOLE); + } + + @Override + public void end(InterpretationContext ic, String name) {} + + private boolean setAppender(InterpretationContext ic, Logger rootLogger, String appenderName) { + + @SuppressWarnings("unchecked") + var appenderBag = (Map>) ic.getObjectMap().get(ActionConst.APPENDER_BAG); + var appender = appenderBag.get(appenderName); + if (appender == null) { + addError("Could not find an appender named [" + appenderName + + "]. Did you define it below instead of above in the configuration file?"); + return false; + } + + addInfo("Use appender: " + appenderName); + rootLogger.addAppender(appender); + return true; + } +} diff --git a/src/main/java/io/kokuwa/micronaut/logging/StackdriverJsonLayout.java b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java similarity index 67% rename from src/main/java/io/kokuwa/micronaut/logging/StackdriverJsonLayout.java rename to src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java index a609ca1..7b0ce16 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/StackdriverJsonLayout.java +++ b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java @@ -1,4 +1,4 @@ -package io.kokuwa.micronaut.logging; +package io.kokuwa.micronaut.logging.layout; import java.time.Instant; import java.util.HashMap; @@ -6,43 +6,33 @@ import java.util.LinkedHashMap; import java.util.Map; import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.contrib.jackson.JacksonJsonFormatter; import ch.qos.logback.contrib.json.classic.JsonLayout; import io.micronaut.core.util.StringUtils; -import lombok.Getter; import lombok.Setter; /** - * Stackdriver layout. + * GCP logging layout. * * @author Stephan Schnabel * @see "https://cloud.google.com/logging/docs/agent/configuration#process-payload" * @see "https://cloud.google.com/error-reporting/reference/rest/v1beta1/ServiceContext" */ -@Getter -@Setter -public class StackdriverJsonLayout extends JsonLayout { +public class GcpJsonLayout extends JsonLayout { - private static final String TIMESTAMP_ATTR_NAME = "time"; + private static final String UNDEFINED = "_IS_UNDEFINED"; + private static final String TIME_ATTR_NAME = "time"; private static final String SEVERITY_ATTR_NAME = "severity"; private Map serviceContext; + @Setter private String serviceName; + @Setter private String serviceVersion; - private boolean includeExceptionInMessage; - - public StackdriverJsonLayout() { - appendLineSeparator = true; - includeContextName = false; - includeMessage = true; - includeExceptionInMessage = true; - setJsonFormatter(new JacksonJsonFormatter()); - } @Override protected Map toJsonMap(ILoggingEvent event) { var map = new LinkedHashMap(); - add(TIMESTAMP_ATTR_NAME, includeTimestamp, Instant.ofEpochMilli(event.getTimeStamp()).toString(), map); + add(TIME_ATTR_NAME, includeTimestamp, Instant.ofEpochMilli(event.getTimeStamp()).toString(), map); add(SEVERITY_ATTR_NAME, includeLevel, String.valueOf(event.getLevel()), map); add(THREAD_ATTR_NAME, includeThreadName, event.getThreadName(), map); add(CONTEXT_ATTR_NAME, includeContextName, event.getLoggerContextVO().getName(), map); @@ -50,7 +40,7 @@ public class StackdriverJsonLayout extends JsonLayout { addMap(MDC_ATTR_NAME, includeMDC, event.getMDCPropertyMap(), map); add(FORMATTED_MESSAGE_ATTR_NAME, includeFormattedMessage, event.getFormattedMessage(), map); add(MESSAGE_ATTR_NAME, includeMessage, event.getMessage(), map); - addThrowableInfo(JsonLayout.EXCEPTION_ATTR_NAME, includeException, event, map); + addThrowableInfo(EXCEPTION_ATTR_NAME, includeException, event, map); addServiceContext(map); return map; } @@ -58,10 +48,10 @@ public class StackdriverJsonLayout extends JsonLayout { private void addServiceContext(Map map) { if (serviceContext == null) { serviceContext = new HashMap<>(2); - if (StringUtils.isNotEmpty(serviceName)) { + if (StringUtils.isNotEmpty(serviceName) && !serviceName.endsWith(UNDEFINED)) { serviceContext.put("service", serviceName); } - if (StringUtils.isNotEmpty(serviceVersion)) { + if (StringUtils.isNotEmpty(serviceVersion) && !serviceVersion.endsWith(UNDEFINED)) { serviceContext.put("version", serviceVersion); } } diff --git a/src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator b/src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator new file mode 100644 index 0000000..1f9f2da --- /dev/null +++ b/src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator @@ -0,0 +1 @@ +io.kokuwa.micronaut.logging.configurator.DefaultConfigurator diff --git a/src/main/resources/io/kokuwa/logback/appender-console.xml b/src/main/resources/io/kokuwa/logback/appender-console.xml new file mode 100644 index 0000000..e4bfb1d --- /dev/null +++ b/src/main/resources/io/kokuwa/logback/appender-console.xml @@ -0,0 +1,12 @@ + + + + + ${CONSOLE_LOG_JANSI:-true} + + ${CONSOLE_LOG_PATTERN:-%cyan(%d{HH:mm:ss.SSS}) %gray(%-6.6thread) %highlight(%-5level) %magenta(%32logger{32}) %mdc %msg%n} + ${CONSOLE_LOG_CHARSET:-default} + + + + diff --git a/src/main/resources/io/kokuwa/logback/appender-gcp.xml b/src/main/resources/io/kokuwa/logback/appender-gcp.xml new file mode 100644 index 0000000..6089d9c --- /dev/null +++ b/src/main/resources/io/kokuwa/logback/appender-gcp.xml @@ -0,0 +1,17 @@ + + + + + + + ${serviceName} + ${serviceVersion} + + true + true + false + + + + + diff --git a/src/main/resources/io/kokuwa/logback/appender-json.xml b/src/main/resources/io/kokuwa/logback/appender-json.xml new file mode 100644 index 0000000..b850ac7 --- /dev/null +++ b/src/main/resources/io/kokuwa/logback/appender-json.xml @@ -0,0 +1,15 @@ + + + + + + + + true + true + false + + + + + diff --git a/src/main/resources/io/kokuwa/logback/base.xml b/src/main/resources/io/kokuwa/logback/base.xml new file mode 100644 index 0000000..24ae946 --- /dev/null +++ b/src/main/resources/io/kokuwa/logback/base.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/main/resources/io/kokuwa/logback/logback-default.xml b/src/main/resources/io/kokuwa/logback/logback-default.xml new file mode 100644 index 0000000..1092ea9 --- /dev/null +++ b/src/main/resources/io/kokuwa/logback/logback-default.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/main/resources/io/kokuwa/logback/logback-example.xml b/src/main/resources/io/kokuwa/logback/logback-example.xml new file mode 100644 index 0000000..47deab2 --- /dev/null +++ b/src/main/resources/io/kokuwa/logback/logback-example.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml deleted file mode 100644 index 42a34f7..0000000 --- a/src/main/resources/logback.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - true - - %cyan(%d{HH:mm:ss.SSS}) %gray(%-6.6thread) %highlight(%-5level) %magenta(%32logger{32}) %mdc %msg%n - - - - - - ${serviceName} - ${serviceVersion} - - - - - - - - - diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/TestController.java b/src/test/java/io/kokuwa/micronaut/logging/request/TestController.java index 58bdf5b..d179f63 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/request/TestController.java +++ b/src/test/java/io/kokuwa/micronaut/logging/request/TestController.java @@ -39,6 +39,8 @@ public class TestController { level = Level.ERROR; } + log.info("Test log for MDC inclusion, expected: {}", principal); + return new TestResponse(level.toString(), principal); } diff --git a/src/test/resources/META-INF/build-info.properties b/src/test/resources/META-INF/build-info.properties deleted file mode 100644 index 5401a6c..0000000 --- a/src/test/resources/META-INF/build-info.properties +++ /dev/null @@ -1,2 +0,0 @@ -serviceName: ${project.artifactId} -serviceVersion: ${project.version} diff --git a/src/test/resources/application-test.yaml b/src/test/resources/application-test.yaml index 42aa67e..71beb2c 100644 --- a/src/test/resources/application-test.yaml +++ b/src/test/resources/application-test.yaml @@ -10,7 +10,3 @@ micronaut: http: client: logger-name: io.kokuwa.Test - -logger: - levels: - io.kokuwa.Test: TRACE From 4deaefcf4cf00f576680ae71b80c15aa08d62456 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 29 Oct 2021 07:14:19 +0000 Subject: [PATCH 007/195] [maven-release-plugin] prepare release 0.1.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6f17ef5..bb6a782 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 0.1.1-SNAPSHOT + 0.1.1 Logging support for Micronaut Endhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 0.1.1 github From 15505bbe9347b863f49b4da448f748203e61dc8a Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 29 Oct 2021 07:14:21 +0000 Subject: [PATCH 008/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index bb6a782..a6a87b9 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 0.1.1 + 0.1.2-SNAPSHOT Logging support for Micronaut Endhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 0.1.1 + HEAD github From 1c256db5df6707ec62b07e66fa8392dd335509da Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Fri, 29 Oct 2021 09:21:23 +0200 Subject: [PATCH 009/195] Bump versions. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a6a87b9..e5b7470 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.kokuwa maven-parent - 0.5.0 + 0.5.1 From 2ee99b6cf0c14ccbe5d918a498b255a7704636b2 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 29 Oct 2021 07:40:03 +0000 Subject: [PATCH 010/195] [maven-release-plugin] prepare release 0.1.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e5b7470..50e3df1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 0.1.2-SNAPSHOT + 0.1.2 Logging support for Micronaut Endhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 0.1.2 github From 305203d7af94f5e0b8354443f5653d9ce4de4aa3 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 29 Oct 2021 07:40:05 +0000 Subject: [PATCH 011/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 50e3df1..98da885 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 0.1.2 + 0.1.3-SNAPSHOT Logging support for Micronaut Endhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 0.1.2 + HEAD github From c3ed6d953e98a449e0b8055c336f1b4a4dc60608 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Fri, 29 Oct 2021 17:54:08 +0200 Subject: [PATCH 012/195] Minor fixes. Update github actions. --- .github/workflows/ci.yml | 4 +++- .github/workflows/release.yml | 3 ++- .github/workflows/snapshot.yml | 9 ++++++--- lombok.config | 14 ++++++++++++++ pom.xml | 4 ++-- .../micronaut/logging/layout/GcpJsonLayout.java | 2 ++ .../resources/io/kokuwa/logback/appender-gcp.xml | 4 ++-- 7 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4efb2e6..dec1718 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,8 +25,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: temurin java-version: 11 + cache: maven - run: mvn -B dependency:go-offline -q - run: mvn -B verify diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e26eba4..3f13993 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,8 +35,9 @@ jobs: run: | git config user.email "actions@github.com" git config user.name "GitHub Actions" - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: temurin java-version: 11 server-id: sonatype-nexus server-username: SERVER_USERNAME diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 5f08a0a..ab9bf69 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -1,10 +1,11 @@ name: Snapshot "on": + workflow_dispatch: {} push: branches: - - 'main' - - '[1-9]+.[0-9]+.x' + - main + - '*.x' jobs: @@ -32,9 +33,11 @@ jobs: - lint-yaml steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: temurin java-version: 11 + cache: maven server-id: sonatype-nexus server-username: SERVER_USERNAME server-password: SERVER_PASSWORD diff --git a/lombok.config b/lombok.config index accc767..4fc0545 100644 --- a/lombok.config +++ b/lombok.config @@ -1,4 +1,18 @@ config.stopBubbling = true +lombok.addNullAnnotations = CUSTOM:io.micronaut.core.annotation.NonNull:io.micronaut.core.annotation.Nullable lombok.addJavaxGeneratedAnnotation = true lombok.addLombokGeneratedAnnotation = true + +# adjust model +lombok.equalsAndHashCode.callSuper = call +lombok.toString.callSuper = call +lombok.accessors.chain = true + +# use slf4j +lombok.log.apacheCommons.flagUsage = error +lombok.log.javaUtilLogging.flagUsage = error +lombok.log.jbosslog.flagUsage = error +lombok.log.log4j.flagUsage = error +lombok.log.log4j2.flagUsage = error +lombok.log.xslf4j.flagUsage = error diff --git a/pom.xml b/pom.xml index 98da885..dc1a1af 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.kokuwa maven-parent - 0.5.1 + 0.5.3 @@ -14,7 +14,7 @@ 0.1.3-SNAPSHOT Logging support for Micronaut - Endhanced logging using MDC or request header. + Enhanced logging using MDC or request header. https://github.com/kokuwaio/micronaut-logging 2020 diff --git a/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java index 7b0ce16..0cd52d8 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java +++ b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java @@ -9,6 +9,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.contrib.json.classic.JsonLayout; import io.micronaut.core.util.StringUtils; import lombok.Setter; +import lombok.experimental.Accessors; /** * GCP logging layout. @@ -17,6 +18,7 @@ import lombok.Setter; * @see "https://cloud.google.com/logging/docs/agent/configuration#process-payload" * @see "https://cloud.google.com/error-reporting/reference/rest/v1beta1/ServiceContext" */ +@Accessors(chain = false) public class GcpJsonLayout extends JsonLayout { private static final String UNDEFINED = "_IS_UNDEFINED"; diff --git a/src/main/resources/io/kokuwa/logback/appender-gcp.xml b/src/main/resources/io/kokuwa/logback/appender-gcp.xml index 6089d9c..e847d99 100644 --- a/src/main/resources/io/kokuwa/logback/appender-gcp.xml +++ b/src/main/resources/io/kokuwa/logback/appender-gcp.xml @@ -4,8 +4,8 @@ - ${serviceName} - ${serviceVersion} + ${SERVICE_NAME} + ${SERVICE_VERSION} true true From 89d3def831015dff506c12333e14bc96cf300a47 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Sun, 31 Oct 2021 09:36:31 +0100 Subject: [PATCH 013/195] Add link for v3 version. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 79d33d2..9cf902e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Micronaut Logging support +This branch is for Micronaut 2.x, for 3.x see wip branch [3.x](../../tree/3.x). + ## Features ### Default logback.xml From 0cb980d695599493c9f6bd3863cae9573f5385e4 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Fri, 5 Nov 2021 08:58:16 +0100 Subject: [PATCH 014/195] Bump versions. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc1a1af..54a0b8f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.kokuwa maven-parent - 0.5.3 + 0.5.4 From 69af0ef8e6fd4b77250e2fc508c4145acc290c64 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Fri, 29 Oct 2021 09:24:33 +0200 Subject: [PATCH 015/195] Bump to Micronaut 3.x --- pom.xml | 11 +++++++++-- .../java/io/kokuwa/micronaut/logging/LogbackUtil.java | 3 +-- .../micronaut/logging/request/CompositeTest.java | 3 +-- .../micronaut/logging/request/RequestHeaderTest.java | 3 +-- .../logging/request/RequestPrincipalTest.java | 3 +-- .../kokuwa/micronaut/logging/request/TestClient.java | 5 ++--- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 54a0b8f..de101f4 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 0.1.3-SNAPSHOT + 3.0.0-SNAPSHOT Logging support for Micronaut Enhanced logging using MDC or request header. @@ -49,7 +49,7 @@ 0.1.5 - 2.5.13 + 3.1.3 @@ -113,6 +113,13 @@ test + + + com.google.code.findbugs + jsr305 + provided + + ch.qos.logback diff --git a/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java b/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java index 625191e..df1d6ab 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java +++ b/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java @@ -4,8 +4,6 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Supplier; -import javax.inject.Singleton; - import org.slf4j.LoggerFactory; import ch.qos.logback.classic.LoggerContext; @@ -13,6 +11,7 @@ import ch.qos.logback.classic.turbo.TurboFilter; import io.micronaut.context.annotation.BootstrapContextCompatible; import io.micronaut.context.annotation.Requires; import io.micronaut.core.annotation.Internal; +import jakarta.inject.Singleton; /** * Utility class for Logback operations. diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java b/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java index c0bd1d8..2c69814 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java @@ -1,13 +1,12 @@ package io.kokuwa.micronaut.logging.request; -import javax.inject.Inject; - import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import ch.qos.logback.classic.Level; import io.kokuwa.micronaut.logging.AbstractTest; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import jakarta.inject.Inject; /** * Test for MDC and request filter combined. diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/RequestHeaderTest.java b/src/test/java/io/kokuwa/micronaut/logging/request/RequestHeaderTest.java index 2b7ee19..476e976 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/request/RequestHeaderTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/request/RequestHeaderTest.java @@ -1,12 +1,11 @@ package io.kokuwa.micronaut.logging.request; -import javax.inject.Inject; - import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import ch.qos.logback.classic.Level; import io.kokuwa.micronaut.logging.AbstractTest; +import jakarta.inject.Inject; /** * Test for {@link HeaderLoggingServerHttpFilter}. diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/RequestPrincipalTest.java b/src/test/java/io/kokuwa/micronaut/logging/request/RequestPrincipalTest.java index f8f1fcc..9a60d7c 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/request/RequestPrincipalTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/request/RequestPrincipalTest.java @@ -2,12 +2,11 @@ package io.kokuwa.micronaut.logging.request; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; - import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import io.kokuwa.micronaut.logging.AbstractTest; +import jakarta.inject.Inject; /** * Test for {@link PrincipalHttpFilter}. diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/TestClient.java b/src/test/java/io/kokuwa/micronaut/logging/request/TestClient.java index 669e907..edebb40 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/request/TestClient.java +++ b/src/test/java/io/kokuwa/micronaut/logging/request/TestClient.java @@ -4,9 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.nimbusds.jose.JOSEException; import com.nimbusds.jwt.JWTClaimsSet; @@ -17,6 +14,8 @@ import io.micronaut.http.HttpStatus; import io.micronaut.http.client.HttpClient; import io.micronaut.http.client.annotation.Client; import io.micronaut.security.token.jwt.signature.SignatureGeneratorConfiguration; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * Contoller for testing {@link HeaderLoggingServerHttpFilter} and {@link PrincipalHttpFilter}. From 769bb2ef534ca21c38ab53aebd5a52504b6878e0 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Fri, 5 Nov 2021 09:03:32 +0100 Subject: [PATCH 016/195] [maven-release-plugin] prepare release 3.0.0-M1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index de101f4..848fe53 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.0-SNAPSHOT + 3.0.0-M1 Logging support for Micronaut Enhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.0.0-M1 github From a350698f5208262ccda3174d9b412a6ca7ce649a Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Fri, 5 Nov 2021 09:03:34 +0100 Subject: [PATCH 017/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 848fe53..de101f4 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.0-M1 + 3.0.0-SNAPSHOT Logging support for Micronaut Enhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.0.0-M1 + HEAD github From 7ad1ee0addd2bff700bd4f1b0fff4636696b9211 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 1 Dec 2021 10:25:11 +0100 Subject: [PATCH 018/195] Add config options to add authentication attributes as mdc. --- .yamllint | 3 - README.md | 175 +----------------- docs/build.md | 23 +++ docs/features/http_log_level.md | 35 ++++ docs/features/http_mdc_authentication.md | 29 +++ docs/features/http_mdc_headers.md | 28 +++ docs/features/logback_appender.md | 16 ++ docs/features/logback_default.md | 18 ++ docs/features/logback_mdc_level.md | 66 +++++++ pom.xml | 9 +- pom.xml.versionsBackup | 169 +++++++++++++++++ .../configurator/DefaultConfigurator.java | 3 + .../logging/http/AbstractMdcFilter.java | 47 +++++ .../level/LogLevelClientFilter.java} | 23 ++- .../level/LogLevelServerFilter.java} | 35 ++-- .../level/LogLevelTurboFilter.java} | 6 +- .../http/mdc/AuthenticationMdcFilter.java | 77 ++++++++ .../http/mdc/HttpHeadersMdcFilter.java | 58 ++++++ .../logging/request/PrincipalHttpFilter.java | 63 ------- .../micronaut/logging/AbstractTest.java | 7 +- .../logging/http/AbstractFilterTest.java | 133 +++++++++++++ .../http/level/LogLevelServerFilterTest.java | 80 ++++++++ .../http/mdc/AuthenticationMdcFilterTest.java | 73 ++++++++ .../http/mdc/HttpHeadersMdcFilterTest.java | 60 ++++++ .../logging/mdc/MDCTurboFilterTest.java | 2 +- .../logging/request/CompositeTest.java | 40 ---- .../logging/request/RequestHeaderTest.java | 56 ------ .../logging/request/RequestPrincipalTest.java | 43 ----- .../micronaut/logging/request/TestClient.java | 63 ------- .../logging/request/TestController.java | 54 ------ .../resources/application-test-composite.yaml | 8 - src/test/resources/application-test.yaml | 3 - 32 files changed, 964 insertions(+), 541 deletions(-) create mode 100644 docs/build.md create mode 100644 docs/features/http_log_level.md create mode 100644 docs/features/http_mdc_authentication.md create mode 100644 docs/features/http_mdc_headers.md create mode 100644 docs/features/logback_appender.md create mode 100644 docs/features/logback_default.md create mode 100644 docs/features/logback_mdc_level.md create mode 100644 pom.xml.versionsBackup create mode 100644 src/main/java/io/kokuwa/micronaut/logging/http/AbstractMdcFilter.java rename src/main/java/io/kokuwa/micronaut/logging/{request/HeaderLoggingClientHttpFilter.java => http/level/LogLevelClientFilter.java} (62%) rename src/main/java/io/kokuwa/micronaut/logging/{request/HeaderLoggingServerHttpFilter.java => http/level/LogLevelServerFilter.java} (67%) rename src/main/java/io/kokuwa/micronaut/logging/{request/HeaderLoggingTurboFilter.java => http/level/LogLevelTurboFilter.java} (79%) create mode 100644 src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java create mode 100644 src/main/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilter.java delete mode 100644 src/main/java/io/kokuwa/micronaut/logging/request/PrincipalHttpFilter.java create mode 100644 src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java create mode 100644 src/test/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilterTest.java create mode 100644 src/test/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilterTest.java create mode 100644 src/test/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilterTest.java delete mode 100644 src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java delete mode 100644 src/test/java/io/kokuwa/micronaut/logging/request/RequestHeaderTest.java delete mode 100644 src/test/java/io/kokuwa/micronaut/logging/request/RequestPrincipalTest.java delete mode 100644 src/test/java/io/kokuwa/micronaut/logging/request/TestClient.java delete mode 100644 src/test/java/io/kokuwa/micronaut/logging/request/TestController.java delete mode 100644 src/test/resources/application-test-composite.yaml diff --git a/.yamllint b/.yamllint index 9d1b12e..c9f12ef 100644 --- a/.yamllint +++ b/.yamllint @@ -5,6 +5,3 @@ rules: # no need for document start document-start: disable - - # line length is not important - line-length: disable diff --git a/README.md b/README.md index 9cf902e..620914e 100644 --- a/README.md +++ b/README.md @@ -1,176 +1,17 @@ # Micronaut Logging support -This branch is for Micronaut 2.x, for 3.x see wip branch [3.x](../../tree/3.x). - ## Features -### Default logback.xml +* [set log level based on MDC values](docs/features/logback_mdc_level.md) +* [add default xml](docs/features/logback_default.md) +* [preconfigured appender for different environments](docs/features/logback_appender.md) +* [set log level based on HTTP request header](docs/features/http_log_level.md) +* [add HTTP headers to MDC](docs/features/http_mdc_headers.md) +* [add authentication information from HTTP request to MDC](docs/features/http_mdc_authentication.md) -If no `logback.xml` by user is provided a default [logback.xml](src/main/resources/io/kokuwa/logback/logback-default.xml) is loaded. Otherwise use custom [logback.xml](src/main/resources/io/kokuwa/logback/logback-example.xml): +## Development -```xml - - - - - - - - -``` - -### Available Appender - -* console with jansi for developers -* gcp logging format (with support for error reporting) -* json - -### AutoSelect appender logback.xml - -1. if `LOGBACK_APPENDER` is set this appender will be used -2. if GCP is detected gcp appender will be used -3. if Kubernetes is detected json appender will be used -4. console appender else - -*IMPORTENT*: only works without custom `logback.xml` - -### Set log level based on MDC values - -Configuration: - -* *enabled*: enable MDC filter (`true` is default) -* *key*: MDC key, is optional (will use name instead, see example `user` below) -* *level*: log level to use (`TRACE` is default) -* *loggers*: passlist of logger names, matches all loggers if empty -* *values*: values for matching MDC key, matches all values if empty - -Example for setting different values for different values/logger: - -```yaml -logger: - levels: - io.kokuwa: INFO - mdc: - gateway-debug: - key: gateway - level: DEBUG - loggers: - - io.kokuwa - values: - - 6a1bae7f-eb6c-4c81-af9d-dc15396584e2 - - fb3318f1-2c73-48e9-acd4-a2be3c9f9256 - gateway-trace: - key: gateway - level: TRACE - loggers: - - io.kokuwa - - io.micronaut - values: - - 257802b2-22fe-4dcc-bb99-c1db2a47861f -``` - -Example for omiting level and key: - -```yaml -logger: - levels: - io.kokuwa: INFO - mdc: - gateway: - loggers: - - io.kokuwa - values: - - 257802b2-22fe-4dcc-bb99-c1db2a47861f - - 0a44738b-0c3a-4798-8210-2495485f10b2 -``` - -Example for minimal configuration: - -```yaml -logger: - levels: - io.kokuwa: INFO - mdc: - user: {} -``` - -### Set log level based on HTTP request header - -Configuration for server filter (prefixed with *logger.request.filter*): - -* *enabled*: enable HTTP server filter (`true` is default) -* *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v2.5.13/core/src/main/java/io/micronaut/core/order/Ordered.java) (highest is default) -* *path*: filter path (`/**` is default) -* *header*: name of HTTP header (`x-log-level` is default) - -Configuration for client filter for propagation (prefixed with *logger.request.propagation*): - -* *enabled*: enable HTTP client filter (`true` is default) -* *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v2.5.13/core/src/main/java/io/micronaut/core/order/Ordered.java) (tracing is default) -* *path*: filter path (`/**` is default) -* *header*: name of HTTP header (server header is default) - -Example with default configuration: - -```yaml -logger: - request: - filter: - enabled: true - order: -2147483648 - path: /** - header: x-log-level - propagation: - enabled: true - order: 19000 - path: /** - header: ${logger.request.header.header-name} -``` - -### Add principal for request to MDC - -Configuration: - -* *enabled*: enable HTTP principal filter (`true` is default) -* *order*: order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v2.5.13/core/src/main/java/io/micronaut/core/order/Ordered.java) ([ServerFilterPhase.SECURITY.after()](https://github.com/micronaut-projects/micronaut-core/blob/v2.5.13/http/src/main/java/io/micronaut/http/filter/ServerFilterPhase.java#L54) is default) -* *path*: filter path (`/**` is default) -* *key*: name of MDC header (`principal` is default) - -Example with default configuration: - -```yaml -logger: - request: - principal: - enabled: true - order: 39250 - path: /** - key: principal -``` - -## Build & Release - -### Dependency updates - -Display dependency updates: - -```sh -mvn versions:display-property-updates -U -``` - -Update dependencies: - -```sh -mvn versions:update-properties -``` - -### Release locally - -Run: - -```sh -mvn release:prepare release:perform release:clean -B -DreleaseProfiles=oss-release -``` +* [build](docs/build.md) ## Open Topics diff --git a/docs/build.md b/docs/build.md new file mode 100644 index 0000000..4d5c72e --- /dev/null +++ b/docs/build.md @@ -0,0 +1,23 @@ +# Build & Release + +## Dependency updates + +Display dependency updates: + +```sh +mvn versions:display-parent-updates versions:display-property-updates -U +``` + +Update dependencies: + +```sh +mvn versions:update-parent versions:update-properties +``` + +## Release locally + +Run: + +```sh +mvn release:prepare release:perform release:clean -B -DreleaseProfiles=oss-release +``` diff --git a/docs/features/http_log_level.md b/docs/features/http_log_level.md new file mode 100644 index 0000000..59b960d --- /dev/null +++ b/docs/features/http_log_level.md @@ -0,0 +1,35 @@ +# Set log level based on HTTP request header + +With this features it is possible to set the log level while processing a request by adding the http header `x-log-level` with value `TRACE`. This log level is propagated to HTTP client requests. + +## Properties + +Property | Description | Default +-------- | ----------- | ------- +`logger.http.level.enabled` | filter enabled? | `true` +`logger.http.level.path` | filter path | `/**` +`logger.http.level.order` | order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/core/src/main/java/io/micronaut/core/order/Ordered.java) | [ServerFilterPhase.FIRST.before()](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/http/src/main/java/io/micronaut/http/filter/ServerFilterPhase.java#L34) +`logger.http.level.header` | name of HTTP header | `x-log-level` +`logger.http.level.propagation.enabled` | propagation enabled? | `true` +`logger.http.level.propagation.path` | propagation path | `/**` +`logger.http.level.propagation.order` | order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/core/src/main/java/io/micronaut/core/order/Ordered.java) | [Order.HIGHEST_PRECEDENCE](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/core/src/main/java/io/micronaut/core/order/Ordered.java#L30) +`logger.http.level.propagation.header` | name of HTTP header | see `logger.http.level.header` + +## Examples + +Default configuration: + +```yaml +logger: + http: + level: + enabled: true + order: -1000 + path: /** + header: x-log-level + propagation: + enabled: true + order: 2147483648 + path: /** + header: ${logger.http.level.header} +``` diff --git a/docs/features/http_mdc_authentication.md b/docs/features/http_mdc_authentication.md new file mode 100644 index 0000000..ff4c4e9 --- /dev/null +++ b/docs/features/http_mdc_authentication.md @@ -0,0 +1,29 @@ +# Add authentication information to MDC + +This only applies to HTTP requests with successful security authentication. + +## Properties + +Property | Description | Default +-------- | ----------- | ------- +`logger.http.authentication.enabled` | filter enabled? | `true` +`logger.http.authentication.path` | filter path | `/**` +`logger.http.authentication.order` | order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/core/src/main/java/io/micronaut/core/order/Ordered.java) | [ServerFilterPhase.SECURITY.after()](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/http/src/main/java/io/micronaut/http/filter/ServerFilterPhase.java#L54) +`logger.http.authentication.prefix` | prefix to MDC key | `` +`logger.http.authentication.name` | MDC key of authentication name | `principal` +`logger.http.authentication.attributes` | authentication attributes to add to MDC, | `[]` + +## Examples + +Configuration for adding some jwt claims: + +```yaml +logger: + http: + authentication: + prefix: jwt. + name: sub + attributes: + - aud + - azp +``` diff --git a/docs/features/http_mdc_headers.md b/docs/features/http_mdc_headers.md new file mode 100644 index 0000000..b6c031a --- /dev/null +++ b/docs/features/http_mdc_headers.md @@ -0,0 +1,28 @@ +# Add HTTP headers to MDC + +## Properties + +Property | Description | Default +-------- | ----------- | ------- +`logger.http.headers.enabled` | filter enabled? | `true` +`logger.http.headers.path` | filter path | `/**` +`logger.http.headers.order` | order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/core/src/main/java/io/micronaut/core/order/Ordered.java) | [ServerFilterPhase.FIRST.before()](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/http/src/main/java/io/micronaut/http/filter/ServerFilterPhase.java#L34) +`logger.http.headers.prefix` | prefix to MDC key | `` +`logger.http.headers.names` | http header names to add to MDC | `[]` + +## Examples + +Configuration for b3-propagation: + +```yaml +logger: + http: + headers: + prefix: header. + names: + - x-request-id + - x-b3-traceId + - x-b3-parentspanid + - x-b3-spanid + - x-b3-sampled +``` diff --git a/docs/features/logback_appender.md b/docs/features/logback_appender.md new file mode 100644 index 0000000..1975e8b --- /dev/null +++ b/docs/features/logback_appender.md @@ -0,0 +1,16 @@ +# Appender + +## Available Appender + +* console with jansi for developers +* gcp logging format (with support for error reporting) +* json + +## AutoSelect appender + +1. if `LOGBACK_APPENDER` is set this appender will be used +2. if GCP is detected gcp appender will be used +3. if Kubernetes is detected json appender will be used +4. console appender else + +*IMPORTENT*: only works without custom `logback.xml` diff --git a/docs/features/logback_default.md b/docs/features/logback_default.md new file mode 100644 index 0000000..98ccbc5 --- /dev/null +++ b/docs/features/logback_default.md @@ -0,0 +1,18 @@ +# Add default logback.xml + +If no `logback.xml` by user is provided a default [logback.xml](../../src/main/resources/io/kokuwa/logback/logback-default.xml) is loaded. Otherwise use custom [logback.xml](../../src/main/resources/io/kokuwa/logback/logback-example.xml): + +```xml + + + + + + + + + + + + +``` diff --git a/docs/features/logback_mdc_level.md b/docs/features/logback_mdc_level.md new file mode 100644 index 0000000..53887d5 --- /dev/null +++ b/docs/features/logback_mdc_level.md @@ -0,0 +1,66 @@ +# Set log level based on MDC values + +This can be used to change the log level based on MDC valus. E.g. change log levels for specific users/services etc. + +## Properties + +Property | Description | Default +-------- | ----------- | ------- +`logger.mdc.enabled` | MDC enabled? | `true` +`logger.mdc.` | MDC key to use | +`logger.mdc..key` | MDC key override, see complex example below for usage | `` +`logger.mdc..level` | log level to use | `TRACE` +`logger.mdc..loggers` | passlist of logger names, matches all loggers if empty | `[]` +`logger.mdc..values` | values for matching MDC key, matches all values if empty | `[]` + +## Examples + +Minimal configuration that logs everything with `TRACE` if MDC `principal` is present: + +```yaml +logger: + levels: + io.kokuwa: INFO + mdc: + principal: {} +``` + +Configuration that logs everything with `TRACE` for logger `io.kokuwa` if MDC `gateway` matches one value: + +```yaml +logger: + levels: + io.kokuwa: INFO + mdc: + gateway: + loggers: + - io.kokuwa + values: + - 257802b2-22fe-4dcc-bb99-c1db2a47861f + - 0a44738b-0c3a-4798-8210-2495485f10b2 +``` + +Complex example with setting different values for different values/logger: + +```yaml +logger: + levels: + io.kokuwa: INFO + mdc: + gateway-debug: + key: gateway + level: DEBUG + loggers: + - io.kokuwa + values: + - 6a1bae7f-eb6c-4c81-af9d-dc15396584e2 + - fb3318f1-2c73-48e9-acd4-a2be3c9f9256 + gateway-trace: + key: gateway + level: TRACE + loggers: + - io.kokuwa + - io.micronaut + values: + - 257802b2-22fe-4dcc-bb99-c1db2a47861f +``` diff --git a/pom.xml b/pom.xml index de101f4..ed38ada 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.kokuwa maven-parent - 0.5.4 + 0.5.5 @@ -49,7 +49,7 @@ 0.1.5 - 3.1.3 + 3.2.0 @@ -92,6 +92,11 @@ micronaut-runtime provided + + io.micronaut.security + micronaut-security + provided + io.micronaut.test micronaut-test-junit5 diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup new file mode 100644 index 0000000..5a30895 --- /dev/null +++ b/pom.xml.versionsBackup @@ -0,0 +1,169 @@ + + + 4.0.0 + + + io.kokuwa + maven-parent + 0.5.4 + + + + io.kokuwa.micronaut + micronaut-logging + 3.0.0-SNAPSHOT + + Logging support for Micronaut + Enhanced logging using MDC or request header. + https://github.com/kokuwaio/micronaut-logging + 2020 + + + Apache License 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + + + Stephan Schnabel + https://github.com/stephanschnabel + + + + + https://github.com/kokuwaio/micronaut-logging + scm:git:https://github.com/kokuwaio/micronaut-logging.git + scm:git:https://github.com/kokuwaio/micronaut-logging.git + HEAD + + + github + https://github.com/kokuwaio/micronaut-logging/issues + + + + + + + + + 0.1.5 + 3.2.0 + + + + + + + + + io.micronaut + micronaut-bom + ${version.io.micronaut} + pom + import + + + + + ch.qos.logback.contrib + logback-json-classic + ${version.ch.qos.logback.contrib} + + + ch.qos.logback.contrib + logback-json-core + ${version.ch.qos.logback.contrib} + + + ch.qos.logback.contrib + logback-jackson + ${version.ch.qos.logback.contrib} + + + + + + + + + io.micronaut + micronaut-runtime + provided + + + io.micronaut.security + micronaut-security + provided + + + io.micronaut.test + micronaut-test-junit5 + test + + + io.micronaut + micronaut-http-client + test + + + io.micronaut + micronaut-http-server-netty + test + + + io.micronaut.security + micronaut-security-jwt + test + + + + + com.google.code.findbugs + jsr305 + provided + + + + + ch.qos.logback + logback-classic + + + ch.qos.logback.contrib + logback-jackson + + + ch.qos.logback.contrib + logback-json-classic + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + ${version.org.projectlombok} + + + io.micronaut + micronaut-inject-java + ${version.io.micronaut} + + + + + + + + diff --git a/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java b/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java index 1ebef70..1d808a9 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java +++ b/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java @@ -1,5 +1,6 @@ package io.kokuwa.micronaut.logging.configurator; +import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.Configurator; import ch.qos.logback.core.joran.spi.JoranException; @@ -29,5 +30,7 @@ public class DefaultConfigurator extends ContextAwareBase implements Configurato } catch (JoranException e) { addError("Failed to load logback.xml from io.kokuwa:micronaut-logging", e); } + + loggerContext.getLogger("io.micronaut.logging.PropertiesLoggingLevelsConfigurer").setLevel(Level.WARN); } } diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/AbstractMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/AbstractMdcFilter.java new file mode 100644 index 0000000..777d363 --- /dev/null +++ b/src/main/java/io/kokuwa/micronaut/logging/http/AbstractMdcFilter.java @@ -0,0 +1,47 @@ +package io.kokuwa.micronaut.logging.http; + +import java.util.Map; + +import org.reactivestreams.Publisher; +import org.slf4j.MDC; + +import io.micronaut.core.async.publisher.Publishers; +import io.micronaut.http.HttpRequest; +import io.micronaut.http.MutableHttpResponse; +import io.micronaut.http.filter.HttpServerFilter; +import io.micronaut.http.filter.ServerFilterChain; + +/** + * Base for all MDC related http filters. + * + * @author Stephan Schnabel + */ +public abstract class AbstractMdcFilter implements HttpServerFilter { + + private final int order; + + public AbstractMdcFilter(Integer order) { + this.order = order; + } + + @Override + public int getOrder() { + return order; + } + + protected Publisher> doFilter( + HttpRequest request, + ServerFilterChain chain, + Map mdc) { + + if (mdc.isEmpty()) { + return chain.proceed(request); + } + + mdc.forEach(MDC::put); + return Publishers.map(chain.proceed(request), response -> { + mdc.keySet().forEach(MDC::remove); + return response; + }); + } +} diff --git a/src/main/java/io/kokuwa/micronaut/logging/request/HeaderLoggingClientHttpFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelClientFilter.java similarity index 62% rename from src/main/java/io/kokuwa/micronaut/logging/request/HeaderLoggingClientHttpFilter.java rename to src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelClientFilter.java index 463a070..511829d 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/request/HeaderLoggingClientHttpFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelClientFilter.java @@ -1,4 +1,4 @@ -package io.kokuwa.micronaut.logging.request; +package io.kokuwa.micronaut.logging.http.level; import java.util.Optional; @@ -13,30 +13,29 @@ import io.micronaut.http.annotation.Filter; import io.micronaut.http.context.ServerRequestContext; import io.micronaut.http.filter.ClientFilterChain; import io.micronaut.http.filter.HttpClientFilter; -import io.micronaut.http.filter.ServerFilterPhase; /** - * Http request logging filter. + * Propagates log-level from server request to client. * * @author Stephan Schnabel */ -@Requires(beans = HeaderLoggingServerHttpFilter.class) -@Requires(property = HeaderLoggingClientHttpFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) -@Filter("${" + HeaderLoggingClientHttpFilter.PREFIX + ".path:/**}") -public class HeaderLoggingClientHttpFilter implements HttpClientFilter { +@Requires(beans = LogLevelServerFilter.class) +@Requires(property = LogLevelClientFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) +@Filter("${" + LogLevelClientFilter.PREFIX + ".path:/**}") +public class LogLevelClientFilter implements HttpClientFilter { - public static final String PREFIX = "logger.request.propagation"; - public static final int DEFAULT_ORDER = ServerFilterPhase.TRACING.order(); + public static final String PREFIX = "logger.http.level.propagation"; + public static final int DEFAULT_ORDER = HIGHEST_PRECEDENCE; private final String serverHeader; private final String propagationHeader; private final int order; - public HeaderLoggingClientHttpFilter( - @Value("${" + HeaderLoggingServerHttpFilter.PREFIX + ".header}") Optional serverHeader, + public LogLevelClientFilter( + @Value("${" + LogLevelServerFilter.PREFIX + ".header}") Optional serverHeader, @Value("${" + PREFIX + ".header}") Optional propagationHeader, @Value("${" + PREFIX + ".order}") Optional order) { - this.serverHeader = serverHeader.orElse(HeaderLoggingServerHttpFilter.DEFAULT_HEADER); + this.serverHeader = serverHeader.orElse(LogLevelServerFilter.DEFAULT_HEADER); this.propagationHeader = propagationHeader.orElse(this.serverHeader); this.order = order.orElse(DEFAULT_ORDER); } diff --git a/src/main/java/io/kokuwa/micronaut/logging/request/HeaderLoggingServerHttpFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java similarity index 67% rename from src/main/java/io/kokuwa/micronaut/logging/request/HeaderLoggingServerHttpFilter.java rename to src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java index f0afce3..67357ed 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/request/HeaderLoggingServerHttpFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java @@ -1,4 +1,4 @@ -package io.kokuwa.micronaut.logging.request; +package io.kokuwa.micronaut.logging.http.level; import java.util.Optional; @@ -10,6 +10,7 @@ import org.slf4j.MDC; import ch.qos.logback.classic.turbo.TurboFilter; import io.kokuwa.micronaut.logging.LogbackUtil; +import io.kokuwa.micronaut.logging.http.AbstractMdcFilter; import io.micronaut.context.annotation.Requires; import io.micronaut.context.annotation.Value; import io.micronaut.core.async.publisher.Publishers; @@ -17,54 +18,46 @@ import io.micronaut.core.util.StringUtils; import io.micronaut.http.HttpRequest; import io.micronaut.http.MutableHttpResponse; import io.micronaut.http.annotation.Filter; -import io.micronaut.http.filter.HttpServerFilter; import io.micronaut.http.filter.ServerFilterChain; import io.micronaut.http.filter.ServerFilterPhase; -import io.micronaut.runtime.server.EmbeddedServer; +import io.micronaut.runtime.context.scope.Refreshable; /** * Http request logging filter. * * @author Stephan Schnabel */ -@Requires(beans = EmbeddedServer.class) -@Requires(property = HeaderLoggingServerHttpFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) -@Filter("${" + HeaderLoggingServerHttpFilter.PREFIX + ".path:/**}") -public class HeaderLoggingServerHttpFilter implements HttpServerFilter { - - public static final String PREFIX = "logger.request.filter"; - public static final String MDC_FILTER = PREFIX; - public static final String MDC_KEY = "level"; +@Refreshable +@Requires(property = LogLevelServerFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) +@Filter("${" + LogLevelServerFilter.PREFIX + ".path:/**}") +public class LogLevelServerFilter extends AbstractMdcFilter { + public static final String PREFIX = "logger.http.level"; public static final String DEFAULT_HEADER = "x-log-level"; public static final int DEFAULT_ORDER = ServerFilterPhase.FIRST.before(); + public static final String MDC_KEY = "level"; + public static final String MDC_FILTER = PREFIX; private final LogbackUtil logback; private final String header; - private final int order; - public HeaderLoggingServerHttpFilter( + public LogLevelServerFilter( LogbackUtil logback, @Value("${" + PREFIX + ".header}") Optional header, @Value("${" + PREFIX + ".order}") Optional order) { + super(order.orElse(DEFAULT_ORDER)); this.logback = logback; this.header = header.orElse(DEFAULT_HEADER); - this.order = order.orElse(DEFAULT_ORDER); } @PostConstruct void startTurbofilter() { - logback.getTurboFilter(HeaderLoggingTurboFilter.class, MDC_FILTER, HeaderLoggingTurboFilter::new).start(); + logback.getTurboFilter(LogLevelTurboFilter.class, MDC_FILTER, LogLevelTurboFilter::new).start(); } @PreDestroy void stopTurbofilter() { - logback.getTurboFilter(HeaderLoggingTurboFilter.class, MDC_FILTER).ifPresent(TurboFilter::stop); - } - - @Override - public int getOrder() { - return order; + logback.getTurboFilter(LogLevelTurboFilter.class, MDC_FILTER).ifPresent(TurboFilter::stop); } @Override diff --git a/src/main/java/io/kokuwa/micronaut/logging/request/HeaderLoggingTurboFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelTurboFilter.java similarity index 79% rename from src/main/java/io/kokuwa/micronaut/logging/request/HeaderLoggingTurboFilter.java rename to src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelTurboFilter.java index c1a8dc3..57df67f 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/request/HeaderLoggingTurboFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelTurboFilter.java @@ -1,4 +1,4 @@ -package io.kokuwa.micronaut.logging.request; +package io.kokuwa.micronaut.logging.http.level; import org.slf4j.MDC; import org.slf4j.Marker; @@ -13,7 +13,7 @@ import ch.qos.logback.core.spi.FilterReply; * * @author Stephan Schnabel */ -public class HeaderLoggingTurboFilter extends TurboFilter { +public class LogLevelTurboFilter extends TurboFilter { @Override public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { @@ -22,7 +22,7 @@ public class HeaderLoggingTurboFilter extends TurboFilter { return FilterReply.NEUTRAL; } - var value = MDC.get(HeaderLoggingServerHttpFilter.MDC_KEY); + var value = MDC.get(LogLevelServerFilter.MDC_KEY); if (value == null) { return FilterReply.NEUTRAL; } diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java new file mode 100644 index 0000000..f1c4a14 --- /dev/null +++ b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java @@ -0,0 +1,77 @@ +package io.kokuwa.micronaut.logging.http.mdc; + +import java.util.HashMap; +import java.util.List; +import java.util.Optional; + +import org.reactivestreams.Publisher; +import org.slf4j.MDC; + +import io.kokuwa.micronaut.logging.http.AbstractMdcFilter; +import io.micronaut.context.annotation.Requires; +import io.micronaut.context.annotation.Value; +import io.micronaut.core.util.StringUtils; +import io.micronaut.http.HttpRequest; +import io.micronaut.http.MutableHttpResponse; +import io.micronaut.http.annotation.Filter; +import io.micronaut.http.filter.ServerFilterChain; +import io.micronaut.http.filter.ServerFilterPhase; +import io.micronaut.runtime.context.scope.Refreshable; +import io.micronaut.security.authentication.Authentication; + +/** + * Filter to add claims from authentication to MDC. + * + * @author Stephan Schnabel + */ +@Refreshable +@Requires(classes = Authentication.class) +@Requires(property = AuthenticationMdcFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) +@Filter("${" + AuthenticationMdcFilter.PREFIX + ".path:/**}") +public class AuthenticationMdcFilter extends AbstractMdcFilter { + + public static final String PREFIX = "logger.http.authentication"; + public static final String DEFAULT_NAME = "principal"; + public static final int DEFAULT_ORDER = ServerFilterPhase.SECURITY.after(); + + private final String name; + private final List attributes; + private final String prefix; + + public AuthenticationMdcFilter( + @Value("${" + PREFIX + ".name:principal}") Optional name, + @Value("${" + PREFIX + ".attributes:[]}") List attributes, + @Value("${" + PREFIX + ".prefix}") Optional prefix, + @Value("${" + PREFIX + ".order}") Optional order) { + super(order.orElse(DEFAULT_ORDER)); + this.name = name.orElse(DEFAULT_NAME); + this.prefix = prefix.orElse(null); + this.attributes = attributes; + } + + @Override + public Publisher> doFilter(HttpRequest request, ServerFilterChain chain) { + + // get authentication + + var optional = request.getUserPrincipal(Authentication.class); + if (optional.isEmpty()) { + return chain.proceed(request); + } + var authentication = optional.get(); + var authenticationAttributes = authentication.getAttributes(); + + // add mdc + + var mdc = new HashMap(); + MDC.put(prefix == null ? name : prefix + name, authentication.getName()); + for (var header : attributes) { + var value = authenticationAttributes.get(header); + if (value != null) { + mdc.put(prefix == null ? header : prefix + header, String.valueOf(value)); + } + } + + return doFilter(request, chain, mdc); + } +} diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilter.java new file mode 100644 index 0000000..efca100 --- /dev/null +++ b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilter.java @@ -0,0 +1,58 @@ +package io.kokuwa.micronaut.logging.http.mdc; + +import java.util.HashMap; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +import org.reactivestreams.Publisher; + +import io.kokuwa.micronaut.logging.http.AbstractMdcFilter; +import io.micronaut.context.annotation.Requires; +import io.micronaut.context.annotation.Value; +import io.micronaut.core.util.StringUtils; +import io.micronaut.http.HttpRequest; +import io.micronaut.http.MutableHttpResponse; +import io.micronaut.http.annotation.Filter; +import io.micronaut.http.filter.ServerFilterChain; +import io.micronaut.http.filter.ServerFilterPhase; +import io.micronaut.runtime.context.scope.Refreshable; + +/** + * Filter to add http headers to MDC. + * + * @author Stephan Schnabel + */ +@Refreshable +@Requires(property = HttpHeadersMdcFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) +@Requires(property = HttpHeadersMdcFilter.PREFIX + ".names") +@Filter("${" + HttpHeadersMdcFilter.PREFIX + ".path:/**}") +public class HttpHeadersMdcFilter extends AbstractMdcFilter { + + public static final String PREFIX = "logger.http.headers"; + public static final int DEFAULT_ORDER = ServerFilterPhase.FIRST.before(); + + private final Set headers; + private final String prefix; + + public HttpHeadersMdcFilter( + @Value("${" + PREFIX + ".names}") List headers, + @Value("${" + PREFIX + ".prefix}") Optional prefix, + @Value("${" + PREFIX + ".order}") Optional order) { + super(order.orElse(DEFAULT_ORDER)); + this.prefix = prefix.orElse(null); + this.headers = headers.stream().map(String::toLowerCase).collect(Collectors.toSet()); + } + + @Override + public Publisher> doFilter(HttpRequest request, ServerFilterChain chain) { + var mdc = new HashMap(); + for (var header : headers) { + request.getHeaders() + .getFirst(header) + .ifPresent(value -> mdc.put(prefix == null ? header : prefix + header, String.valueOf(value))); + } + return doFilter(request, chain, mdc); + } +} diff --git a/src/main/java/io/kokuwa/micronaut/logging/request/PrincipalHttpFilter.java b/src/main/java/io/kokuwa/micronaut/logging/request/PrincipalHttpFilter.java deleted file mode 100644 index 0e7a14d..0000000 --- a/src/main/java/io/kokuwa/micronaut/logging/request/PrincipalHttpFilter.java +++ /dev/null @@ -1,63 +0,0 @@ -package io.kokuwa.micronaut.logging.request; - -import java.util.Optional; - -import org.reactivestreams.Publisher; -import org.slf4j.MDC; - -import io.micronaut.context.annotation.Requires; -import io.micronaut.context.annotation.Value; -import io.micronaut.core.async.publisher.Publishers; -import io.micronaut.core.util.StringUtils; -import io.micronaut.http.HttpRequest; -import io.micronaut.http.MutableHttpResponse; -import io.micronaut.http.annotation.Filter; -import io.micronaut.http.filter.HttpServerFilter; -import io.micronaut.http.filter.ServerFilterChain; -import io.micronaut.http.filter.ServerFilterPhase; -import io.micronaut.runtime.server.EmbeddedServer; - -/** - * Http request principal filter. - * - * @author Stephan Schnabel - */ -@Requires(beans = EmbeddedServer.class) -@Requires(property = PrincipalHttpFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) -@Filter("${" + PrincipalHttpFilter.PREFIX + ".path:/**}") -public class PrincipalHttpFilter implements HttpServerFilter { - - public static final String PREFIX = "logger.request.principal"; - - public static final String DEFAULT_KEY = "principal"; - public static final int DEFAULT_ORDER = ServerFilterPhase.SECURITY.after(); - - private final String key; - private final int order; - - public PrincipalHttpFilter( - @Value("${" + PREFIX + ".key:" + DEFAULT_KEY + "}") String key, - @Value("${" + PREFIX + ".order}") Optional order) { - this.key = key; - this.order = order.orElse(DEFAULT_ORDER); - } - - @Override - public int getOrder() { - return order; - } - - @Override - public Publisher> doFilter(HttpRequest request, ServerFilterChain chain) { - var princial = request.getUserPrincipal(); - if (princial.isPresent()) { - MDC.put(key, princial.get().getName()); - return Publishers.map(chain.proceed(request), response -> { - MDC.remove(key); - return response; - }); - } else { - return chain.proceed(request); - } - } -} diff --git a/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java b/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java index 53960e4..366ba0c 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java @@ -2,7 +2,9 @@ package io.kokuwa.micronaut.logging; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.MethodOrderer.DisplayName; +import org.junit.jupiter.api.ClassOrderer; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.TestClassOrder; import org.junit.jupiter.api.TestMethodOrder; import org.slf4j.MDC; @@ -14,7 +16,8 @@ import io.micronaut.test.extensions.junit5.annotation.MicronautTest; * @author Stephan Schnabel */ @MicronautTest -@TestMethodOrder(DisplayName.class) +@TestClassOrder(ClassOrderer.DisplayName.class) +@TestMethodOrder(MethodOrderer.DisplayName.class) public abstract class AbstractTest { @BeforeEach diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java new file mode 100644 index 0000000..11d6676 --- /dev/null +++ b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java @@ -0,0 +1,133 @@ +package io.kokuwa.micronaut.logging.http; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Map; +import java.util.function.Consumer; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.slf4j.MDC; + +import com.nimbusds.jwt.JWTClaimsSet; + +import ch.qos.logback.classic.Level; +import io.kokuwa.micronaut.logging.AbstractTest; +import io.micronaut.core.util.CollectionUtils; +import io.micronaut.http.HttpHeaderValues; +import io.micronaut.http.HttpRequest; +import io.micronaut.http.HttpStatus; +import io.micronaut.http.annotation.Controller; +import io.micronaut.http.annotation.Get; +import io.micronaut.http.client.DefaultHttpClientConfiguration; +import io.micronaut.http.client.HttpClient; +import io.micronaut.http.filter.HttpServerFilter; +import io.micronaut.runtime.server.EmbeddedServer; +import io.micronaut.security.annotation.Secured; +import io.micronaut.security.rules.SecurityRule; +import io.micronaut.security.token.jwt.signature.SignatureGeneratorConfiguration; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; +import jakarta.inject.Inject; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; + +/** + * Test for {@link HttpServerFilter}. + * + * @author Stephan Schnabel + */ +@MicronautTest(rebuildContext = true) +public abstract class AbstractFilterTest extends AbstractTest { + + private static boolean INIT = false; + + @Inject + SignatureGeneratorConfiguration signature; + @Inject + EmbeddedServer embeddedServer; + + @DisplayName("0 init") + @Test + @BeforeEach + void refresh() { + // https://github.com/micronaut-projects/micronaut-core/issues/5453#issuecomment-864594741 + if (INIT) { + embeddedServer.refresh(); + } else { + INIT = true; + } + } + + // security + + public String token(String subject) { + return token(subject, claims -> {}); + } + + @SneakyThrows + public String token(String subject, Consumer manipulator) { + var claims = new JWTClaimsSet.Builder().subject(subject); + manipulator.accept(claims); + return HttpHeaderValues.AUTHORIZATION_PREFIX_BEARER + " " + signature.sign(claims.build()).serialize(); + } + + // request + + @SneakyThrows + public TestResponse get(Map headers) { + + var request = HttpRequest.GET("/"); + headers.forEach((name, value) -> request.header(name, value)); + var configuration = new DefaultHttpClientConfiguration(); + configuration.setLoggerName("io.kokuwa.TestClient"); + var response = HttpClient + .create(embeddedServer.getURL(), configuration) + .toBlocking().exchange(request, TestResponse.class); + assertEquals(HttpStatus.OK, response.getStatus(), "status"); + assertTrue(response.getBody().isPresent(), "body"); + assertTrue(CollectionUtils.isEmpty(MDC.getCopyOfContextMap()), "mdc leaked: " + MDC.getCopyOfContextMap()); + + return response.body(); + } + + @Secured({ SecurityRule.IS_ANONYMOUS, SecurityRule.IS_AUTHENTICATED }) + @Controller + @Slf4j + public static class TestController { + + @Get("/") + TestResponse run() { + + var level = Level.OFF; + if (log.isTraceEnabled()) { + level = Level.TRACE; + } else if (log.isDebugEnabled()) { + level = Level.DEBUG; + } else if (log.isInfoEnabled()) { + level = Level.INFO; + } else if (log.isWarnEnabled()) { + level = Level.WARN; + } else if (log.isErrorEnabled()) { + level = Level.ERROR; + } + + var mdc = MDC.getCopyOfContextMap(); + log.info("Found MDC: {}", mdc); + + return new TestResponse(level.toString(), mdc == null ? Map.of() : mdc); + } + } + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class TestResponse { + private String level; + private Map context = Map.of(); + } +} diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilterTest.java new file mode 100644 index 0000000..b25a6af --- /dev/null +++ b/src/test/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilterTest.java @@ -0,0 +1,80 @@ +package io.kokuwa.micronaut.logging.http.level; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Map; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import ch.qos.logback.classic.Level; +import io.kokuwa.micronaut.logging.http.AbstractFilterTest; +import io.micronaut.context.annotation.Property; + +/** + * Test for {@link LogLevelServerFilter}. + * + * @author Stephan Schnabel + */ +@DisplayName("http: set log level via http request") +public class LogLevelServerFilterTest extends AbstractFilterTest { + + @DisplayName("noop: disabled") + @Test + @Property(name = "logger.http.level.enabled", value = "false") + void noopDisabled() { + assertLevel(Level.INFO, "TRACE"); + } + + @DisplayName("noop: header missing") + @Test + void noopHeaderMissing() { + assertLevel(Level.INFO, null); + } + + @DisplayName("noop: header invalid, use DEBUG as default from logback") + @Test + void noopHeaderInvalid() { + assertLevel(Level.DEBUG, "TRCE"); + } + + @DisplayName("level: trace (below default)") + @Test + void levelTrace() { + assertLevel(Level.TRACE, "TRACE"); + } + + @DisplayName("level: debug (below default)") + @Test + void levelDebug() { + assertLevel(Level.DEBUG, "DEBUG"); + } + + @DisplayName("level: info (is default)") + @Test + void levelInfo() { + assertLevel(Level.INFO, "INFO"); + } + + @DisplayName("level: warn (above default)") + @Test + void levelWarn() { + assertLevel(Level.INFO, "WARN"); + } + + @DisplayName("config: custom header name") + @Test + @Property(name = "logger.http.level.header", value = "FOO") + void configHeaderWarn() { + assertLevel(Level.TRACE, "FOO", "TRACE"); + } + + private void assertLevel(Level expectedLevel, String value) { + assertLevel(expectedLevel, LogLevelServerFilter.DEFAULT_HEADER, value); + } + + private void assertLevel(Level expectedLevel, String name, String value) { + var headers = value == null ? Map.of() : Map.of(name, value); + assertEquals(expectedLevel.toString(), get(headers).getLevel()); + } +} diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilterTest.java new file mode 100644 index 0000000..0492139 --- /dev/null +++ b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilterTest.java @@ -0,0 +1,73 @@ +package io.kokuwa.micronaut.logging.http.mdc; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.kokuwa.micronaut.logging.http.AbstractFilterTest; +import io.micronaut.context.annotation.Property; +import io.micronaut.http.HttpHeaders; + +/** + * Test for {@link AuthenticationMdcFilter}. + * + * @author Stephan Schnabel + */ +@DisplayName("http: mdc from authentication") +public class AuthenticationMdcFilterTest extends AbstractFilterTest { + + @DisplayName("noop: disabled") + @Test + @Property(name = "logger.http.authentication.enabled", value = "false") + void noopDisabled() { + assertEquals(Map.of(), getContext(true)); + } + + @DisplayName("noop: token missing") + @Test + void noopTokenMissing() { + assertEquals(Map.of(), getContext(false)); + } + + @DisplayName("mdc: default config") + @Test + void mdcWithDefault() { + assertEquals(Map.of("principal", "mySubject"), getContext(true)); + } + + @DisplayName("mdc: with name") + @Test + @Property(name = "logger.http.authentication.name", value = "sub") + void mdcWithName() { + assertEquals(Map.of("sub", "mySubject"), getContext(true)); + } + + @DisplayName("mdc: with attribute keys") + @Test + @Property(name = "logger.http.authentication.attributes", value = "azp,aud") + void mdcWithAttributes() { + assertEquals(Map.of("principal", "mySubject", "aud", "[a, b]", "azp", "myAzp"), getContext(true)); + } + + @DisplayName("mdc: with prefix") + @Test + @Property(name = "logger.http.authentication.name", value = "sub") + @Property(name = "logger.http.authentication.attributes", value = "azp") + @Property(name = "logger.http.authentication.prefix", value = "auth.") + void mdcWithPrefix() { + assertEquals(Map.of("auth.sub", "mySubject", "auth.azp", "myAzp"), getContext(true)); + } + + private Map getContext(boolean token) { + return get(token + ? Map.of(HttpHeaders.AUTHORIZATION, token("mySubject", claims -> claims + .issuer("nope") + .claim("azp", "myAzp") + .audience(List.of("a", "b")))) + : Map.of()).getContext(); + } +} diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilterTest.java new file mode 100644 index 0000000..f551bd9 --- /dev/null +++ b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilterTest.java @@ -0,0 +1,60 @@ +package io.kokuwa.micronaut.logging.http.mdc; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Map; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.kokuwa.micronaut.logging.http.AbstractFilterTest; +import io.micronaut.context.annotation.Property; + +/** + * Test for {@link HttpHeadersMdcFilter}. + * + * @author Stephan Schnabel + */ +@DisplayName("http: mdc from headers") +public class HttpHeadersMdcFilterTest extends AbstractFilterTest { + + @DisplayName("noop: empty configuration") + @Test + void noopEmptyConfiguration() { + assertContext(Map.of(), Map.of("foo", "bar")); + } + + @DisplayName("noop: disabled") + @Test + @Property(name = "logger.http.headers.enabled", value = "false") + @Property(name = "logger.http.headers.names", value = "foo") + void noopDisabled() { + assertContext(Map.of(), Map.of("foo", "bar")); + } + + @DisplayName("mdc: mismatch") + @Test + @Property(name = "logger.http.headers.names", value = "foo") + void mdcMismatch() { + assertContext(Map.of(), Map.of("nope", "bar")); + } + + @DisplayName("mdc: match without prefix") + @Test + @Property(name = "logger.http.headers.names", value = "foo") + void mdcMatchWithoutPrefix() { + assertContext(Map.of("foo", "bar"), Map.of("foo", "bar", "nope", "bar")); + } + + @DisplayName("mdc: match with prefix") + @Test + @Property(name = "logger.http.headers.names", value = "foo") + @Property(name = "logger.http.headers.prefix", value = "header.") + void mdcMatchWithPrefix() { + assertContext(Map.of("header.foo", "bar"), Map.of("foo", "bar", "nope", "bar")); + } + + private void assertContext(Map expectedMdcs, Map headers) { + assertEquals(expectedMdcs, get(headers).getContext()); + } +} diff --git a/src/test/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterTest.java index 5fc80fa..186c2a3 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterTest.java @@ -17,7 +17,7 @@ import io.micronaut.test.extensions.junit5.annotation.MicronautTest; * * @author Stephan Schnabel */ -@DisplayName("mdc") +@DisplayName("mdc based log levels") @MicronautTest(environments = "test-mdc") public class MDCTurboFilterTest extends AbstractTest { diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java b/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java deleted file mode 100644 index 2c69814..0000000 --- a/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.kokuwa.micronaut.logging.request; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import ch.qos.logback.classic.Level; -import io.kokuwa.micronaut.logging.AbstractTest; -import io.micronaut.test.extensions.junit5.annotation.MicronautTest; -import jakarta.inject.Inject; - -/** - * Test for MDC and request filter combined. - * - * @author Stephan Schnabel - */ -@DisplayName("request-composite") -@MicronautTest(environments = "test-composite") -public class CompositeTest extends AbstractTest { - - @Inject - TestClient client; - - @DisplayName("default level") - @Test - void defaultLogging() { - client.assertLevel(Level.INFO, client.token("somebody"), null); - } - - @DisplayName("level set by mdc") - @Test - void headerFromMdc() { - client.assertLevel(Level.DEBUG, client.token("horst"), null); - } - - @DisplayName("level set by header (overriding mdc)") - @Test - void headerFromHeader() { - client.assertLevel(Level.TRACE, client.token("horst"), "TRACE"); - } -} diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/RequestHeaderTest.java b/src/test/java/io/kokuwa/micronaut/logging/request/RequestHeaderTest.java deleted file mode 100644 index 476e976..0000000 --- a/src/test/java/io/kokuwa/micronaut/logging/request/RequestHeaderTest.java +++ /dev/null @@ -1,56 +0,0 @@ -package io.kokuwa.micronaut.logging.request; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import ch.qos.logback.classic.Level; -import io.kokuwa.micronaut.logging.AbstractTest; -import jakarta.inject.Inject; - -/** - * Test for {@link HeaderLoggingServerHttpFilter}. - * - * @author Stephan Schnabel - */ -@DisplayName("request-header") -public class RequestHeaderTest extends AbstractTest { - - @Inject - TestClient client; - - @DisplayName("header missing") - @Test - void headerMissing() { - client.assertLevel(Level.INFO, null, null); - } - - @DisplayName("header invalid, use DEBUG as default from logback") - @Test - void headerInvalid() { - client.assertLevel(Level.DEBUG, null, "TRCE"); - } - - @DisplayName("level trace (below default)") - @Test - void headerLevelTrace() { - client.assertLevel(Level.TRACE, null, "TRACE"); - } - - @DisplayName("level debug (below default)") - @Test - void headerLevelDebug() { - client.assertLevel(Level.DEBUG, null, "DEBUG"); - } - - @DisplayName("level info (is default)") - @Test - void headerLevelInfo() { - client.assertLevel(Level.INFO, null, "INFO"); - } - - @DisplayName("level warn (above default)") - @Test - void headerLevelWarn() { - client.assertLevel(Level.INFO, null, "WARN"); - } -} diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/RequestPrincipalTest.java b/src/test/java/io/kokuwa/micronaut/logging/request/RequestPrincipalTest.java deleted file mode 100644 index 9a60d7c..0000000 --- a/src/test/java/io/kokuwa/micronaut/logging/request/RequestPrincipalTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package io.kokuwa.micronaut.logging.request; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import io.kokuwa.micronaut.logging.AbstractTest; -import jakarta.inject.Inject; - -/** - * Test for {@link PrincipalHttpFilter}. - * - * @author Stephan Schnabel - */ -@DisplayName("request-principal") -public class RequestPrincipalTest extends AbstractTest { - - @Inject - TestClient client; - - @DisplayName("token missing") - @Test - void tokenMissing() { - assertPrincipal(null, null); - } - - @DisplayName("token invalid") - @Test - void tokenInvalid() { - assertPrincipal(null, "meh"); - } - - @DisplayName("token valid") - @Test - void tokenValid() { - assertPrincipal("meh", client.token("meh")); - } - - private void assertPrincipal(String expectedPrincipal, String actualTokenValue) { - assertEquals(expectedPrincipal, client.get(actualTokenValue, null).getPrincipal()); - } -} diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/TestClient.java b/src/test/java/io/kokuwa/micronaut/logging/request/TestClient.java deleted file mode 100644 index edebb40..0000000 --- a/src/test/java/io/kokuwa/micronaut/logging/request/TestClient.java +++ /dev/null @@ -1,63 +0,0 @@ -package io.kokuwa.micronaut.logging.request; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import com.nimbusds.jose.JOSEException; -import com.nimbusds.jwt.JWTClaimsSet; - -import ch.qos.logback.classic.Level; -import io.kokuwa.micronaut.logging.request.TestController.TestResponse; -import io.micronaut.http.HttpRequest; -import io.micronaut.http.HttpStatus; -import io.micronaut.http.client.HttpClient; -import io.micronaut.http.client.annotation.Client; -import io.micronaut.security.token.jwt.signature.SignatureGeneratorConfiguration; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - -/** - * Contoller for testing {@link HeaderLoggingServerHttpFilter} and {@link PrincipalHttpFilter}. - * - * @author Stephan Schnabel - */ -@Singleton -public class TestClient { - - @Inject - @Client("/") - HttpClient client; - @Inject - SignatureGeneratorConfiguration signature; - - String token(String subject) { - try { - return signature.sign(new JWTClaimsSet.Builder().subject(subject).build()).serialize(); - } catch (JOSEException e) { - fail("failed to create token"); - return null; - } - } - - TestResponse get(String token, String header) { - - var request = HttpRequest.GET("/"); - if (token != null) { - request.bearerAuth(token); - } - if (header != null) { - request.getHeaders().add(HeaderLoggingServerHttpFilter.DEFAULT_HEADER, header); - } - - var response = client.toBlocking().exchange(request, TestResponse.class); - assertEquals(HttpStatus.OK, response.getStatus(), "status"); - assertTrue(response.getBody().isPresent(), "body"); - - return response.body(); - } - - void assertLevel(Level expectedLevel, String actualTokenValue, String actualHeaderValue) { - assertEquals(expectedLevel.toString(), get(actualTokenValue, actualHeaderValue).getLevel()); - } -} diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/TestController.java b/src/test/java/io/kokuwa/micronaut/logging/request/TestController.java deleted file mode 100644 index d179f63..0000000 --- a/src/test/java/io/kokuwa/micronaut/logging/request/TestController.java +++ /dev/null @@ -1,54 +0,0 @@ -package io.kokuwa.micronaut.logging.request; - -import org.slf4j.MDC; - -import ch.qos.logback.classic.Level; -import io.micronaut.http.annotation.Controller; -import io.micronaut.http.annotation.Get; -import io.micronaut.security.annotation.Secured; -import io.micronaut.security.rules.SecurityRule; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -/** - * Controller for testing {@link HeaderLoggingServerHttpFilter} and {@link PrincipalHttpFilter}. - * - * @author Stephan Schnabel - */ -@Secured({ SecurityRule.IS_ANONYMOUS, SecurityRule.IS_AUTHENTICATED }) -@Controller -@Slf4j -public class TestController { - - @Get("/") - TestResponse run() { - - var principal = MDC.get(PrincipalHttpFilter.DEFAULT_KEY); - var level = Level.OFF; - if (log.isTraceEnabled()) { - level = Level.TRACE; - } else if (log.isDebugEnabled()) { - level = Level.DEBUG; - } else if (log.isInfoEnabled()) { - level = Level.INFO; - } else if (log.isWarnEnabled()) { - level = Level.WARN; - } else if (log.isErrorEnabled()) { - level = Level.ERROR; - } - - log.info("Test log for MDC inclusion, expected: {}", principal); - - return new TestResponse(level.toString(), principal); - } - - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class TestResponse { - private String level; - private String principal; - } -} diff --git a/src/test/resources/application-test-composite.yaml b/src/test/resources/application-test-composite.yaml deleted file mode 100644 index d15a885..0000000 --- a/src/test/resources/application-test-composite.yaml +++ /dev/null @@ -1,8 +0,0 @@ -logger: - mdc: - principal: - level: DEBUG - loggers: - - io.kokuwa - values: - - horst diff --git a/src/test/resources/application-test.yaml b/src/test/resources/application-test.yaml index 71beb2c..867b23e 100644 --- a/src/test/resources/application-test.yaml +++ b/src/test/resources/application-test.yaml @@ -7,6 +7,3 @@ micronaut: generator: secret: pleaseChangeThisSecretForANewOne jws-algorithm: HS256 - http: - client: - logger-name: io.kokuwa.Test From ceb3877e10e470c645f2d3ba73eba816baf86bdf Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 1 Dec 2021 16:07:17 +0100 Subject: [PATCH 019/195] [maven-release-plugin] prepare release 3.0.0-M2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ed38ada..9149222 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.0-SNAPSHOT + 3.0.0-M2 Logging support for Micronaut Enhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.0.0-M2 github From c44b5fb17ebde2bb9f333fe6e56f9be640f8a094 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 1 Dec 2021 16:07:20 +0100 Subject: [PATCH 020/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9149222..ed38ada 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.0-M2 + 3.0.0-SNAPSHOT Logging support for Micronaut Enhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.0.0-M2 + HEAD github From 0adbe477392a93f2b2602feeb4896ff157f1f4a7 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Mon, 13 Dec 2021 09:02:32 +0100 Subject: [PATCH 021/195] Bump versions. --- .github/workflows/ci.yml | 34 ---------------------------------- .github/workflows/release.yml | 21 --------------------- .github/workflows/snapshot.yml | 17 +++++++++++++---- pom.xml | 8 +++++++- 4 files changed, 20 insertions(+), 60 deletions(-) delete mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index dec1718..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: PullRequest - -"on": [pull_request] - -jobs: - - lint-yaml: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: ibiqlik/action-yamllint@v3 - with: - format: colored - strict: true - - lint-markdown: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: docker://avtodev/markdown-lint:v1 - with: - args: /github/workspace - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 - with: - distribution: temurin - java-version: 11 - cache: maven - - run: mvn -B dependency:go-offline -q - - run: mvn -B verify diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3f13993..9108d8a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,29 +4,8 @@ name: Release workflow_dispatch: {} jobs: - - lint-yaml: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: ibiqlik/action-yamllint@v3 - with: - format: colored - strict: true - - lint-markdown: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: docker://avtodev/markdown-lint:v1 - with: - args: /github/workspace - build: runs-on: ubuntu-latest - needs: - - lint-markdown - - lint-yaml steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index ab9bf69..c980708 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -2,10 +2,7 @@ name: Snapshot "on": workflow_dispatch: {} - push: - branches: - - main - - '*.x' + push: {} jobs: @@ -42,7 +39,19 @@ jobs: server-username: SERVER_USERNAME server-password: SERVER_PASSWORD - run: mvn -B dependency:go-offline -q + - run: mvn -B verify + if: github.ref != 'refs/heads/main' && github.ref != 'refs/heads/3.x' - run: mvn -B deploy -Poss + if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/3.x' env: SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} + - uses: dorny/test-reporter@v1 + if: failure() + with: + name: surefire + path: '*/target/surefire-reports/*.xml' + reporter: java-junit + list-suites: failed + list-tests: failed + fail-on-error: false diff --git a/pom.xml b/pom.xml index ed38ada..8107e02 100644 --- a/pom.xml +++ b/pom.xml @@ -48,8 +48,9 @@ + 1.2.7 0.1.5 - 3.2.0 + 3.2.1 @@ -66,6 +67,11 @@ + + ch.qos.logback + logback-classic + ${version.ch.qos.logback} + ch.qos.logback.contrib logback-json-classic From 0edd98d7a4473d181c2e003c9ee453a120dd15b9 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Mon, 13 Dec 2021 11:02:05 +0100 Subject: [PATCH 022/195] Refactored prefix, added logging of configuration. --- .../logging/http/AbstractMdcFilter.java | 14 +++++--- .../http/level/LogLevelServerFilter.java | 18 +++------- .../http/mdc/AuthenticationMdcFilter.java | 36 ++++++++++--------- .../http/mdc/HttpHeadersMdcFilter.java | 9 ++--- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/AbstractMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/AbstractMdcFilter.java index 777d363..c5d2ffa 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/AbstractMdcFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/AbstractMdcFilter.java @@ -18,10 +18,12 @@ import io.micronaut.http.filter.ServerFilterChain; */ public abstract class AbstractMdcFilter implements HttpServerFilter { - private final int order; + protected final int order; + protected final String prefix; - public AbstractMdcFilter(Integer order) { + protected AbstractMdcFilter(Integer order, String prefix) { this.order = order; + this.prefix = prefix; } @Override @@ -38,10 +40,14 @@ public abstract class AbstractMdcFilter implements HttpServerFilter { return chain.proceed(request); } - mdc.forEach(MDC::put); + mdc.forEach((key, value) -> MDC.put(addPrefix(key), value)); return Publishers.map(chain.proceed(request), response -> { - mdc.keySet().forEach(MDC::remove); + mdc.keySet().forEach(key -> MDC.remove(addPrefix(key))); return response; }); } + + private String addPrefix(String key) { + return prefix == null ? key : prefix + key; + } } diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java index 67357ed..0e5d07a 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java @@ -1,19 +1,18 @@ package io.kokuwa.micronaut.logging.http.level; +import java.util.Map; import java.util.Optional; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import org.reactivestreams.Publisher; -import org.slf4j.MDC; import ch.qos.logback.classic.turbo.TurboFilter; import io.kokuwa.micronaut.logging.LogbackUtil; import io.kokuwa.micronaut.logging.http.AbstractMdcFilter; import io.micronaut.context.annotation.Requires; import io.micronaut.context.annotation.Value; -import io.micronaut.core.async.publisher.Publishers; import io.micronaut.core.util.StringUtils; import io.micronaut.http.HttpRequest; import io.micronaut.http.MutableHttpResponse; @@ -45,7 +44,7 @@ public class LogLevelServerFilter extends AbstractMdcFilter { LogbackUtil logback, @Value("${" + PREFIX + ".header}") Optional header, @Value("${" + PREFIX + ".order}") Optional order) { - super(order.orElse(DEFAULT_ORDER)); + super(order.orElse(DEFAULT_ORDER), null); this.logback = logback; this.header = header.orElse(DEFAULT_HEADER); } @@ -62,15 +61,8 @@ public class LogLevelServerFilter extends AbstractMdcFilter { @Override public Publisher> doFilter(HttpRequest request, ServerFilterChain chain) { - var level = request.getHeaders().getFirst(header); - if (level.isPresent()) { - MDC.put(MDC_KEY, level.get()); - return Publishers.map(chain.proceed(request), response -> { - MDC.remove(MDC_KEY); - return response; - }); - } else { - return chain.proceed(request); - } + return request.getHeaders().getFirst(header) + .map(level -> doFilter(request, chain, Map.of(MDC_KEY, level))) + .orElseGet(() -> chain.proceed(request)); } } diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java index f1c4a14..66d3d3f 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java @@ -1,11 +1,10 @@ package io.kokuwa.micronaut.logging.http.mdc; import java.util.HashMap; -import java.util.List; import java.util.Optional; +import java.util.Set; import org.reactivestreams.Publisher; -import org.slf4j.MDC; import io.kokuwa.micronaut.logging.http.AbstractMdcFilter; import io.micronaut.context.annotation.Requires; @@ -18,6 +17,7 @@ import io.micronaut.http.filter.ServerFilterChain; import io.micronaut.http.filter.ServerFilterPhase; import io.micronaut.runtime.context.scope.Refreshable; import io.micronaut.security.authentication.Authentication; +import lombok.extern.slf4j.Slf4j; /** * Filter to add claims from authentication to MDC. @@ -28,6 +28,7 @@ import io.micronaut.security.authentication.Authentication; @Requires(classes = Authentication.class) @Requires(property = AuthenticationMdcFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) @Filter("${" + AuthenticationMdcFilter.PREFIX + ".path:/**}") +@Slf4j public class AuthenticationMdcFilter extends AbstractMdcFilter { public static final String PREFIX = "logger.http.authentication"; @@ -35,18 +36,19 @@ public class AuthenticationMdcFilter extends AbstractMdcFilter { public static final int DEFAULT_ORDER = ServerFilterPhase.SECURITY.after(); private final String name; - private final List attributes; - private final String prefix; + private final Set attributes; public AuthenticationMdcFilter( - @Value("${" + PREFIX + ".name:principal}") Optional name, - @Value("${" + PREFIX + ".attributes:[]}") List attributes, + @Value("${" + PREFIX + ".name}") Optional name, + @Value("${" + PREFIX + ".attributes}") Optional> attributes, @Value("${" + PREFIX + ".prefix}") Optional prefix, @Value("${" + PREFIX + ".order}") Optional order) { - super(order.orElse(DEFAULT_ORDER)); + super(order.orElse(DEFAULT_ORDER), prefix.orElse(null)); this.name = name.orElse(DEFAULT_NAME); - this.prefix = prefix.orElse(null); - this.attributes = attributes; + this.attributes = attributes.orElseGet(Set::of); + if (name.isPresent() || !this.attributes.isEmpty()) { + log.info("Configured with name {} and attributes {}", name, attributes); + } } @Override @@ -54,21 +56,21 @@ public class AuthenticationMdcFilter extends AbstractMdcFilter { // get authentication - var optional = request.getUserPrincipal(Authentication.class); - if (optional.isEmpty()) { + var authenticationOptional = request.getUserPrincipal(Authentication.class); + if (authenticationOptional.isEmpty()) { return chain.proceed(request); } - var authentication = optional.get(); + var authentication = authenticationOptional.get(); var authenticationAttributes = authentication.getAttributes(); // add mdc var mdc = new HashMap(); - MDC.put(prefix == null ? name : prefix + name, authentication.getName()); - for (var header : attributes) { - var value = authenticationAttributes.get(header); - if (value != null) { - mdc.put(prefix == null ? header : prefix + header, String.valueOf(value)); + mdc.put(name, authentication.getName()); + for (var attibuteName : attributes) { + var attibuteValue = authenticationAttributes.get(attibuteName); + if (attibuteValue != null) { + mdc.put(attibuteName, String.valueOf(attibuteValue)); } } diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilter.java index efca100..a42e91f 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilter.java @@ -18,6 +18,7 @@ import io.micronaut.http.annotation.Filter; import io.micronaut.http.filter.ServerFilterChain; import io.micronaut.http.filter.ServerFilterPhase; import io.micronaut.runtime.context.scope.Refreshable; +import lombok.extern.slf4j.Slf4j; /** * Filter to add http headers to MDC. @@ -28,21 +29,21 @@ import io.micronaut.runtime.context.scope.Refreshable; @Requires(property = HttpHeadersMdcFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) @Requires(property = HttpHeadersMdcFilter.PREFIX + ".names") @Filter("${" + HttpHeadersMdcFilter.PREFIX + ".path:/**}") +@Slf4j public class HttpHeadersMdcFilter extends AbstractMdcFilter { public static final String PREFIX = "logger.http.headers"; public static final int DEFAULT_ORDER = ServerFilterPhase.FIRST.before(); private final Set headers; - private final String prefix; public HttpHeadersMdcFilter( @Value("${" + PREFIX + ".names}") List headers, @Value("${" + PREFIX + ".prefix}") Optional prefix, @Value("${" + PREFIX + ".order}") Optional order) { - super(order.orElse(DEFAULT_ORDER)); - this.prefix = prefix.orElse(null); + super(order.orElse(DEFAULT_ORDER), prefix.orElse(null)); this.headers = headers.stream().map(String::toLowerCase).collect(Collectors.toSet()); + log.info("Configured with header names {}", headers); } @Override @@ -51,7 +52,7 @@ public class HttpHeadersMdcFilter extends AbstractMdcFilter { for (var header : headers) { request.getHeaders() .getFirst(header) - .ifPresent(value -> mdc.put(prefix == null ? header : prefix + header, String.valueOf(value))); + .ifPresent(value -> mdc.put(header, String.valueOf(value))); } return doFilter(request, chain, mdc); } From 7403b04efdc1fd5387acb40e17a80924ba75f766 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Mon, 13 Dec 2021 14:06:59 +0100 Subject: [PATCH 023/195] Rename headers to header. --- README.md | 2 +- docs/features/http_mdc_header.md | 28 +++++++++++++++++++ docs/features/http_mdc_headers.md | 28 ------------------- ...ersMdcFilter.java => HeaderMdcFilter.java} | 12 ++++---- ...lterTest.java => HeaderMdcFilterTest.java} | 16 +++++------ 5 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 docs/features/http_mdc_header.md delete mode 100644 docs/features/http_mdc_headers.md rename src/main/java/io/kokuwa/micronaut/logging/http/mdc/{HttpHeadersMdcFilter.java => HeaderMdcFilter.java} (82%) rename src/test/java/io/kokuwa/micronaut/logging/http/mdc/{HttpHeadersMdcFilterTest.java => HeaderMdcFilterTest.java} (71%) diff --git a/README.md b/README.md index 620914e..290de0d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ * [add default xml](docs/features/logback_default.md) * [preconfigured appender for different environments](docs/features/logback_appender.md) * [set log level based on HTTP request header](docs/features/http_log_level.md) -* [add HTTP headers to MDC](docs/features/http_mdc_headers.md) +* [add HTTP header to MDC](docs/features/http_mdc_header.md) * [add authentication information from HTTP request to MDC](docs/features/http_mdc_authentication.md) ## Development diff --git a/docs/features/http_mdc_header.md b/docs/features/http_mdc_header.md new file mode 100644 index 0000000..db91c1e --- /dev/null +++ b/docs/features/http_mdc_header.md @@ -0,0 +1,28 @@ +# Add HTTP headers to MDC + +## Properties + +Property | Description | Default +-------- | ----------- | ------- +`logger.http.header.enabled` | filter enabled? | `true` +`logger.http.header.path` | filter path | `/**` +`logger.http.header.order` | order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/core/src/main/java/io/micronaut/core/order/Ordered.java) | [ServerFilterPhase.FIRST.before()](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/http/src/main/java/io/micronaut/http/filter/ServerFilterPhase.java#L34) +`logger.http.header.prefix` | prefix to MDC key | `` +`logger.http.header.names` | http header names to add to MDC | `[]` + +## Examples + +Configuration for b3-propagation: + +```yaml +logger: + http: + header: + prefix: header. + names: + - x-request-id + - x-b3-traceId + - x-b3-parentspanid + - x-b3-spanid + - x-b3-sampled +``` diff --git a/docs/features/http_mdc_headers.md b/docs/features/http_mdc_headers.md deleted file mode 100644 index b6c031a..0000000 --- a/docs/features/http_mdc_headers.md +++ /dev/null @@ -1,28 +0,0 @@ -# Add HTTP headers to MDC - -## Properties - -Property | Description | Default --------- | ----------- | ------- -`logger.http.headers.enabled` | filter enabled? | `true` -`logger.http.headers.path` | filter path | `/**` -`logger.http.headers.order` | order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/core/src/main/java/io/micronaut/core/order/Ordered.java) | [ServerFilterPhase.FIRST.before()](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/http/src/main/java/io/micronaut/http/filter/ServerFilterPhase.java#L34) -`logger.http.headers.prefix` | prefix to MDC key | `` -`logger.http.headers.names` | http header names to add to MDC | `[]` - -## Examples - -Configuration for b3-propagation: - -```yaml -logger: - http: - headers: - prefix: header. - names: - - x-request-id - - x-b3-traceId - - x-b3-parentspanid - - x-b3-spanid - - x-b3-sampled -``` diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java similarity index 82% rename from src/main/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilter.java rename to src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java index a42e91f..8ff5d50 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java @@ -26,18 +26,18 @@ import lombok.extern.slf4j.Slf4j; * @author Stephan Schnabel */ @Refreshable -@Requires(property = HttpHeadersMdcFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) -@Requires(property = HttpHeadersMdcFilter.PREFIX + ".names") -@Filter("${" + HttpHeadersMdcFilter.PREFIX + ".path:/**}") +@Requires(property = HeaderMdcFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) +@Requires(property = HeaderMdcFilter.PREFIX + ".names") +@Filter("${" + HeaderMdcFilter.PREFIX + ".path:/**}") @Slf4j -public class HttpHeadersMdcFilter extends AbstractMdcFilter { +public class HeaderMdcFilter extends AbstractMdcFilter { - public static final String PREFIX = "logger.http.headers"; + public static final String PREFIX = "logger.http.header"; public static final int DEFAULT_ORDER = ServerFilterPhase.FIRST.before(); private final Set headers; - public HttpHeadersMdcFilter( + public HeaderMdcFilter( @Value("${" + PREFIX + ".names}") List headers, @Value("${" + PREFIX + ".prefix}") Optional prefix, @Value("${" + PREFIX + ".order}") Optional order) { diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilterTest.java similarity index 71% rename from src/test/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilterTest.java rename to src/test/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilterTest.java index f551bd9..8ef7673 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/http/mdc/HttpHeadersMdcFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilterTest.java @@ -11,12 +11,12 @@ import io.kokuwa.micronaut.logging.http.AbstractFilterTest; import io.micronaut.context.annotation.Property; /** - * Test for {@link HttpHeadersMdcFilter}. + * Test for {@link HeaderMdcFilter}. * * @author Stephan Schnabel */ @DisplayName("http: mdc from headers") -public class HttpHeadersMdcFilterTest extends AbstractFilterTest { +public class HeaderMdcFilterTest extends AbstractFilterTest { @DisplayName("noop: empty configuration") @Test @@ -26,30 +26,30 @@ public class HttpHeadersMdcFilterTest extends AbstractFilterTest { @DisplayName("noop: disabled") @Test - @Property(name = "logger.http.headers.enabled", value = "false") - @Property(name = "logger.http.headers.names", value = "foo") + @Property(name = "logger.http.header.enabled", value = "false") + @Property(name = "logger.http.header.names", value = "foo") void noopDisabled() { assertContext(Map.of(), Map.of("foo", "bar")); } @DisplayName("mdc: mismatch") @Test - @Property(name = "logger.http.headers.names", value = "foo") + @Property(name = "logger.http.header.names", value = "foo") void mdcMismatch() { assertContext(Map.of(), Map.of("nope", "bar")); } @DisplayName("mdc: match without prefix") @Test - @Property(name = "logger.http.headers.names", value = "foo") + @Property(name = "logger.http.header.names", value = "foo") void mdcMatchWithoutPrefix() { assertContext(Map.of("foo", "bar"), Map.of("foo", "bar", "nope", "bar")); } @DisplayName("mdc: match with prefix") @Test - @Property(name = "logger.http.headers.names", value = "foo") - @Property(name = "logger.http.headers.prefix", value = "header.") + @Property(name = "logger.http.header.names", value = "foo") + @Property(name = "logger.http.header.prefix", value = "header.") void mdcMatchWithPrefix() { assertContext(Map.of("header.foo", "bar"), Map.of("foo", "bar", "nope", "bar")); } From ce4b75c941daac3f4abedd6538c3a210bf27e3e3 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Mon, 13 Dec 2021 14:12:39 +0100 Subject: [PATCH 024/195] Add path mdc filter. --- README.md | 1 + docs/features/http_mdc_path.md | 25 +++++ .../logging/http/mdc/PathMdcFilter.java | 88 +++++++++++++++ .../logging/http/AbstractFilterTest.java | 12 +- .../http/level/LogLevelServerFilterTest.java | 2 +- .../http/mdc/AuthenticationMdcFilterTest.java | 2 +- .../logging/http/mdc/HeaderMdcFilterTest.java | 2 +- .../logging/http/mdc/PathMdcFilterTest.java | 104 ++++++++++++++++++ 8 files changed, 228 insertions(+), 8 deletions(-) create mode 100644 docs/features/http_mdc_path.md create mode 100644 src/main/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilter.java create mode 100644 src/test/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilterTest.java diff --git a/README.md b/README.md index 290de0d..11f4f85 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ * [add default xml](docs/features/logback_default.md) * [preconfigured appender for different environments](docs/features/logback_appender.md) * [set log level based on HTTP request header](docs/features/http_log_level.md) +* [add HTTP path parts to MDC](docs/features/http_mdc_path.md) * [add HTTP header to MDC](docs/features/http_mdc_header.md) * [add authentication information from HTTP request to MDC](docs/features/http_mdc_authentication.md) diff --git a/docs/features/http_mdc_path.md b/docs/features/http_mdc_path.md new file mode 100644 index 0000000..b5f9f73 --- /dev/null +++ b/docs/features/http_mdc_path.md @@ -0,0 +1,25 @@ +# Add HTTP path parts to MDC + +## Properties + +Property | Description | Default +-------- | ----------- | ------- +`logger.http.path.enabled` | filter enabled? | `true` +`logger.http.path.path` | filter path | `/**` +`logger.http.path.order` | order for [Ordered](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/core/src/main/java/io/micronaut/core/order/Ordered.java) | [ServerFilterPhase.FIRST.before()](https://github.com/micronaut-projects/micronaut-core/blob/v3.2.0/http/src/main/java/io/micronaut/http/filter/ServerFilterPhase.java#L34) +`logger.http.path.prefix` | prefix to MDC key | `` +`logger.http.path.patterns` | patterns with groups to add to MDC | `[]` + +## Examples + +Configuration for adding ids: + +```yaml +logger: + http: + path: + prefix: path. + patterns: + - \/gateway\/(?[a-f0-9\-]{36}) + - \/gateway\/(?[a-f0-9\-]{36})\/configuration\/(?[a-z]+) +``` diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilter.java new file mode 100644 index 0000000..c8c490a --- /dev/null +++ b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilter.java @@ -0,0 +1,88 @@ +package io.kokuwa.micronaut.logging.http.mdc; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; + +import org.reactivestreams.Publisher; + +import io.kokuwa.micronaut.logging.http.AbstractMdcFilter; +import io.micronaut.context.annotation.Requires; +import io.micronaut.context.annotation.Value; +import io.micronaut.core.util.StringUtils; +import io.micronaut.http.HttpRequest; +import io.micronaut.http.MutableHttpResponse; +import io.micronaut.http.annotation.Filter; +import io.micronaut.http.filter.ServerFilterChain; +import io.micronaut.http.filter.ServerFilterPhase; +import io.micronaut.runtime.context.scope.Refreshable; +import lombok.extern.slf4j.Slf4j; + +/** + * Filter to add request path parts to MDC. + * + * @author Stephan Schnabel + */ +@Refreshable +@Requires(property = PathMdcFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) +@Requires(property = PathMdcFilter.PREFIX + ".patterns") +@Filter("${" + PathMdcFilter.PREFIX + ".path:/**}") +@Slf4j +public class PathMdcFilter extends AbstractMdcFilter { + + public static final String PREFIX = "logger.http.path"; + public static final int DEFAULT_ORDER = ServerFilterPhase.FIRST.before(); + public static final Pattern PATTERN_GROUPS = Pattern.compile("\\(\\?<([a-zA-Z][a-zA-Z0-9]+)>"); + + private final Map> patternsWithGroups; + + public PathMdcFilter( + @Value("${" + PREFIX + ".patterns}") List patterns, + @Value("${" + PREFIX + ".prefix}") Optional prefix, + @Value("${" + PREFIX + ".order}") Optional order) { + super(order.orElse(DEFAULT_ORDER), prefix.orElse(null)); + this.patternsWithGroups = new HashMap<>(); + for (var patternString : patterns) { + try { + var pattern = Pattern.compile(patternString); + var groupMatcher = PATTERN_GROUPS.matcher(pattern.toString()); + var groups = new HashSet(); + while (groupMatcher.find()) { + groups.add(groupMatcher.group(1)); + } + + if (groups.isEmpty()) { + log.warn("Path {} is missing groups.", patternString); + } else { + log.info("Added path {} with groups {}.", patternString, groups); + patternsWithGroups.put(pattern, groups); + } + } catch (PatternSyntaxException e) { + log.warn("Path {} is invalid.", patternString); + } + } + } + + @Override + public Publisher> doFilter(HttpRequest request, ServerFilterChain chain) { + + var mdc = new HashMap(); + var path = request.getPath(); + + for (var patternWithGroup : patternsWithGroups.entrySet()) { + var matcher = patternWithGroup.getKey().matcher(path); + if (matcher.matches()) { + for (var group : patternWithGroup.getValue()) { + mdc.put(group, matcher.group(group)); + } + } + } + + return doFilter(request, chain, mdc); + } +} diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java index 11d6676..46fd6cd 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java @@ -21,6 +21,7 @@ import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpStatus; import io.micronaut.http.annotation.Controller; import io.micronaut.http.annotation.Get; +import io.micronaut.http.annotation.PathVariable; import io.micronaut.http.client.DefaultHttpClientConfiguration; import io.micronaut.http.client.HttpClient; import io.micronaut.http.filter.HttpServerFilter; @@ -79,9 +80,9 @@ public abstract class AbstractFilterTest extends AbstractTest { // request @SneakyThrows - public TestResponse get(Map headers) { + public TestResponse get(String path, Map headers) { - var request = HttpRequest.GET("/"); + var request = HttpRequest.GET(path); headers.forEach((name, value) -> request.header(name, value)); var configuration = new DefaultHttpClientConfiguration(); configuration.setLoggerName("io.kokuwa.TestClient"); @@ -100,8 +101,8 @@ public abstract class AbstractFilterTest extends AbstractTest { @Slf4j public static class TestController { - @Get("/") - TestResponse run() { + @Get("/{+path}") + TestResponse run(@PathVariable String path) { var level = Level.OFF; if (log.isTraceEnabled()) { @@ -119,7 +120,7 @@ public abstract class AbstractFilterTest extends AbstractTest { var mdc = MDC.getCopyOfContextMap(); log.info("Found MDC: {}", mdc); - return new TestResponse(level.toString(), mdc == null ? Map.of() : mdc); + return new TestResponse(path, level.toString(), mdc == null ? Map.of() : mdc); } } @@ -127,6 +128,7 @@ public abstract class AbstractFilterTest extends AbstractTest { @NoArgsConstructor @AllArgsConstructor public static class TestResponse { + private String path; private String level; private Map context = Map.of(); } diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilterTest.java index b25a6af..c4db1ef 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilterTest.java @@ -75,6 +75,6 @@ public class LogLevelServerFilterTest extends AbstractFilterTest { private void assertLevel(Level expectedLevel, String name, String value) { var headers = value == null ? Map.of() : Map.of(name, value); - assertEquals(expectedLevel.toString(), get(headers).getLevel()); + assertEquals(expectedLevel.toString(), get("/level", headers).getLevel()); } } diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilterTest.java index 0492139..d10b673 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilterTest.java @@ -63,7 +63,7 @@ public class AuthenticationMdcFilterTest extends AbstractFilterTest { } private Map getContext(boolean token) { - return get(token + return get("/security", token ? Map.of(HttpHeaders.AUTHORIZATION, token("mySubject", claims -> claims .issuer("nope") .claim("azp", "myAzp") diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilterTest.java index 8ef7673..489870f 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilterTest.java @@ -55,6 +55,6 @@ public class HeaderMdcFilterTest extends AbstractFilterTest { } private void assertContext(Map expectedMdcs, Map headers) { - assertEquals(expectedMdcs, get(headers).getContext()); + assertEquals(expectedMdcs, get("/header", headers).getContext()); } } diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilterTest.java new file mode 100644 index 0000000..3654d4d --- /dev/null +++ b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilterTest.java @@ -0,0 +1,104 @@ +package io.kokuwa.micronaut.logging.http.mdc; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Map; +import java.util.UUID; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.kokuwa.micronaut.logging.http.AbstractFilterTest; +import io.micronaut.context.annotation.Property; + +/** + * Test for {@link PathMdcFilter}. + * + * @author Stephan Schnabel + */ +@DisplayName("http: mdc from path") +public class PathMdcFilterTest extends AbstractFilterTest { + + @DisplayName("noop: empty configuration") + @Test + void noopEmptyConfiguration() { + assertContext(Map.of(), "/foo/bar"); + } + + @DisplayName("noop: disabled") + @Test + @Property(name = "logger.http.path.enabled", value = "false") + @Property(name = "logger.http.path.patterns", value = "\\/foo\\/(?[0-9]+)") + void noopDisabled() { + assertContext(Map.of(), "/foo/123"); + } + + @DisplayName("noop: misconfigured") + @Test + @Property(name = "logger.http.path.patterns", value = "\\A{") + void noopMisconfigured() { + assertContext(Map.of(), "/foo/123"); + } + + @DisplayName("noop: no group") + @Test + @Property(name = "logger.http.path.patterns", value = "\\/foo/[0-9]+") + void noopGroups() { + assertContext(Map.of(), "/foo/123"); + } + + @DisplayName("mdc: mismatch") + @Test + @Property(name = "logger.http.path.patterns", value = "\\/foo\\/(?[0-9]+)") + void mdcMismatch() { + assertContext(Map.of(), "/nope"); + assertContext(Map.of(), "/foo/abc"); + } + + @DisplayName("mdc: match with single group") + @Test + @Property(name = "logger.http.path.patterns", value = "\\/foo\\/(?[0-9]+)") + void mdcMatchWithSingleGroup() { + assertContext(Map.of("foo", "123"), "/foo/123"); + } + + @DisplayName("mdc: match with single group and prefix") + @Test + @Property(name = "logger.http.path.names", value = "foo") + @Property(name = "logger.http.path.patterns", value = "\\/foo\\/(?[0-9]+)") + @Property(name = "logger.http.path.prefix", value = "path.") + void mdcMatchWithSingleGroupAndPrefix() { + assertContext(Map.of("path.foo", "123"), "/foo/123"); + } + + @DisplayName("mdc: match with single group and misconfigured") + @Test + @Property(name = "logger.http.path.names", value = "foo") + @Property(name = "logger.http.path.patterns", value = "\\/foo\\/(?[0-9]+),\\A{") + @Property(name = "logger.http.path.prefix", value = "path.") + void mdcMatchWithSingleGroupAndMisconfigured() { + assertContext(Map.of("path.foo", "123"), "/foo/123"); + } + + @DisplayName("mdc: match with multiple group") + @Test + @Property(name = "logger.http.path.patterns", value = "/foo/(?[0-9]+)/bar/(?[0-9]+)") + void mdcMatchWithmultipleGroup() { + assertContext(Map.of("foo", "123", "bar", "456"), "/foo/123/bar/456"); + } + + @DisplayName("mdc: test for documentation example") + @Test + @Property(name = "logger.http.path.patterns", value = "" + + "\\/gateway\\/(?[a-f0-9\\-]{36})," + + "\\/gateway\\/(?[a-f0-9\\-]{36})\\/configuration\\/(?[a-z]+)") + void mdcMatchExample() { + var uuid = UUID.randomUUID().toString(); + assertContext(Map.of("gatewayId", uuid), "/gateway/" + uuid); + assertContext(Map.of("gatewayId", uuid, "config", "abc"), "/gateway/" + uuid + "/configuration/abc"); + } + + private void assertContext(Map expectedMdcs, String path) { + assertEquals(expectedMdcs, get(path, Map.of()).getContext()); + } +} From 3d6e497c5328ecee67cae20c815f8d63b41ab31e Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 15 Dec 2021 09:02:47 +0100 Subject: [PATCH 025/195] Bump versions. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8107e02..2db9c48 100644 --- a/pom.xml +++ b/pom.xml @@ -48,9 +48,9 @@ - 1.2.7 + 1.2.8 0.1.5 - 3.2.1 + 3.2.3 From 78a7d6461018fc484296fbdfd4c4ac3907f2dd77 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 10:18:41 +0100 Subject: [PATCH 026/195] [maven-release-plugin] prepare release 3.0.0-M3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2db9c48..350f99e 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.0-SNAPSHOT + 3.0.0-M3 Logging support for Micronaut Enhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.0.0-M3 github From 3efda9d452af047d152d3bf41402df98c31aaa24 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 10:18:43 +0100 Subject: [PATCH 027/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 350f99e..2db9c48 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.0-M3 + 3.0.0-SNAPSHOT Logging support for Micronaut Enhanced logging using MDC or request header. @@ -35,7 +35,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.0.0-M3 + HEAD github From 41589b6c8c384f3fca435daa1e0de17c2de7d1fd Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 11:09:08 +0100 Subject: [PATCH 028/195] Remove parent. --- .github/workflows/lint.yaml | 24 ++ .../workflows/{release.yml => release.yaml} | 2 +- .../workflows/{snapshot.yml => snapshot.yaml} | 27 +- .yamllint | 3 + lombok.config | 18 -- pom.xml | 259 ++++++++++++++++-- pom.xml.versionsBackup | 169 ------------ .../micronaut/logging/AbstractTest.java | 3 - 8 files changed, 261 insertions(+), 244 deletions(-) create mode 100644 .github/workflows/lint.yaml rename .github/workflows/{release.yml => release.yaml} (93%) rename .github/workflows/{snapshot.yml => snapshot.yaml} (58%) delete mode 100644 lombok.config delete mode 100644 pom.xml.versionsBackup diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml new file mode 100644 index 0000000..84f2e57 --- /dev/null +++ b/.github/workflows/lint.yaml @@ -0,0 +1,24 @@ +name: Lint + +"on": + workflow_dispatch: {} + push: {} + +jobs: + + yaml: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: ibiqlik/action-yamllint@v3 + with: + format: colored + strict: true + + markdown: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: docker://avtodev/markdown-lint:v1 + with: + args: /github/workspace diff --git a/.github/workflows/release.yml b/.github/workflows/release.yaml similarity index 93% rename from .github/workflows/release.yml rename to .github/workflows/release.yaml index 9108d8a..35cff56 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yaml @@ -25,7 +25,7 @@ jobs: gpg-passphrase: GPG_PASSPHRASE - run: mvn -B dependency:go-offline -q - run: mvn -B release:prepare - - run: mvn -B release:perform -DreleaseProfiles=oss-release + - run: mvn -B release:perform env: SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yaml similarity index 58% rename from .github/workflows/snapshot.yml rename to .github/workflows/snapshot.yaml index c980708..e10a080 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yaml @@ -5,29 +5,8 @@ name: Snapshot push: {} jobs: - - lint-yaml: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: ibiqlik/action-yamllint@v3 - with: - format: colored - strict: true - - lint-markdown: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: docker://avtodev/markdown-lint:v1 - with: - args: /github/workspace - build: runs-on: ubuntu-latest - needs: - - lint-markdown - - lint-yaml steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v2 @@ -40,9 +19,9 @@ jobs: server-password: SERVER_PASSWORD - run: mvn -B dependency:go-offline -q - run: mvn -B verify - if: github.ref != 'refs/heads/main' && github.ref != 'refs/heads/3.x' - - run: mvn -B deploy -Poss - if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/3.x' + if: github.ref != 'refs/heads/main' + - run: mvn -B deploy + if: github.ref == 'refs/heads/main' env: SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} diff --git a/.yamllint b/.yamllint index c9f12ef..9d1b12e 100644 --- a/.yamllint +++ b/.yamllint @@ -5,3 +5,6 @@ rules: # no need for document start document-start: disable + + # line length is not important + line-length: disable diff --git a/lombok.config b/lombok.config deleted file mode 100644 index 4fc0545..0000000 --- a/lombok.config +++ /dev/null @@ -1,18 +0,0 @@ -config.stopBubbling = true - -lombok.addNullAnnotations = CUSTOM:io.micronaut.core.annotation.NonNull:io.micronaut.core.annotation.Nullable -lombok.addJavaxGeneratedAnnotation = true -lombok.addLombokGeneratedAnnotation = true - -# adjust model -lombok.equalsAndHashCode.callSuper = call -lombok.toString.callSuper = call -lombok.accessors.chain = true - -# use slf4j -lombok.log.apacheCommons.flagUsage = error -lombok.log.javaUtilLogging.flagUsage = error -lombok.log.jbosslog.flagUsage = error -lombok.log.log4j.flagUsage = error -lombok.log.log4j2.flagUsage = error -lombok.log.xslf4j.flagUsage = error diff --git a/pom.xml b/pom.xml index 2db9c48..d641a9f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,21 +2,18 @@ 4.0.0 - - io.kokuwa - maven-parent - 0.5.5 - - - io.kokuwa.micronaut micronaut-logging 3.0.0-SNAPSHOT - Logging support for Micronaut + Logging Support for Micronaut Enhanced logging using MDC or request header. https://github.com/kokuwaio/micronaut-logging 2020 + + Kokuwa.io + http://kokuwa.io + Apache License 2.0 @@ -26,8 +23,12 @@ + stephanschnabel Stephan Schnabel https://github.com/stephanschnabel + stephan@grayc.de + GrayC GmbH + http://grayc.de @@ -41,16 +42,62 @@ github https://github.com/kokuwaio/micronaut-logging/issues + + github + https://github.com/kokuwaio/micronaut-logging/actions + + + + sonatype-nexus + https://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + - + + UTF-8 + ISO-8859-1 + UTF-8 + + 11 + 11 + true + true + + + + + + + 1.2.8 0.1.5 3.2.3 + 1.18.22 + + + + 3.1.0 + 3.8.1 + 3.0.0-M1 + 3.0.1 + 3.0.0-M1 + 3.3.1 + 3.2.0 + 3.0.0-M4 + 3.2.0 + 3.2.1 + 3.0.0-M5 + 1.1.0 + 1.6.8 @@ -124,14 +171,14 @@ test - + - com.google.code.findbugs - jsr305 + org.projectlombok + lombok provided - + ch.qos.logback logback-classic @@ -148,28 +195,182 @@ + + + + org.apache.maven.plugins + maven-clean-plugin + ${version.org.apache.maven.plugins.clean} + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.org.apache.maven.plugins.compiler} + + + + org.projectlombok + lombok + ${version.org.projectlombok} + + + io.micronaut + micronaut-inject-java + ${version.io.micronaut} + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${version.org.apache.maven.plugins.deploy} + + + org.apache.maven.plugins + maven-gpg-plugin + ${version.org.apache.maven.plugins.gpg} + + + org.apache.maven.plugins + maven-install-plugin + ${version.org.apache.maven.plugins.install} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.org.apache.maven.plugins.javadoc} + + + org.apache.maven.plugins + maven-jar-plugin + ${version.org.apache.maven.plugins.jar} + + + org.apache.maven.plugins + maven-release-plugin + ${version.org.apache.maven.plugins.release} + + @{project.version} + release + true + + + + org.apache.maven.plugins + maven-resources-plugin + ${version.org.apache.maven.plugins.resources} + + + org.apache.maven.plugins + maven-source-plugin + ${version.org.apache.maven.plugins.source} + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.org.apache.maven.plugins.surefire} + + true + true + + + + org.codehaus.mojo + tidy-maven-plugin + ${version.org.codehaus.mojo.tidy} + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${version.org.sonatype.plugins.nexus-staging} + + + - + org.apache.maven.plugins - maven-compiler-plugin - - - - org.projectlombok - lombok - ${version.org.projectlombok} - - - io.micronaut - micronaut-inject-java - ${version.io.micronaut} - - - + maven-source-plugin + + + + jar-no-fork + + + + + + + + org.codehaus.mojo + tidy-maven-plugin + + + + check + + + + + + + release + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + jar + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + sign + + + + + --pinentry-mode + loopback + + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + sonatype-nexus + https://oss.sonatype.org/ + true + + + + + + + diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup deleted file mode 100644 index 5a30895..0000000 --- a/pom.xml.versionsBackup +++ /dev/null @@ -1,169 +0,0 @@ - - - 4.0.0 - - - io.kokuwa - maven-parent - 0.5.4 - - - - io.kokuwa.micronaut - micronaut-logging - 3.0.0-SNAPSHOT - - Logging support for Micronaut - Enhanced logging using MDC or request header. - https://github.com/kokuwaio/micronaut-logging - 2020 - - - Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - - - - - Stephan Schnabel - https://github.com/stephanschnabel - - - - - https://github.com/kokuwaio/micronaut-logging - scm:git:https://github.com/kokuwaio/micronaut-logging.git - scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD - - - github - https://github.com/kokuwaio/micronaut-logging/issues - - - - - - - - - 0.1.5 - 3.2.0 - - - - - - - - - io.micronaut - micronaut-bom - ${version.io.micronaut} - pom - import - - - - - ch.qos.logback.contrib - logback-json-classic - ${version.ch.qos.logback.contrib} - - - ch.qos.logback.contrib - logback-json-core - ${version.ch.qos.logback.contrib} - - - ch.qos.logback.contrib - logback-jackson - ${version.ch.qos.logback.contrib} - - - - - - - - - io.micronaut - micronaut-runtime - provided - - - io.micronaut.security - micronaut-security - provided - - - io.micronaut.test - micronaut-test-junit5 - test - - - io.micronaut - micronaut-http-client - test - - - io.micronaut - micronaut-http-server-netty - test - - - io.micronaut.security - micronaut-security-jwt - test - - - - - com.google.code.findbugs - jsr305 - provided - - - - - ch.qos.logback - logback-classic - - - ch.qos.logback.contrib - logback-jackson - - - ch.qos.logback.contrib - logback-json-classic - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.projectlombok - lombok - ${version.org.projectlombok} - - - io.micronaut - micronaut-inject-java - ${version.io.micronaut} - - - - - - - - diff --git a/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java b/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java index 366ba0c..ebcc5e7 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java @@ -2,9 +2,7 @@ package io.kokuwa.micronaut.logging; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.ClassOrderer; import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.TestClassOrder; import org.junit.jupiter.api.TestMethodOrder; import org.slf4j.MDC; @@ -16,7 +14,6 @@ import io.micronaut.test.extensions.junit5.annotation.MicronautTest; * @author Stephan Schnabel */ @MicronautTest -@TestClassOrder(ClassOrderer.DisplayName.class) @TestMethodOrder(MethodOrderer.DisplayName.class) public abstract class AbstractTest { From 4e92f4c405c11c40b7b7d859c40536a75f617905 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 11:36:49 +0100 Subject: [PATCH 029/195] [maven-release-plugin] prepare release 3.0.0-M4 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d641a9f..bba27f4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.0-SNAPSHOT + 3.0.0-M4 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.0.0-M4 github From 370e6e84a6e3665354eccd4826364f03d861f560 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 11:36:52 +0100 Subject: [PATCH 030/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index bba27f4..d641a9f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.0-M4 + 3.0.0-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.0.0-M4 + HEAD github From 4f7077f6b7f26cc3904d9c0450505cee77f9171b Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 11:39:29 +0100 Subject: [PATCH 031/195] Add badge --- .github/workflows/snapshot.yaml | 2 +- README.md | 3 +++ docs/build.md | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snapshot.yaml b/.github/workflows/snapshot.yaml index e10a080..4d9931a 100644 --- a/.github/workflows/snapshot.yaml +++ b/.github/workflows/snapshot.yaml @@ -1,4 +1,4 @@ -name: Snapshot +name: Build "on": workflow_dispatch: {} diff --git a/README.md b/README.md index 11f4f85..c31b7ba 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Micronaut Logging support +[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22io.kokuwa.micronaut%22%20AND%20a:%22micronaut-logging%22) [![Lint](https://github.com/kokuwaio/micronaut-logging/actions/workflows/lint.yaml/badge.svg)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/lint.yaml) [![Snapshot](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml/badge.svg)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml) + ## Features * [set log level based on MDC values](docs/features/logback_mdc_level.md) @@ -19,3 +21,4 @@ * configure mdc on refresh event * read **serviceName** and **serviceVersion** from yaml * support auto select appender with custom `logback.xml` +* add maven site with jacoco / dependency updates for snapshot build diff --git a/docs/build.md b/docs/build.md index 4d5c72e..0d2c727 100644 --- a/docs/build.md +++ b/docs/build.md @@ -19,5 +19,5 @@ mvn versions:update-parent versions:update-properties Run: ```sh -mvn release:prepare release:perform release:clean -B -DreleaseProfiles=oss-release +mvn release:prepare release:perform release:clean -B ``` From 6efc2bcb4906484f3d51421716b44b0108e44d41 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 12:05:55 +0100 Subject: [PATCH 032/195] Remove lombok. --- pom.xml | 13 ----- .../logging/http/AbstractMdcFilter.java | 3 + .../http/mdc/AuthenticationMdcFilter.java | 2 - .../logging/http/mdc/HeaderMdcFilter.java | 2 - .../logging/http/mdc/PathMdcFilter.java | 2 - .../logging/layout/GcpJsonLayout.java | 5 -- .../logging/mdc/MDCTurboFilterConfigurer.java | 6 +- .../logging/http/AbstractFilterTest.java | 57 +++++++++++++------ 8 files changed, 48 insertions(+), 42 deletions(-) diff --git a/pom.xml b/pom.xml index d641a9f..3859186 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,6 @@ 1.2.8 0.1.5 3.2.3 - 1.18.22 @@ -171,13 +170,6 @@ test - - - org.projectlombok - lombok - provided - - ch.qos.logback @@ -208,11 +200,6 @@ ${version.org.apache.maven.plugins.compiler} - - org.projectlombok - lombok - ${version.org.projectlombok} - io.micronaut micronaut-inject-java diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/AbstractMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/AbstractMdcFilter.java index c5d2ffa..b4634be 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/AbstractMdcFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/AbstractMdcFilter.java @@ -3,6 +3,8 @@ package io.kokuwa.micronaut.logging.http; import java.util.Map; import org.reactivestreams.Publisher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.slf4j.MDC; import io.micronaut.core.async.publisher.Publishers; @@ -18,6 +20,7 @@ import io.micronaut.http.filter.ServerFilterChain; */ public abstract class AbstractMdcFilter implements HttpServerFilter { + protected final Logger log = LoggerFactory.getLogger(getClass()); protected final int order; protected final String prefix; diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java index 66d3d3f..aea7557 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java @@ -17,7 +17,6 @@ import io.micronaut.http.filter.ServerFilterChain; import io.micronaut.http.filter.ServerFilterPhase; import io.micronaut.runtime.context.scope.Refreshable; import io.micronaut.security.authentication.Authentication; -import lombok.extern.slf4j.Slf4j; /** * Filter to add claims from authentication to MDC. @@ -28,7 +27,6 @@ import lombok.extern.slf4j.Slf4j; @Requires(classes = Authentication.class) @Requires(property = AuthenticationMdcFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) @Filter("${" + AuthenticationMdcFilter.PREFIX + ".path:/**}") -@Slf4j public class AuthenticationMdcFilter extends AbstractMdcFilter { public static final String PREFIX = "logger.http.authentication"; diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java index 8ff5d50..a59b425 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java @@ -18,7 +18,6 @@ import io.micronaut.http.annotation.Filter; import io.micronaut.http.filter.ServerFilterChain; import io.micronaut.http.filter.ServerFilterPhase; import io.micronaut.runtime.context.scope.Refreshable; -import lombok.extern.slf4j.Slf4j; /** * Filter to add http headers to MDC. @@ -29,7 +28,6 @@ import lombok.extern.slf4j.Slf4j; @Requires(property = HeaderMdcFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) @Requires(property = HeaderMdcFilter.PREFIX + ".names") @Filter("${" + HeaderMdcFilter.PREFIX + ".path:/**}") -@Slf4j public class HeaderMdcFilter extends AbstractMdcFilter { public static final String PREFIX = "logger.http.header"; diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilter.java index c8c490a..848e34d 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilter.java @@ -21,7 +21,6 @@ import io.micronaut.http.annotation.Filter; import io.micronaut.http.filter.ServerFilterChain; import io.micronaut.http.filter.ServerFilterPhase; import io.micronaut.runtime.context.scope.Refreshable; -import lombok.extern.slf4j.Slf4j; /** * Filter to add request path parts to MDC. @@ -32,7 +31,6 @@ import lombok.extern.slf4j.Slf4j; @Requires(property = PathMdcFilter.PREFIX + ".enabled", notEquals = StringUtils.FALSE) @Requires(property = PathMdcFilter.PREFIX + ".patterns") @Filter("${" + PathMdcFilter.PREFIX + ".path:/**}") -@Slf4j public class PathMdcFilter extends AbstractMdcFilter { public static final String PREFIX = "logger.http.path"; diff --git a/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java index 0cd52d8..d2bf04a 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java +++ b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java @@ -8,8 +8,6 @@ import java.util.Map; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.contrib.json.classic.JsonLayout; import io.micronaut.core.util.StringUtils; -import lombok.Setter; -import lombok.experimental.Accessors; /** * GCP logging layout. @@ -18,7 +16,6 @@ import lombok.experimental.Accessors; * @see "https://cloud.google.com/logging/docs/agent/configuration#process-payload" * @see "https://cloud.google.com/error-reporting/reference/rest/v1beta1/ServiceContext" */ -@Accessors(chain = false) public class GcpJsonLayout extends JsonLayout { private static final String UNDEFINED = "_IS_UNDEFINED"; @@ -26,9 +23,7 @@ public class GcpJsonLayout extends JsonLayout { private static final String SEVERITY_ATTR_NAME = "severity"; private Map serviceContext; - @Setter private String serviceName; - @Setter private String serviceVersion; @Override diff --git a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java index e83217c..e3abfb4 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java +++ b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java @@ -2,6 +2,9 @@ package io.kokuwa.micronaut.logging.mdc; import java.util.Set; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import ch.qos.logback.classic.Level; import io.kokuwa.micronaut.logging.LogbackUtil; import io.micronaut.context.annotation.BootstrapContextCompatible; @@ -11,7 +14,6 @@ import io.micronaut.context.env.Environment; import io.micronaut.core.annotation.Internal; import io.micronaut.core.type.Argument; import io.micronaut.core.util.StringUtils; -import lombok.extern.slf4j.Slf4j; /** * Configure MDC filter. @@ -24,11 +26,11 @@ import lombok.extern.slf4j.Slf4j; @BootstrapContextCompatible @Context @Internal -@Slf4j public class MDCTurboFilterConfigurer { public static final String PREFIX = "logger.mdc"; + private static final Logger log = LoggerFactory.getLogger(MDCTurboFilterConfigurer.class); private final LogbackUtil logback; private final Environment environment; diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java index 46fd6cd..56b68d0 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java @@ -2,6 +2,7 @@ package io.kokuwa.micronaut.logging.http; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.util.Map; import java.util.function.Consumer; @@ -9,8 +10,13 @@ import java.util.function.Consumer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.slf4j.MDC; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.nimbusds.jose.JOSEException; import com.nimbusds.jwt.JWTClaimsSet; import ch.qos.logback.classic.Level; @@ -31,11 +37,6 @@ import io.micronaut.security.rules.SecurityRule; import io.micronaut.security.token.jwt.signature.SignatureGeneratorConfiguration; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; /** * Test for {@link HttpServerFilter}. @@ -70,16 +71,19 @@ public abstract class AbstractFilterTest extends AbstractTest { return token(subject, claims -> {}); } - @SneakyThrows public String token(String subject, Consumer manipulator) { var claims = new JWTClaimsSet.Builder().subject(subject); manipulator.accept(claims); - return HttpHeaderValues.AUTHORIZATION_PREFIX_BEARER + " " + signature.sign(claims.build()).serialize(); + try { + return HttpHeaderValues.AUTHORIZATION_PREFIX_BEARER + " " + signature.sign(claims.build()).serialize(); + } catch (JOSEException e) { + fail(e); + return null; + } } // request - @SneakyThrows public TestResponse get(String path, Map headers) { var request = HttpRequest.GET(path); @@ -98,9 +102,10 @@ public abstract class AbstractFilterTest extends AbstractTest { @Secured({ SecurityRule.IS_ANONYMOUS, SecurityRule.IS_AUTHENTICATED }) @Controller - @Slf4j public static class TestController { + private static final Logger log = LoggerFactory.getLogger(TestController.class); + @Get("/{+path}") TestResponse run(@PathVariable String path) { @@ -120,16 +125,36 @@ public abstract class AbstractFilterTest extends AbstractTest { var mdc = MDC.getCopyOfContextMap(); log.info("Found MDC: {}", mdc); - return new TestResponse(path, level.toString(), mdc == null ? Map.of() : mdc); + return new TestResponse(path, level.toString(), mdc); } } - @Data - @NoArgsConstructor - @AllArgsConstructor public static class TestResponse { - private String path; - private String level; - private Map context = Map.of(); + + private final String path; + private final String level; + private final Map context; + + @JsonCreator + public TestResponse( + @JsonProperty("path") String path, + @JsonProperty("level") String level, + @JsonProperty("context") Map context) { + this.path = path; + this.level = level; + this.context = context == null ? Map.of() : context; + } + + public String getPath() { + return path; + } + + public String getLevel() { + return level; + } + + public Map getContext() { + return context; + } } } From be7126a3e39298da53355a96322333c9332f3ff1 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 12:08:37 +0100 Subject: [PATCH 033/195] Change scope of logback-jackson to runtime. --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3859186..564d75a 100644 --- a/pom.xml +++ b/pom.xml @@ -177,11 +177,12 @@ ch.qos.logback.contrib - logback-jackson + logback-json-classic ch.qos.logback.contrib - logback-json-classic + logback-jackson + runtime From 60b019b5f4497a7bc98f78968034ba3da3504a01 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 29 Dec 2021 11:10:58 +0000 Subject: [PATCH 034/195] [maven-release-plugin] prepare release 3.0.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 564d75a..ea0590f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.0-SNAPSHOT + 3.0.0 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.0.0 github From 18ba6fb504298bee29606f7848caf0c0d7434ed6 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 29 Dec 2021 11:10:59 +0000 Subject: [PATCH 035/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ea0590f..787a5e6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.0 + 3.0.1-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.0.0 + HEAD github From 994227ad23502892af4d07de8e58036565ea1dbf Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 12:21:07 +0100 Subject: [PATCH 036/195] Bump logback version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 787a5e6..074e504 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ - 1.2.8 + 1.2.10 0.1.5 3.2.3 From 8f25c6274b63b180db37c95f23fbe528fa3b315e Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 12:23:11 +0100 Subject: [PATCH 037/195] Update actions. --- .github/workflows/lint.yaml | 24 ------------------------ .github/workflows/snapshot.yaml | 18 ++++++++++++++++++ README.md | 2 +- 3 files changed, 19 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/lint.yaml diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml deleted file mode 100644 index 84f2e57..0000000 --- a/.github/workflows/lint.yaml +++ /dev/null @@ -1,24 +0,0 @@ -name: Lint - -"on": - workflow_dispatch: {} - push: {} - -jobs: - - yaml: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: ibiqlik/action-yamllint@v3 - with: - format: colored - strict: true - - markdown: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: docker://avtodev/markdown-lint:v1 - with: - args: /github/workspace diff --git a/.github/workflows/snapshot.yaml b/.github/workflows/snapshot.yaml index 4d9931a..4414d1c 100644 --- a/.github/workflows/snapshot.yaml +++ b/.github/workflows/snapshot.yaml @@ -5,6 +5,24 @@ name: Build push: {} jobs: + + lint-yaml: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: ibiqlik/action-yamllint@v3 + with: + format: colored + strict: true + + lint-markdown: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: docker://avtodev/markdown-lint:v1 + with: + args: /github/workspace + build: runs-on: ubuntu-latest steps: diff --git a/README.md b/README.md index c31b7ba..28fab9b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Micronaut Logging support -[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22io.kokuwa.micronaut%22%20AND%20a:%22micronaut-logging%22) [![Lint](https://github.com/kokuwaio/micronaut-logging/actions/workflows/lint.yaml/badge.svg)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/lint.yaml) [![Snapshot](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml/badge.svg)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml) +[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22io.kokuwa.micronaut%22%20AND%20a:%22micronaut-logging%22) [![CI](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml/badge.svg)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml) ## Features From c39518d08a6ff1d1b4fd84d445c59aa8608b8dbc Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 29 Dec 2021 11:27:57 +0000 Subject: [PATCH 038/195] [maven-release-plugin] prepare release 3.0.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 074e504..4cdeb5e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.1-SNAPSHOT + 3.0.1 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.0.1 github From 536714fe75a183bc6d6b1721fbaf7761c799a087 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 29 Dec 2021 11:27:59 +0000 Subject: [PATCH 039/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4cdeb5e..d72ef55 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.1 + 3.0.2-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.0.1 + HEAD github From 793ad1dbb8b1e5f659e7baf8db97b32dbbde6792 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 13:35:35 +0100 Subject: [PATCH 040/195] Add maven.compiler.showWarnings=true. --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index d72ef55..f649905 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,7 @@ 11 true true + true From 141f7275ef16affe312f12e5487e1a5aefa8eab8 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 14:05:11 +0100 Subject: [PATCH 041/195] Add missing setter for gcp logger. --- .../kokuwa/micronaut/logging/layout/GcpJsonLayout.java | 8 ++++++++ .../kokuwa/micronaut/logging/mdc/MDCTurboFilter.java | 10 ++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java index d2bf04a..139607c 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java +++ b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java @@ -56,4 +56,12 @@ public class GcpJsonLayout extends JsonLayout { map.put("serviceContext", serviceContext); } } + + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + + public void setServiceVersion(String serviceVersion) { + this.serviceVersion = serviceVersion; + } } diff --git a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilter.java b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilter.java index c6f01b1..db4d805 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilter.java @@ -50,7 +50,13 @@ public class MDCTurboFilter extends TurboFilter { } @Override - public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { + public FilterReply decide( + Marker marker, + Logger logger, + Level eventLevel, + String format, + Object[] params, + Throwable t) { if (logger == null || !isStarted()) { return FilterReply.NEUTRAL; @@ -67,6 +73,6 @@ public class MDCTurboFilter extends TurboFilter { return FilterReply.NEUTRAL; } - return level.isGreaterOrEqual(this.level) ? FilterReply.ACCEPT : FilterReply.NEUTRAL; + return eventLevel.isGreaterOrEqual(this.level) ? FilterReply.ACCEPT : FilterReply.NEUTRAL; } } From ef0db973522b79078194ce7fad351985e73d9c8b Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 14:06:55 +0100 Subject: [PATCH 042/195] [maven-release-plugin] prepare release 3.0.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f649905..9459387 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.2-SNAPSHOT + 3.0.2 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.0.2 github From d8509f5c1f36592388841e9676fa37020ef9bc94 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 14:06:58 +0100 Subject: [PATCH 043/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9459387..c035c39 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.2 + 3.0.3-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.0.2 + HEAD github From 574be078efe04d972f91e7a30c647eb95ca1531e Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Tue, 4 Jan 2022 19:38:39 +0100 Subject: [PATCH 044/195] Improve logging. --- docs/features/http_mdc_header.md | 4 ++-- .../micronaut/logging/http/mdc/AuthenticationMdcFilter.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/features/http_mdc_header.md b/docs/features/http_mdc_header.md index db91c1e..8a8e9d4 100644 --- a/docs/features/http_mdc_header.md +++ b/docs/features/http_mdc_header.md @@ -21,8 +21,8 @@ logger: prefix: header. names: - x-request-id - - x-b3-traceId + - x-b3-traceId - x-b3-parentspanid - x-b3-spanid - - x-b3-sampled + - x-b3-sampled ``` diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java index aea7557..adc2946 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/AuthenticationMdcFilter.java @@ -45,7 +45,7 @@ public class AuthenticationMdcFilter extends AbstractMdcFilter { this.name = name.orElse(DEFAULT_NAME); this.attributes = attributes.orElseGet(Set::of); if (name.isPresent() || !this.attributes.isEmpty()) { - log.info("Configured with name {} and attributes {}", name, attributes); + log.info("Configured with name {} and attributes {}", this.name, this.attributes); } } From 8e21685df8981304668bccc104563b29fd7505de Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Mon, 17 Jan 2022 15:47:53 +0100 Subject: [PATCH 045/195] Bump versions. --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c035c39..077a37e 100644 --- a/pom.xml +++ b/pom.xml @@ -81,18 +81,18 @@ 1.2.10 0.1.5 - 3.2.3 + 3.2.6 3.1.0 3.8.1 - 3.0.0-M1 + 3.0.0-M2 3.0.1 3.0.0-M1 3.3.1 - 3.2.0 - 3.0.0-M4 + 3.2.1 + 3.0.0-M5 3.2.0 3.2.1 3.0.0-M5 From 959bb02d0e2da34f5cbe8b7fe8a2180469f996a4 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Mon, 17 Jan 2022 17:36:33 +0100 Subject: [PATCH 046/195] Review deployment. --- .github/workflows/release.yaml | 10 ++++++---- .github/workflows/snapshot.yaml | 3 +-- README.md | 3 ++- pom.xml | 10 ++-------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 35cff56..8f52669 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,10 +10,12 @@ jobs: - uses: actions/checkout@v2 with: token: ${{ secrets.GIT_ACTION_TOKEN }} - - name: git-configure - run: | - git config user.email "actions@github.com" - git config user.name "GitHub Actions" + - uses: crazy-max/ghaction-import-gpg@v4 + with: + gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} + passphrase: ${{ secrets.GPG_PASSPHRASE }} + git_user_signingkey: true + git_commit_gpgsign: true - uses: actions/setup-java@v2 with: distribution: temurin diff --git a/.github/workflows/snapshot.yaml b/.github/workflows/snapshot.yaml index 4414d1c..a8d4226 100644 --- a/.github/workflows/snapshot.yaml +++ b/.github/workflows/snapshot.yaml @@ -1,4 +1,4 @@ -name: Build +name: Snapshot "on": workflow_dispatch: {} @@ -51,4 +51,3 @@ jobs: reporter: java-junit list-suites: failed list-tests: failed - fail-on-error: false diff --git a/README.md b/README.md index 28fab9b..c2bae4d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Micronaut Logging support -[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22io.kokuwa.micronaut%22%20AND%20a:%22micronaut-logging%22) [![CI](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml/badge.svg)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml) +[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22io.kokuwa.micronaut%22%20AND%20a:%22micronaut-logging%22) +[![CI](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml/badge.svg)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml) ## Features diff --git a/pom.xml b/pom.xml index 077a37e..7909e18 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.3-SNAPSHOT + 3.0.4-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -243,6 +243,7 @@ @{project.version} release true + true @@ -335,13 +336,6 @@ sign - - - - --pinentry-mode - loopback - - From 6fca0b3c0bf82452fc90f4e73ea9f03442585f26 Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Mon, 17 Jan 2022 16:41:24 +0000 Subject: [PATCH 047/195] [maven-release-plugin] prepare release 3.0.4 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7909e18..4be573d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.4-SNAPSHOT + 3.0.4 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.0.4 github From f92d80d1a94c253f69317ea82dd7f995fb51c856 Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Mon, 17 Jan 2022 16:41:28 +0000 Subject: [PATCH 048/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4be573d..f1e0419 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.4 + 3.0.5-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.0.4 + HEAD github From 0f6596becccceaf8ca674afbeabffc9045787d16 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Tue, 25 Jan 2022 11:30:00 +0100 Subject: [PATCH 049/195] Improve repository. - add kokuwa checkstyle - add dependabot - add dependency documentation - add code owners - add codeql - add license badge --- .github/CODEOWNERS | 2 + .github/dependabot.yml | 15 ++++++ .github/workflows/codeql.yaml | 22 +++++++++ .github/workflows/dependabot.yaml | 17 +++++++ .github/workflows/lint.yaml | 26 +++++++++++ .github/workflows/pullrequest.yaml | 26 +++++++++++ .github/workflows/release.yaml | 10 ++-- .github/workflows/snapshot.yaml | 36 ++++----------- README.md | 15 +++++- pom.xml | 74 ++++++++++++++++++++++++------ 10 files changed, 196 insertions(+), 47 deletions(-) create mode 100644 .github/CODEOWNERS create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/codeql.yaml create mode 100644 .github/workflows/dependabot.yaml create mode 100644 .github/workflows/lint.yaml create mode 100644 .github/workflows/pullrequest.yaml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..04a08ef --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,2 @@ +# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax +* @kokuwaio-bot @sschnabe @rpahli @fabian-schlegel diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..6d39e7e --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,15 @@ +version: 2 +updates: + - package-ecosystem: maven + directory: / + schedule: + interval: daily + open-pull-requests-limit: 1 + rebase-strategy: auto + ignore: + - dependency-name: ch.qos.logback:logback-classic + update-types: ["version-update:semver-major", "version-update:semver-minor"] + - package-ecosystem: github-actions + directory: / + schedule: + interval: daily diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml new file mode 100644 index 0000000..d52e416 --- /dev/null +++ b/.github/workflows/codeql.yaml @@ -0,0 +1,22 @@ +name: CodeQL + +"on": + workflow_dispatch: {} + pull_request: {} + schedule: + - cron: '0 0 * * *' + +jobs: + codeql: + runs-on: ubuntu-latest + permissions: + security-events: write + actions: read + contents: read + steps: + - uses: actions/checkout@v3 + - uses: github/codeql-action/init@v1 + with: + languages: java + - uses: github/codeql-action/autobuild@v1 + - uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/dependabot.yaml b/.github/workflows/dependabot.yaml new file mode 100644 index 0000000..bcbe4a7 --- /dev/null +++ b/.github/workflows/dependabot.yaml @@ -0,0 +1,17 @@ +name: Dependabot + +"on": pull_request_target + +jobs: + auto-merge: + runs-on: ubuntu-latest + if: ${{ github.actor == 'dependabot[bot]' }} + steps: + - run: gh pr review --approve "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{ secrets.GIT_ACTION_TOKEN }} + - run: gh pr merge --auto --squash "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{ secrets.GIT_ACTION_TOKEN }} diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml new file mode 100644 index 0000000..fa10df9 --- /dev/null +++ b/.github/workflows/lint.yaml @@ -0,0 +1,26 @@ +name: Lint + +"on": + workflow_dispatch: {} + push: + branches: [main] + pull_request: {} + +jobs: + + yaml: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: ibiqlik/action-yamllint@v3 + with: + format: colored + strict: true + + markdown: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: avto-dev/markdown-lint@v1 + with: + args: /github/workspace diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml new file mode 100644 index 0000000..f5e7588 --- /dev/null +++ b/.github/workflows/pullrequest.yaml @@ -0,0 +1,26 @@ +name: PullRequest + +"on": pull_request + +jobs: + + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + cache: maven + - run: mvn -B dependency:go-offline + - run: mvn -B verify + - uses: dorny/test-reporter@v1.5.0 + if: failure() + with: + name: surefire + path: '**/target/surefire-reports/*.xml,**/target/invoker-reports/*.xml' + reporter: java-junit + list-suites: failed + list-tests: failed + fail-on-error: false diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8f52669..f54f728 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,13 +1,12 @@ name: Release -"on": - workflow_dispatch: {} +"on": workflow_dispatch jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: token: ${{ secrets.GIT_ACTION_TOKEN }} - uses: crazy-max/ghaction-import-gpg@v4 @@ -16,16 +15,17 @@ jobs: passphrase: ${{ secrets.GPG_PASSPHRASE }} git_user_signingkey: true git_commit_gpgsign: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: temurin java-version: 11 + cache: maven server-id: sonatype-nexus server-username: SERVER_USERNAME server-password: SERVER_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE - - run: mvn -B dependency:go-offline -q + - run: mvn -B dependency:go-offline - run: mvn -B release:prepare - run: mvn -B release:perform env: diff --git a/.github/workflows/snapshot.yaml b/.github/workflows/snapshot.yaml index a8d4226..2bee99b 100644 --- a/.github/workflows/snapshot.yaml +++ b/.github/workflows/snapshot.yaml @@ -2,32 +2,16 @@ name: Snapshot "on": workflow_dispatch: {} - push: {} + push: + branches: [main] + paths-ignore: ['**.md'] jobs: - - lint-yaml: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: ibiqlik/action-yamllint@v3 - with: - format: colored - strict: true - - lint-markdown: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: docker://avtodev/markdown-lint:v1 - with: - args: /github/workspace - build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: temurin java-version: 11 @@ -35,19 +19,17 @@ jobs: server-id: sonatype-nexus server-username: SERVER_USERNAME server-password: SERVER_PASSWORD - - run: mvn -B dependency:go-offline -q - - run: mvn -B verify - if: github.ref != 'refs/heads/main' + - run: mvn -B dependency:go-offline - run: mvn -B deploy - if: github.ref == 'refs/heads/main' env: SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - - uses: dorny/test-reporter@v1 + - uses: dorny/test-reporter@v1.5.0 if: failure() with: name: surefire - path: '*/target/surefire-reports/*.xml' + path: '**/target/surefire-reports/*.xml' reporter: java-junit list-suites: failed list-tests: failed + fail-on-error: false diff --git a/README.md b/README.md index c2bae4d..d60bdc3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,20 @@ # Micronaut Logging support +[![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/kokuwaio/micronaut-logging.svg?label=License)](http://www.apache.org/licenses/) [![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22io.kokuwa.micronaut%22%20AND%20a:%22micronaut-logging%22) -[![CI](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml/badge.svg)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml) +[![Build](https://img.shields.io/github/workflow/status/kokuwaio/micronaut-logging/Snapshot?label=Build)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml?label=Build) +[![Lint](https://img.shields.io/github/workflow/status/kokuwaio/micronaut-logging/Lint?label=Lint)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/lint.yaml?label=Lint) + +Include in your `pom.xml`: + +```xml + + io.kokuwa.micronaut + micronaut-logging + ${version.io.kokuwa.micronaut.logging} + runtime + +``` ## Features diff --git a/pom.xml b/pom.xml index f1e0419..051daa5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,12 @@ - stephanschnabel + sschnabe Stephan Schnabel - https://github.com/stephanschnabel + https://github.com/sschnabe stephan@grayc.de GrayC GmbH - http://grayc.de + https://grayc.de @@ -73,31 +73,41 @@ true true + true + + checkstyle.xml + checkstyle-suppression.xml + true + - - - 1.2.10 - 0.1.5 - 3.2.6 - + 3.1.2 3.1.0 - 3.8.1 + 3.10.0 + 3.2.0 3.0.0-M2 3.0.1 3.0.0-M1 - 3.3.1 - 3.2.1 + 3.3.2 + 3.2.2 3.0.0-M5 3.2.0 3.2.1 3.0.0-M5 1.1.0 - 1.6.8 + 1.6.12 + 10.0 + 0.5.6 + + + + 1.2.10 + 0.1.5 + 3.3.4 @@ -191,6 +201,25 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + ${version.org.apache.maven.plugins.checkstyle} + + + com.puppycrawl.tools + checkstyle + ${version.com.puppycrawl.tools.checkstyle} + + + io.kokuwa + maven-parent + ${version.io.kokuwa.checkstyle} + zip + checkstyle + + + org.apache.maven.plugins maven-clean-plugin @@ -210,6 +239,11 @@ + + org.apache.maven.plugins + maven-dependency-plugin + ${version.org.apache.maven.plugins.dependency_} + org.apache.maven.plugins maven-deploy-plugin @@ -261,7 +295,6 @@ maven-surefire-plugin ${version.org.apache.maven.plugins.surefire} - true true @@ -305,6 +338,19 @@ + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + check + + + + + From 9b3cd572578336dd1efd7b4f01ba80157f9cd1a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 20:34:18 +0000 Subject: [PATCH 050/195] Bump logback-classic from 1.2.10 to 1.2.11 (#41) Bumps logback-classic from 1.2.10 to 1.2.11. --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 051daa5..e376a39 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ - 1.2.10 + 1.2.11 0.1.5 3.3.4 From 19c59e7f08b3ddf438d9187b016c74d506be3450 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Mar 2022 20:30:21 +0000 Subject: [PATCH 051/195] Bump maven-compiler-plugin from 3.10.0 to 3.10.1 (#42) Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.0 to 3.10.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.0...maven-compiler-plugin-3.10.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e376a39..5663b2b 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ 3.1.2 3.1.0 - 3.10.0 + 3.10.1 3.2.0 3.0.0-M2 3.0.1 From 62668c842100c069b8e5dfdd09d6ef7e6c73e5c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Mar 2022 09:24:49 +0000 Subject: [PATCH 052/195] Bump maven-dependency-plugin from 3.2.0 to 3.3.0 (#43) Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.2.0...maven-dependency-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5663b2b..a886b10 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 3.1.2 3.1.0 3.10.1 - 3.2.0 + 3.3.0 3.0.0-M2 3.0.1 3.0.0-M1 From 7c01a86e2070321da008008683b4cc586f1eb361 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Mar 2022 20:27:49 +0000 Subject: [PATCH 053/195] Bump micronaut-bom from 3.3.4 to 3.4.0 (#44) Bumps [micronaut-bom](https://github.com/micronaut-projects/micronaut-core) from 3.3.4 to 3.4.0. - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/3.4.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v3.3.4...v3.4.0) --- updated-dependencies: - dependency-name: io.micronaut:micronaut-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a886b10..fde5776 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 1.2.11 0.1.5 - 3.3.4 + 3.4.0 From 4066f49677662a19a05a2eda1c8bef02f3286e98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 20:34:10 +0000 Subject: [PATCH 054/195] Bump checkstyle from 10.0 to 10.1 (#46) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.0 to 10.1. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.0...checkstyle-10.1) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fde5776..cd5dba1 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 3.0.0-M5 1.1.0 1.6.12 - 10.0 + 10.1 0.5.6 From cb30a065cc5a47dda49a351fd9c96d7f091975ae Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Tue, 29 Mar 2022 16:44:29 +0200 Subject: [PATCH 055/195] Avoid dependabot spam. (#45) --- .github/dependabot.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6d39e7e..f12985f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,13 +3,11 @@ updates: - package-ecosystem: maven directory: / schedule: - interval: daily - open-pull-requests-limit: 1 - rebase-strategy: auto + interval: monthly ignore: - dependency-name: ch.qos.logback:logback-classic update-types: ["version-update:semver-major", "version-update:semver-minor"] - package-ecosystem: github-actions directory: / schedule: - interval: daily + interval: monthly From e78fb42f72a4afce12b78ad5ebde4495d85554b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 20:06:00 +0000 Subject: [PATCH 056/195] Bump micronaut-bom from 3.4.0 to 3.4.1 (#47) Bumps [micronaut-bom](https://github.com/micronaut-projects/micronaut-core) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/3.4.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v3.4.0...v3.4.1) --- updated-dependencies: - dependency-name: io.micronaut:micronaut-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cd5dba1..99f8bba 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 1.2.11 0.1.5 - 3.4.0 + 3.4.1 From 92518a4c1051ba2496a46c52836ea921a8f96be7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 20:05:33 +0000 Subject: [PATCH 057/195] Bump maven-surefire-plugin from 3.0.0-M5 to 3.0.0-M6 (#49) Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M5 to 3.0.0-M6. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M5...surefire-3.0.0-M6) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99f8bba..9307be6 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ 3.0.0-M5 3.2.0 3.2.1 - 3.0.0-M5 + 3.0.0-M6 1.1.0 1.6.12 10.1 From 1cdf3d7a79bf00550d1e06905f6b22e5181cbd56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 20:05:37 +0000 Subject: [PATCH 058/195] Bump github/codeql-action from 1 to 2 (#48) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1 to 2. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v1...v2) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index d52e416..d0913c3 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -15,8 +15,8 @@ jobs: contents: read steps: - uses: actions/checkout@v3 - - uses: github/codeql-action/init@v1 + - uses: github/codeql-action/init@v2 with: languages: java - - uses: github/codeql-action/autobuild@v1 - - uses: github/codeql-action/analyze@v1 + - uses: github/codeql-action/autobuild@v2 + - uses: github/codeql-action/analyze@v2 From 4539b03ad80be3656fb2d5c8d309e339a9506d5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 20:05:46 +0000 Subject: [PATCH 059/195] Bump micronaut-bom from 3.4.1 to 3.4.3 (#50) Bumps [micronaut-bom](https://github.com/micronaut-projects/micronaut-core) from 3.4.1 to 3.4.3. - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/3.4.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v3.4.1...v3.4.3) --- updated-dependencies: - dependency-name: io.micronaut:micronaut-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9307be6..a3289a4 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 1.2.11 0.1.5 - 3.4.1 + 3.4.3 From 1ffa3464516b803e99cf304be074706d77cc5a27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 20:06:02 +0000 Subject: [PATCH 060/195] Bump maven-clean-plugin from 3.1.0 to 3.2.0 (#51) Bumps [maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/apache/maven-clean-plugin/releases) - [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.1.0...maven-clean-plugin-3.2.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-clean-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a3289a4..70e6bd7 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ 3.1.2 - 3.1.0 + 3.2.0 3.10.1 3.3.0 3.0.0-M2 From a1e7b1c987a28db1781485d91b3f13869e30ff55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 20:06:11 +0000 Subject: [PATCH 061/195] Bump checkstyle from 10.1 to 10.2 (#53) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.1 to 10.2. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.1...checkstyle-10.2) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 70e6bd7..1b0d762 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 3.0.0-M6 1.1.0 1.6.12 - 10.1 + 10.2 0.5.6 From eac4c3f7321471dd82bb327433c15b79ed63362d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 20:08:31 +0000 Subject: [PATCH 062/195] Bump nexus-staging-maven-plugin from 1.6.12 to 1.6.13 (#52) Bumps nexus-staging-maven-plugin from 1.6.12 to 1.6.13. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1b0d762..12a311f 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ 3.2.1 3.0.0-M6 1.1.0 - 1.6.12 + 1.6.13 10.2 0.5.6 From 3ad260c13105cef7b7bb763848ae62dae1f6c941 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jun 2022 20:14:23 +0000 Subject: [PATCH 063/195] Bump crazy-max/ghaction-import-gpg from 4 to 5 (#54) Bumps [crazy-max/ghaction-import-gpg](https://github.com/crazy-max/ghaction-import-gpg) from 4 to 5. - [Release notes](https://github.com/crazy-max/ghaction-import-gpg/releases) - [Changelog](https://github.com/crazy-max/ghaction-import-gpg/blob/master/CHANGELOG.md) - [Commits](https://github.com/crazy-max/ghaction-import-gpg/compare/v4...v5) --- updated-dependencies: - dependency-name: crazy-max/ghaction-import-gpg dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f54f728..1ac888f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v3 with: token: ${{ secrets.GIT_ACTION_TOKEN }} - - uses: crazy-max/ghaction-import-gpg@v4 + - uses: crazy-max/ghaction-import-gpg@v5 with: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} passphrase: ${{ secrets.GPG_PASSPHRASE }} From 4bb3fb9f06060b8e84d5355a95f242549ea727bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jun 2022 20:14:51 +0000 Subject: [PATCH 064/195] Bump micronaut-bom from 3.4.3 to 3.5.0 (#55) Bumps [micronaut-bom](https://github.com/micronaut-projects/micronaut-core) from 3.4.3 to 3.5.0. - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/3.5.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v3.4.3...v3.5.0) --- updated-dependencies: - dependency-name: io.micronaut:micronaut-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 12a311f..34f6bb1 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 1.2.11 0.1.5 - 3.4.3 + 3.5.0 From fd4dad5a852b0e2df9f1c3a8b2f19dee33c61a95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jun 2022 20:15:07 +0000 Subject: [PATCH 065/195] Bump checkstyle from 10.2 to 10.3 (#56) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.2 to 10.3. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.2...checkstyle-10.3) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34f6bb1..719d2c6 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 3.0.0-M6 1.1.0 1.6.13 - 10.2 + 10.3 0.5.6 From c6b15028cc01f09b2f6503f50e611e90118f8ed4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jun 2022 20:15:16 +0000 Subject: [PATCH 066/195] Bump maven-javadoc-plugin from 3.3.2 to 3.4.0 (#57) Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.2 to 3.4.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.2...maven-javadoc-plugin-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 719d2c6..9714c78 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 3.0.0-M2 3.0.1 3.0.0-M1 - 3.3.2 + 3.4.0 3.2.2 3.0.0-M5 3.2.0 From dd8053bc8fdf557db30fa07de8bbc778e683878a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 20:09:57 +0000 Subject: [PATCH 067/195] Bump checkstyle from 10.3 to 10.3.1 (#58) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.3 to 10.3.1. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.3...checkstyle-10.3.1) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9714c78..f48175d 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 3.0.0-M6 1.1.0 1.6.13 - 10.3 + 10.3.1 0.5.6 From 848841686ed808675f619c43e8b11c290bafed5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 20:10:11 +0000 Subject: [PATCH 068/195] Bump maven-surefire-plugin from 3.0.0-M6 to 3.0.0-M7 (#59) Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M6 to 3.0.0-M7. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M6...surefire-3.0.0-M7) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f48175d..b4bf783 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ 3.0.0-M5 3.2.0 3.2.1 - 3.0.0-M6 + 3.0.0-M7 1.1.0 1.6.13 10.3.1 From cc1ae1ee14ef143503f6e4a89b05deb08293e718 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 20:10:24 +0000 Subject: [PATCH 069/195] Bump micronaut-bom from 3.5.0 to 3.5.2 (#61) Bumps [micronaut-bom](https://github.com/micronaut-projects/micronaut-core) from 3.5.0 to 3.5.2. - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/3.5.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v3.5.0...v3.5.2) --- updated-dependencies: - dependency-name: io.micronaut:micronaut-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b4bf783..0639aec 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 1.2.11 0.1.5 - 3.5.0 + 3.5.2 From a016a040ae1abce2887ea1dac29a541cdcefcc33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 20:10:34 +0000 Subject: [PATCH 070/195] Bump maven-release-plugin from 3.0.0-M5 to 3.0.0-M6 (#60) Bumps [maven-release-plugin](https://github.com/apache/maven-release) from 3.0.0-M5 to 3.0.0-M6. - [Release notes](https://github.com/apache/maven-release/releases) - [Commits](https://github.com/apache/maven-release/compare/maven-release-3.0.0-M5...maven-release-3.0.0-M6) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-release-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0639aec..ac99256 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ 3.0.0-M1 3.4.0 3.2.2 - 3.0.0-M5 + 3.0.0-M6 3.2.0 3.2.1 3.0.0-M7 From ad1b5823a58ed0e3659778b8d13b54bf757e1f62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 20:08:30 +0000 Subject: [PATCH 071/195] Bump maven-resources-plugin from 3.2.0 to 3.3.0 (#65) Bumps [maven-resources-plugin](https://github.com/apache/maven-resources-plugin) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/apache/maven-resources-plugin/releases) - [Commits](https://github.com/apache/maven-resources-plugin/compare/maven-resources-plugin-3.2.0...maven-resources-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-resources-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac99256..7b3472d 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 3.4.0 3.2.2 3.0.0-M6 - 3.2.0 + 3.3.0 3.2.1 3.0.0-M7 1.1.0 From 351116f9b08290b526035f5cccda652fdd187884 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 20:08:39 +0000 Subject: [PATCH 072/195] Bump maven-deploy-plugin from 3.0.0-M2 to 3.0.0 (#66) Bumps [maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) from 3.0.0-M2 to 3.0.0. - [Release notes](https://github.com/apache/maven-deploy-plugin/releases) - [Commits](https://github.com/apache/maven-deploy-plugin/compare/maven-deploy-plugin-3.0.0-M2...maven-deploy-plugin-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-deploy-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b3472d..c0751cb 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ 3.2.0 3.10.1 3.3.0 - 3.0.0-M2 + 3.0.0 3.0.1 3.0.0-M1 3.4.0 From 7832629b7b215be2f7ccb1e9c3915ace5bce3451 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 20:08:52 +0000 Subject: [PATCH 073/195] Bump checkstyle from 10.3.1 to 10.3.2 (#64) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.3.1 to 10.3.2. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.3.1...checkstyle-10.3.2) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0751cb..10d0573 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 3.0.0-M7 1.1.0 1.6.13 - 10.3.1 + 10.3.2 0.5.6 From a48d4bc309f508e4fd007748172cb1532cdbe7cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 20:09:04 +0000 Subject: [PATCH 074/195] Bump micronaut-bom from 3.5.2 to 3.5.4 (#62) Bumps [micronaut-bom](https://github.com/micronaut-projects/micronaut-core) from 3.5.2 to 3.5.4. - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/3.6.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v3.5.2...v3.5.4) --- updated-dependencies: - dependency-name: io.micronaut:micronaut-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 10d0573..afe8b8c 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 1.2.11 0.1.5 - 3.5.2 + 3.5.4 From 0be38e0a059e01a0cb219874ab925351809bab42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 20:09:16 +0000 Subject: [PATCH 075/195] Bump maven-install-plugin from 3.0.0-M1 to 3.0.1 (#63) Bumps [maven-install-plugin](https://github.com/apache/maven-install-plugin) from 3.0.0-M1 to 3.0.1. - [Release notes](https://github.com/apache/maven-install-plugin/releases) - [Commits](https://github.com/apache/maven-install-plugin/compare/maven-install-plugin-3.0.0-M1...maven-install-plugin-3.0.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-install-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index afe8b8c..d6ba255 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ 3.3.0 3.0.0 3.0.1 - 3.0.0-M1 + 3.0.1 3.4.0 3.2.2 3.0.0-M6 From f0fe567620e76751e24c52cb6462a17ac50265cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 20:06:54 +0000 Subject: [PATCH 076/195] Bump maven-checkstyle-plugin from 3.1.2 to 3.2.0 (#67) Bumps [maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.1.2 to 3.2.0. - [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases) - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.1.2...maven-checkstyle-plugin-3.2.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d6ba255..95afc9d 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ - 3.1.2 + 3.2.0 3.2.0 3.10.1 3.3.0 From 3b01d9f22ff1435ce88826e947edbb68a43dcb14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 20:06:56 +0000 Subject: [PATCH 077/195] Bump checkstyle from 10.3.2 to 10.3.3 (#69) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.3.2 to 10.3.3. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.3.2...checkstyle-10.3.3) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95afc9d..f522667 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 3.0.0-M7 1.1.0 1.6.13 - 10.3.2 + 10.3.3 0.5.6 From 67a1b523629f6d7a3f11cd6a9077d20689a2af5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 20:07:09 +0000 Subject: [PATCH 078/195] Bump maven-javadoc-plugin from 3.4.0 to 3.4.1 (#68) Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.4.0...maven-javadoc-plugin-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f522667..009e919 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 3.0.0 3.0.1 3.0.1 - 3.4.0 + 3.4.1 3.2.2 3.0.0-M6 3.3.0 From 45dc3e361d2775350407ce766652ae5fd832b0ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Sep 2022 08:22:23 +0000 Subject: [PATCH 079/195] Bump micronaut-bom from 3.5.4 to 3.6.1 (#70) * Bump micronaut-bom from 3.5.4 to 3.6.1 Bumps [micronaut-bom](https://github.com/micronaut-projects/micronaut-core) from 3.5.4 to 3.6.1. - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/3.6.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v3.5.4...v3.6.1) --- updated-dependencies: - dependency-name: io.micronaut:micronaut-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Fix micronaut issue with new version Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stephan Schnabel --- pom.xml | 2 +- .../logging/http/AbstractFilterTest.java | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 009e919..511d9c6 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 1.2.11 0.1.5 - 3.5.4 + 3.6.1 diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java index 56b68d0..ab31e47 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java @@ -7,7 +7,6 @@ import static org.junit.jupiter.api.Assertions.fail; import java.util.Map; import java.util.function.Consumer; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -46,24 +45,14 @@ import jakarta.inject.Inject; @MicronautTest(rebuildContext = true) public abstract class AbstractFilterTest extends AbstractTest { - private static boolean INIT = false; - @Inject SignatureGeneratorConfiguration signature; @Inject EmbeddedServer embeddedServer; - @DisplayName("0 init") + @DisplayName("0 - trigger rebuild of context") @Test - @BeforeEach - void refresh() { - // https://github.com/micronaut-projects/micronaut-core/issues/5453#issuecomment-864594741 - if (INIT) { - embeddedServer.refresh(); - } else { - INIT = true; - } - } + void rebuild() {} // security From 9411c2b1b1ad31426a126f9eeea9336595c97b0d Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Fri, 2 Sep 2022 10:30:37 +0200 Subject: [PATCH 080/195] Maintain actions (#71) --- .github/dependabot.yml | 4 +- .github/workflows/ci.yaml | 61 ++++++++++++++++++++++++++++++ .github/workflows/codeql.yaml | 22 ----------- .github/workflows/dependabot.yaml | 6 +-- .github/workflows/lint.yaml | 26 ------------- .github/workflows/pullrequest.yaml | 26 ------------- .github/workflows/release.yaml | 8 ++-- .github/workflows/snapshot.yaml | 35 ----------------- .markdownlint.yaml | 9 +++-- .yamllint | 9 +++++ 10 files changed, 85 insertions(+), 121 deletions(-) create mode 100644 .github/workflows/ci.yaml delete mode 100644 .github/workflows/codeql.yaml delete mode 100644 .github/workflows/lint.yaml delete mode 100644 .github/workflows/pullrequest.yaml delete mode 100644 .github/workflows/snapshot.yaml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f12985f..ce15cea 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,10 +3,10 @@ updates: - package-ecosystem: maven directory: / schedule: - interval: monthly + interval: daily ignore: - dependency-name: ch.qos.logback:logback-classic - update-types: ["version-update:semver-major", "version-update:semver-minor"] + update-types: [version-update:semver-major, version-update:semver-minor] - package-ecosystem: github-actions directory: / schedule: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 0000000..b40100f --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,61 @@ +name: CI + +on: + push: + branches: [main] + pull_request: {} + schedule: [cron: 0 0 * * 1-5] + +jobs: + + yaml: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: ibiqlik/action-yamllint@v3 + with: + format: colored + strict: true + + markdown: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: avto-dev/markdown-lint@v1 + with: + args: /github/workspace + + codeql: + runs-on: ubuntu-latest + permissions: + security-events: write + actions: read + contents: read + steps: + - uses: actions/checkout@v3 + - uses: github/codeql-action/init@v2 + with: + languages: java + - uses: github/codeql-action/autobuild@v2 + - uses: github/codeql-action/analyze@v2 + + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + cache: maven + server-id: sonatype-nexus + server-username: SERVER_USERNAME + server-password: SERVER_PASSWORD + - run: mvn -B -ntp dependency:go-offline + - run: mvn -B -ntp verify + if: ${{ github.ref != 'refs/heads/main' }} + - run: mvn -B -ntp deploy + if: ${{ github.ref == 'refs/heads/main' }} + env: + SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} + SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml deleted file mode 100644 index d0913c3..0000000 --- a/.github/workflows/codeql.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: CodeQL - -"on": - workflow_dispatch: {} - pull_request: {} - schedule: - - cron: '0 0 * * *' - -jobs: - codeql: - runs-on: ubuntu-latest - permissions: - security-events: write - actions: read - contents: read - steps: - - uses: actions/checkout@v3 - - uses: github/codeql-action/init@v2 - with: - languages: java - - uses: github/codeql-action/autobuild@v2 - - uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/dependabot.yaml b/.github/workflows/dependabot.yaml index bcbe4a7..ed63eca 100644 --- a/.github/workflows/dependabot.yaml +++ b/.github/workflows/dependabot.yaml @@ -1,6 +1,6 @@ name: Dependabot -"on": pull_request_target +on: pull_request_target jobs: auto-merge: @@ -9,9 +9,9 @@ jobs: steps: - run: gh pr review --approve "$PR_URL" env: - PR_URL: ${{github.event.pull_request.html_url}} + PR_URL: ${{ github.event.pull_request.html_url }} GITHUB_TOKEN: ${{ secrets.GIT_ACTION_TOKEN }} - run: gh pr merge --auto --squash "$PR_URL" env: - PR_URL: ${{github.event.pull_request.html_url}} + PR_URL: ${{ github.event.pull_request.html_url }} GITHUB_TOKEN: ${{ secrets.GIT_ACTION_TOKEN }} diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml deleted file mode 100644 index fa10df9..0000000 --- a/.github/workflows/lint.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: Lint - -"on": - workflow_dispatch: {} - push: - branches: [main] - pull_request: {} - -jobs: - - yaml: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: ibiqlik/action-yamllint@v3 - with: - format: colored - strict: true - - markdown: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: avto-dev/markdown-lint@v1 - with: - args: /github/workspace diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml deleted file mode 100644 index f5e7588..0000000 --- a/.github/workflows/pullrequest.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: PullRequest - -"on": pull_request - -jobs: - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: 11 - cache: maven - - run: mvn -B dependency:go-offline - - run: mvn -B verify - - uses: dorny/test-reporter@v1.5.0 - if: failure() - with: - name: surefire - path: '**/target/surefire-reports/*.xml,**/target/invoker-reports/*.xml' - reporter: java-junit - list-suites: failed - list-tests: failed - fail-on-error: false diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1ac888f..4f561a0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,6 +1,6 @@ name: Release -"on": workflow_dispatch +on: workflow_dispatch jobs: build: @@ -25,9 +25,9 @@ jobs: server-password: SERVER_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE - - run: mvn -B dependency:go-offline - - run: mvn -B release:prepare - - run: mvn -B release:perform + - run: mvn -B -ntp dependency:go-offline + - run: mvn -B -ntp release:prepare + - run: mvn -B -ntp release:perform env: SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} diff --git a/.github/workflows/snapshot.yaml b/.github/workflows/snapshot.yaml deleted file mode 100644 index 2bee99b..0000000 --- a/.github/workflows/snapshot.yaml +++ /dev/null @@ -1,35 +0,0 @@ -name: Snapshot - -"on": - workflow_dispatch: {} - push: - branches: [main] - paths-ignore: ['**.md'] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: 11 - cache: maven - server-id: sonatype-nexus - server-username: SERVER_USERNAME - server-password: SERVER_PASSWORD - - run: mvn -B dependency:go-offline - - run: mvn -B deploy - env: - SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - - uses: dorny/test-reporter@v1.5.0 - if: failure() - with: - name: surefire - path: '**/target/surefire-reports/*.xml' - reporter: java-junit - list-suites: failed - list-tests: failed - fail-on-error: false diff --git a/.markdownlint.yaml b/.markdownlint.yaml index dd23793..5f08047 100644 --- a/.markdownlint.yaml +++ b/.markdownlint.yaml @@ -1,6 +1,9 @@ # Default state for all rules default: true -# MD013/line-length - Line length -MD013: - line_length: 10000 +# MD009 - Trailing spaces +MD009: + strict: true + +# MD013 - Line length +MD013: false diff --git a/.yamllint b/.yamllint index 9d1b12e..8011808 100644 --- a/.yamllint +++ b/.yamllint @@ -8,3 +8,12 @@ rules: # line length is not important line-length: disable + + # force double quotes everywhere + quoted-strings: + quote-type: double + required: only-when-needed + + # allow everything on keys + truthy: + check-keys: false From 075ea5d38ec00562f13214cbeb54aa437b93d945 Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Fri, 2 Sep 2022 08:32:56 +0000 Subject: [PATCH 081/195] [maven-release-plugin] prepare release 3.0.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 511d9c6..f8761fd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.5-SNAPSHOT + 3.0.5 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.0.5 github From 914dce0270508225a6e90712b995891fd42a8e42 Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Fri, 2 Sep 2022 08:33:00 +0000 Subject: [PATCH 082/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f8761fd..fef007e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.5 + 3.0.6-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.0.5 + HEAD github From 2da5046552e2ee9eea57e58b978ce0195ecd1d6c Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Fri, 2 Sep 2022 10:40:27 +0200 Subject: [PATCH 083/195] Fix build label in README --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d60bdc3..e9dbb68 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/kokuwaio/micronaut-logging.svg?label=License)](http://www.apache.org/licenses/) [![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22io.kokuwa.micronaut%22%20AND%20a:%22micronaut-logging%22) -[![Build](https://img.shields.io/github/workflow/status/kokuwaio/micronaut-logging/Snapshot?label=Build)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/snapshot.yaml?label=Build) -[![Lint](https://img.shields.io/github/workflow/status/kokuwaio/micronaut-logging/Lint?label=Lint)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/lint.yaml?label=Lint) +[![CI](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/ci.yaml?branch=main&label=3.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/ci.yaml?query=branch%3Amain) +[![CI](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/ci.yaml?branch=4.x&label=4.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/ci.yaml?query=branch%3A4.x) Include in your `pom.xml`: @@ -18,6 +18,8 @@ Include in your `pom.xml`: ## Features +* Version [3.x](https://github.com/kokuwaio/micronaut-logging/tree/main) is based on SLF4J 1.7 & Logback 1.2 +* Version [4.x](https://github.com/kokuwaio/micronaut-logging/tree/4.x) is based on SLF4J 2.0 & Logback 1.4 * [set log level based on MDC values](docs/features/logback_mdc_level.md) * [add default xml](docs/features/logback_default.md) * [preconfigured appender for different environments](docs/features/logback_appender.md) From e2c6a7daa162f7c409b4e4c8b00ccbe784dc7fcb Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Sat, 18 Feb 2023 14:51:46 +0100 Subject: [PATCH 084/195] Update versions and build stuff --- .github/CODEOWNERS | 4 +++- .github/dependabot.yml | 13 ++++++++++++- .github/workflows/ci.yaml | 32 +++++++++++++++++++++----------- README.md | 2 +- pom.xml | 38 +++++++++++++++++++------------------- 5 files changed, 56 insertions(+), 33 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 04a08ef..6e53241 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,4 @@ # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax -* @kokuwaio-bot @sschnabe @rpahli @fabian-schlegel +* @sschnabe @rpahli @fabian-schlegel @wistefan +.github/workflows/* @kokuwaio-bot @sschnabe @rpahli @fabian-schlegel @wistefan +pom.xml @kokuwaio-bot @sschnabe @rpahli @fabian-schlegel @wistefan diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ce15cea..e754c9d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,11 +3,22 @@ updates: - package-ecosystem: maven directory: / schedule: - interval: daily + interval: monthly + day: monday + # github parses time without quotes to int + # yamllint disable-line rule:quoted-strings + time: "09:00" + timezone: Europe/Berlin ignore: + # logback 1.3 and 1.4 are compatible with slf4j 2.x only - dependency-name: ch.qos.logback:logback-classic update-types: [version-update:semver-major, version-update:semver-minor] - package-ecosystem: github-actions directory: / schedule: interval: monthly + day: monday + # github parses time without quotes to int + # yamllint disable-line rule:quoted-strings + time: "09:00" + timezone: Europe/Berlin diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b40100f..8383223 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -25,19 +25,29 @@ jobs: with: args: /github/workspace - codeql: + javadoc: runs-on: ubuntu-latest - permissions: - security-events: write - actions: read - contents: read steps: - uses: actions/checkout@v3 - - uses: github/codeql-action/init@v2 + - uses: actions/setup-java@v3 with: - languages: java - - uses: github/codeql-action/autobuild@v2 - - uses: github/codeql-action/analyze@v2 + distribution: temurin + java-version: 11 + cache: maven + - run: mvn -B -ntp dependency:go-offline + - run: mvn -B -ntp javadoc:javadoc-no-fork -Dmaven.javadoc.failOnWarnings=true -Ddoclint=all + + checkstyle: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + cache: maven + - run: mvn -B -ntp dependency:go-offline + - run: mvn -B -ntp checkstyle:check build: runs-on: ubuntu-latest @@ -52,9 +62,9 @@ jobs: server-username: SERVER_USERNAME server-password: SERVER_PASSWORD - run: mvn -B -ntp dependency:go-offline - - run: mvn -B -ntp verify + - run: mvn -B -ntp verify -Dcheckstyle.skip if: ${{ github.ref != 'refs/heads/main' }} - - run: mvn -B -ntp deploy + - run: mvn -B -ntp deploy -Dcheckstyle.skip if: ${{ github.ref == 'refs/heads/main' }} env: SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} diff --git a/README.md b/README.md index e9dbb68..9260ec1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Include in your `pom.xml`: ## Features * Version [3.x](https://github.com/kokuwaio/micronaut-logging/tree/main) is based on SLF4J 1.7 & Logback 1.2 -* Version [4.x](https://github.com/kokuwaio/micronaut-logging/tree/4.x) is based on SLF4J 2.0 & Logback 1.4 +* Version [4.x](https://github.com/kokuwaio/micronaut-logging/tree/4.x) is based on SLF4J 2.0 & Logback 1.4 (WIP) * [set log level based on MDC values](docs/features/logback_mdc_level.md) * [add default xml](docs/features/logback_default.md) * [preconfigured appender for different environments](docs/features/logback_appender.md) diff --git a/pom.xml b/pom.xml index fef007e..2cf0b76 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 io.kokuwa.micronaut @@ -65,49 +65,44 @@ UTF-8 ISO-8859-1 - UTF-8 11 11 true true true - + true true - checkstyle.xml - checkstyle-suppression.xml - true - - 3.2.0 + 3.2.1 3.2.0 3.10.1 - 3.3.0 - 3.0.0 + 3.5.0 + 3.1.0 3.0.1 - 3.0.1 - 3.4.1 - 3.2.2 - 3.0.0-M6 + 3.1.0 + 3.5.0 + 3.3.0 + 3.0.0-M7 3.3.0 3.2.1 - 3.0.0-M7 - 1.1.0 + 3.0.0-M9 + 1.2.0 1.6.13 - 10.3.3 + 10.7.0 0.5.6 1.2.11 0.1.5 - 3.6.1 + 3.8.5 @@ -205,6 +200,11 @@ org.apache.maven.plugins maven-checkstyle-plugin ${version.org.apache.maven.plugins.checkstyle} + + checkstyle.xml + checkstyle-suppression.xml + true + com.puppycrawl.tools @@ -242,7 +242,7 @@ org.apache.maven.plugins maven-dependency-plugin - ${version.org.apache.maven.plugins.dependency_} + ${version.org.apache.maven.plugins.dependency} org.apache.maven.plugins From 302df7dbf22a76ffc321040aeb3decaa6086336a Mon Sep 17 00:00:00 2001 From: Rico Pahlisch Date: Tue, 28 Feb 2023 08:45:00 +0100 Subject: [PATCH 085/195] enable initial native image support (#125) --- .../micronaut-logging/native-image.properties | 2 ++ .../micronaut-logging/resource-config.json | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/native-image.properties create mode 100644 src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/resource-config.json diff --git a/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/native-image.properties b/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/native-image.properties new file mode 100644 index 0000000..e1e3f1f --- /dev/null +++ b/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/native-image.properties @@ -0,0 +1,2 @@ +Args = --initialize-at-build-time=io.kokuwa.micronaut.logging.configurator.RootAutoSelectAppenderAction + diff --git a/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/resource-config.json b/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/resource-config.json new file mode 100644 index 0000000..d1dfcab --- /dev/null +++ b/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/resource-config.json @@ -0,0 +1,27 @@ +{ + "resources": { + "includes": [ + { + "pattern": "\\Qio/kokuwa/logback/appender-console.xml\\E" + }, + { + "pattern": "\\Qio/kokuwa/logback/appender-gcp.xml\\E" + }, + { + "pattern": "\\Qio/kokuwa/logback/appender-json.xml\\E" + }, + { + "pattern": "\\Qio/kokuwa/logback/base.xml\\E" + }, + { + "pattern": "\\Qio/kokuwa/logback/logback-default.xml\\E" + }, + { + "pattern": "\\Qio/kokuwa/logback/logback-example.xml\\E" + }, + { + "pattern": "\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E" + } + ] + } +} \ No newline at end of file From d24123081e02967d03de68945810469cc2e5f91a Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Wed, 1 Mar 2023 08:23:54 +0000 Subject: [PATCH 086/195] [maven-release-plugin] prepare release 3.0.6 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2cf0b76..ff43677 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.6-SNAPSHOT + 3.0.6 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.0.6 github From 2db499287b2c1742dfdaa4db4eb5ec5875b1ffbb Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Wed, 1 Mar 2023 08:23:58 +0000 Subject: [PATCH 087/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ff43677..4891fb0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.6 + 3.0.7-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.0.6 + HEAD github From 49343515012d932300410de9b8d3b0087a207bf9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 08:59:39 +0000 Subject: [PATCH 088/195] Bump micronaut-bom from 3.8.5 to 3.8.6 (#126) Bumps [micronaut-bom](https://github.com/micronaut-projects/micronaut-core) from 3.8.5 to 3.8.6. - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.0.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v3.8.5...v3.8.6) --- updated-dependencies: - dependency-name: io.micronaut:micronaut-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4891fb0..1ce9b38 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 1.2.11 0.1.5 - 3.8.5 + 3.8.6 From 3b11aacdd7a78ff2459f7b22d8e9195b6aa3236f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 08:59:50 +0000 Subject: [PATCH 089/195] Bump checkstyle from 10.7.0 to 10.8.0 (#127) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.7.0 to 10.8.0. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.7.0...checkstyle-10.8.0) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ce9b38..2c3f6dd 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 3.0.0-M9 1.2.0 1.6.13 - 10.7.0 + 10.8.0 0.5.6 From fcde0a04696afcf96c11bbcd1733c997a807d0b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 09:00:16 +0000 Subject: [PATCH 090/195] Bump maven-compiler-plugin from 3.10.1 to 3.11.0 (#128) Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c3f6dd..a4ec30b 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ 3.2.1 3.2.0 - 3.10.1 + 3.11.0 3.5.0 3.1.0 3.0.1 From bfbf8c31306e8721f43566edd779bbef773dfdfd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 07:59:37 +0000 Subject: [PATCH 091/195] Bump version.io.micronaut from 3.8.6 to 3.8.8 (#129) Bumps `version.io.micronaut` from 3.8.6 to 3.8.8. Updates `micronaut-bom` from 3.8.6 to 3.8.8 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.0.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v3.8.6...v3.8.8) Updates `micronaut-inject-java` from 3.8.6 to 3.8.8 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.0.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v3.8.6...v3.8.8) --- updated-dependencies: - dependency-name: io.micronaut:micronaut-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4ec30b..70d5339 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 1.2.11 0.1.5 - 3.8.6 + 3.8.8 From db9a769806ea34f66111e4a211a1d5b275b25ec8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 08:01:02 +0000 Subject: [PATCH 092/195] Bump maven-resources-plugin from 3.3.0 to 3.3.1 (#130) Bumps [maven-resources-plugin](https://github.com/apache/maven-resources-plugin) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-resources-plugin/releases) - [Commits](https://github.com/apache/maven-resources-plugin/compare/maven-resources-plugin-3.3.0...maven-resources-plugin-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-resources-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 70d5339..05ffc65 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 3.5.0 3.3.0 3.0.0-M7 - 3.3.0 + 3.3.1 3.2.1 3.0.0-M9 1.2.0 From 70479bf154b910d1633fe92154839d7c93e44e92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 08:01:14 +0000 Subject: [PATCH 093/195] Bump maven-surefire-plugin from 3.0.0-M9 to 3.0.0 (#131) Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M9 to 3.0.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M9...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 05ffc65..b3620b2 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 3.0.0-M7 3.3.1 3.2.1 - 3.0.0-M9 + 3.0.0 1.2.0 1.6.13 10.8.0 From 917b6f65cf0f56d3a5897f5cca09fa7e151a6d43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 08:01:39 +0000 Subject: [PATCH 094/195] Bump checkstyle from 10.8.0 to 10.9.3 (#132) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.8.0 to 10.9.3. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.8.0...checkstyle-10.9.3) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3620b2..1058077 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 3.0.0 1.2.0 1.6.13 - 10.8.0 + 10.9.3 0.5.6 From b09a0f42e88d3b79e4f229b6d963c6df68adfc17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 08:02:02 +0000 Subject: [PATCH 095/195] Bump logback-classic from 1.2.11 to 1.2.12 (#133) Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.2.11 to 1.2.12. - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](https://github.com/qos-ch/logback/compare/v_1.2.11...v_1.2.12) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1058077..5709b5b 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ - 1.2.11 + 1.2.12 0.1.5 3.8.8 From b8828faddf61d4221448817c3319989b193aab49 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Sat, 1 Apr 2023 12:55:50 +0200 Subject: [PATCH 096/195] Maintain pom and fix sonatype url --- .github/dependabot.yml | 2 ++ .github/workflows/ci.yaml | 1 - README.md | 2 +- pom.xml | 35 +++++++++++++++++------------------ 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e754c9d..22eb8a7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,6 +2,7 @@ version: 2 updates: - package-ecosystem: maven directory: / + open-pull-requests-limit: 20 schedule: interval: monthly day: monday @@ -15,6 +16,7 @@ updates: update-types: [version-update:semver-major, version-update:semver-minor] - package-ecosystem: github-actions directory: / + open-pull-requests-limit: 10 schedule: interval: monthly day: monday diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8383223..edc9809 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,7 +4,6 @@ on: push: branches: [main] pull_request: {} - schedule: [cron: 0 0 * * 1-5] jobs: diff --git a/README.md b/README.md index 9260ec1..13f87ec 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Micronaut Logging support [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/kokuwaio/micronaut-logging.svg?label=License)](http://www.apache.org/licenses/) -[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22io.kokuwa.micronaut%22%20AND%20a:%22micronaut-logging%22) +[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://central.sonatype.com/namespace/io.kokuwa.micronaut) [![CI](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/ci.yaml?branch=main&label=3.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/ci.yaml?query=branch%3Amain) [![CI](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/ci.yaml?branch=4.x&label=4.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/ci.yaml?query=branch%3A4.x) diff --git a/pom.xml b/pom.xml index 5709b5b..e62ed31 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,6 @@ UTF-8 - ISO-8859-1 11 11 @@ -261,13 +260,13 @@ org.apache.maven.plugins - maven-javadoc-plugin - ${version.org.apache.maven.plugins.javadoc} + maven-jar-plugin + ${version.org.apache.maven.plugins.jar} org.apache.maven.plugins - maven-jar-plugin - ${version.org.apache.maven.plugins.jar} + maven-javadoc-plugin + ${version.org.apache.maven.plugins.javadoc} org.apache.maven.plugins @@ -312,19 +311,6 @@ - - - org.apache.maven.plugins - maven-source-plugin - - - - jar-no-fork - - - - - org.codehaus.mojo @@ -360,6 +346,19 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + + jar-no-fork + + + + + org.apache.maven.plugins From 74e4866035ff7f3332492be231db020183d78686 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 11:32:14 +0000 Subject: [PATCH 097/195] Bump maven-install-plugin from 3.1.0 to 3.1.1 (#136) Bumps [maven-install-plugin](https://github.com/apache/maven-install-plugin) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/apache/maven-install-plugin/releases) - [Commits](https://github.com/apache/maven-install-plugin/compare/maven-install-plugin-3.1.0...maven-install-plugin-3.1.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-install-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e62ed31..c2e29cd 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ 3.5.0 3.1.0 3.0.1 - 3.1.0 + 3.1.1 3.5.0 3.3.0 3.0.0-M7 From f6fbdc91cad359e4a88c57ff28bf1d527cc3c49e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 11:32:20 +0000 Subject: [PATCH 098/195] Bump maven-deploy-plugin from 3.1.0 to 3.1.1 (#135) Bumps [maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/apache/maven-deploy-plugin/releases) - [Commits](https://github.com/apache/maven-deploy-plugin/compare/maven-deploy-plugin-3.1.0...maven-deploy-plugin-3.1.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-deploy-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2e29cd..cf2d0be 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 3.2.0 3.11.0 3.5.0 - 3.1.0 + 3.1.1 3.0.1 3.1.1 3.5.0 From 789e71b4caa77b42db35101b89b92a93094f6ea3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 11:33:59 +0000 Subject: [PATCH 099/195] Bump maven-release-plugin from 3.0.0-M7 to 3.0.0 (#134) Bumps [maven-release-plugin](https://github.com/apache/maven-release) from 3.0.0-M7 to 3.0.0. - [Release notes](https://github.com/apache/maven-release/releases) - [Commits](https://github.com/apache/maven-release/compare/maven-release-3.0.0-M7...maven-release-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-release-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf2d0be..abeb28b 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 3.1.1 3.5.0 3.3.0 - 3.0.0-M7 + 3.0.0 3.3.1 3.2.1 3.0.0 From dfe9de7e7fde2b675f985b7ce71de74bd0d0576b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 07:59:05 +0000 Subject: [PATCH 100/195] Bump version.io.micronaut from 3.8.8 to 3.9.1 (#137) Bumps `version.io.micronaut` from 3.8.8 to 3.9.1. Updates `micronaut-bom` from 3.8.8 to 3.9.1 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.0.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v3.8.8...v3.9.1) Updates `micronaut-inject-java` from 3.8.8 to 3.9.1 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.0.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v3.8.8...v3.9.1) --- updated-dependencies: - dependency-name: io.micronaut:micronaut-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index abeb28b..7566868 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ 1.2.12 0.1.5 - 3.8.8 + 3.9.1 From 6053d1e167642fef01b4daf6e30a8b09f803d190 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 07:59:13 +0000 Subject: [PATCH 101/195] Bump checkstyle from 10.9.3 to 10.10.0 (#138) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.9.3 to 10.10.0. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.9.3...checkstyle-10.10.0) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7566868..bcb98ba 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ 3.0.0 1.2.0 1.6.13 - 10.9.3 + 10.10.0 0.5.6 From a5cc2611a6cdc6fdfa911c3416d4679044ca9e68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 08:00:00 +0000 Subject: [PATCH 102/195] Bump maven-checkstyle-plugin from 3.2.1 to 3.2.2 (#139) Bumps [maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases) - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.2.1...maven-checkstyle-plugin-3.2.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bcb98ba..69f60ed 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ - 3.2.1 + 3.2.2 3.2.0 3.11.0 3.5.0 From d582499c5c816af4e318171c6dac87fc2ef11a40 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Tue, 9 May 2023 08:55:10 +0200 Subject: [PATCH 103/195] Remove unused example logback.xml (#140) --- docs/features/logback_default.md | 12 ++++++------ .../micronaut-logging/resource-config.json | 3 --- .../resources/io/kokuwa/logback/logback-example.xml | 12 ------------ 3 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 src/main/resources/io/kokuwa/logback/logback-example.xml diff --git a/docs/features/logback_default.md b/docs/features/logback_default.md index 98ccbc5..3a73735 100644 --- a/docs/features/logback_default.md +++ b/docs/features/logback_default.md @@ -4,15 +4,15 @@ If no `logback.xml` by user is provided a default [logback.xml](../../src/main/r ```xml - + - + - + - - - + + + ``` diff --git a/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/resource-config.json b/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/resource-config.json index d1dfcab..46d679d 100644 --- a/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/resource-config.json +++ b/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/resource-config.json @@ -16,9 +16,6 @@ { "pattern": "\\Qio/kokuwa/logback/logback-default.xml\\E" }, - { - "pattern": "\\Qio/kokuwa/logback/logback-example.xml\\E" - }, { "pattern": "\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E" } diff --git a/src/main/resources/io/kokuwa/logback/logback-example.xml b/src/main/resources/io/kokuwa/logback/logback-example.xml deleted file mode 100644 index 47deab2..0000000 --- a/src/main/resources/io/kokuwa/logback/logback-example.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - From 491b2961f8af22ba4f6c42679d33539515962854 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Tue, 9 May 2023 09:32:04 +0200 Subject: [PATCH 104/195] Remove build instructions, update/release is done by ci with gpg signing (#142) --- README.md | 4 ---- docs/build.md | 23 ----------------------- 2 files changed, 27 deletions(-) delete mode 100644 docs/build.md diff --git a/README.md b/README.md index 13f87ec..cf471a0 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,6 @@ Include in your `pom.xml`: * [add HTTP header to MDC](docs/features/http_mdc_header.md) * [add authentication information from HTTP request to MDC](docs/features/http_mdc_authentication.md) -## Development - -* [build](docs/build.md) - ## Open Topics * configure mdc on refresh event diff --git a/docs/build.md b/docs/build.md deleted file mode 100644 index 0d2c727..0000000 --- a/docs/build.md +++ /dev/null @@ -1,23 +0,0 @@ -# Build & Release - -## Dependency updates - -Display dependency updates: - -```sh -mvn versions:display-parent-updates versions:display-property-updates -U -``` - -Update dependencies: - -```sh -mvn versions:update-parent versions:update-properties -``` - -## Release locally - -Run: - -```sh -mvn release:prepare release:perform release:clean -B -``` From e4b7b182672fdcdfbc348b4862c2eb9787d95a96 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Tue, 9 May 2023 09:33:33 +0200 Subject: [PATCH 105/195] Refactor `dependencyManagement` to enable includes, added it for this (#141) --- .github/dependabot.yml | 7 +- README.md | 23 +++ pom.xml | 64 ++++++- .../level-from-micronaut/invoker.properties | 1 + src/it/level-from-micronaut/pom.xml | 12 ++ src/it/level-from-micronaut/postbuild.bsh | 21 ++ src/it/log-gcp-from-env/invoker.properties | 1 + src/it/log-gcp-from-env/pom.xml | 12 ++ src/it/log-gcp-from-env/postbuild.bsh | 21 ++ src/it/log-gcp-from-gcloud/invoker.properties | 1 + src/it/log-gcp-from-gcloud/pom.xml | 12 ++ src/it/log-gcp-from-gcloud/postbuild.bsh | 21 ++ src/it/log-json-from-env/invoker.properties | 1 + src/it/log-json-from-env/pom.xml | 12 ++ src/it/log-json-from-env/postbuild.bsh | 21 ++ .../invoker.properties | 1 + src/it/log-json-from-kubernetes/pom.xml | 12 ++ src/it/log-json-from-kubernetes/postbuild.bsh | 21 ++ src/it/log-text/pom.xml | 12 ++ src/it/log-text/postbuild.bsh | 21 ++ src/it/logback-xml-custom/pom.xml | 12 ++ src/it/logback-xml-custom/postbuild.bsh | 21 ++ .../src/test/resources/logback.xml | 13 ++ src/it/pom.xml | 179 ++++++++++++++++++ .../kokuwa/micronaut/logging/LoggingTest.java | 13 ++ 25 files changed, 526 insertions(+), 9 deletions(-) create mode 100644 src/it/level-from-micronaut/invoker.properties create mode 100644 src/it/level-from-micronaut/pom.xml create mode 100644 src/it/level-from-micronaut/postbuild.bsh create mode 100644 src/it/log-gcp-from-env/invoker.properties create mode 100644 src/it/log-gcp-from-env/pom.xml create mode 100644 src/it/log-gcp-from-env/postbuild.bsh create mode 100644 src/it/log-gcp-from-gcloud/invoker.properties create mode 100644 src/it/log-gcp-from-gcloud/pom.xml create mode 100644 src/it/log-gcp-from-gcloud/postbuild.bsh create mode 100644 src/it/log-json-from-env/invoker.properties create mode 100644 src/it/log-json-from-env/pom.xml create mode 100644 src/it/log-json-from-env/postbuild.bsh create mode 100644 src/it/log-json-from-kubernetes/invoker.properties create mode 100644 src/it/log-json-from-kubernetes/pom.xml create mode 100644 src/it/log-json-from-kubernetes/postbuild.bsh create mode 100644 src/it/log-text/pom.xml create mode 100644 src/it/log-text/postbuild.bsh create mode 100644 src/it/logback-xml-custom/pom.xml create mode 100644 src/it/logback-xml-custom/postbuild.bsh create mode 100644 src/it/logback-xml-custom/src/test/resources/logback.xml create mode 100644 src/it/pom.xml create mode 100644 src/it/src/test/java/io/kokuwa/micronaut/logging/LoggingTest.java diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 22eb8a7..845e2ce 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,9 +11,14 @@ updates: time: "09:00" timezone: Europe/Berlin ignore: - # logback 1.3 and 1.4 are compatible with slf4j 2.x only + # logback 1.3 and 1.4 are compatible with slf4j 2.x only and not supported right now - dependency-name: ch.qos.logback:logback-classic update-types: [version-update:semver-major, version-update:semver-minor] + - dependency-name: org.slf4j:slf4j-api + update-types: [version-update:semver-major] + # micronaut 4 will ship logback 1.4 + - dependency-name: io.micronaut:* + update-types: [version-update:semver-major] - package-ecosystem: github-actions directory: / open-pull-requests-limit: 10 diff --git a/README.md b/README.md index cf471a0..2c09982 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,29 @@ Include in your `pom.xml`: ``` +Or use in `dependencyManagement` in `pom.xml`: + +```xml + + + + io.kokuwa.micronaut + micronaut-logging + ${version.io.kokuwa.micronaut.logging} + pom + import + + + io.micronaut + micronaut-bom + ${version.io.micronaut} + pom + import + + + +``` + ## Features * Version [3.x](https://github.com/kokuwaio/micronaut-logging/tree/main) is based on SLF4J 1.7 & Logback 1.2 diff --git a/pom.xml b/pom.xml index 69f60ed..a0db353 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.0.7-SNAPSHOT + 3.1.0-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -86,6 +86,7 @@ 3.1.1 3.0.1 3.1.1 + 3.5.1 3.5.0 3.3.0 3.0.0 @@ -101,20 +102,28 @@ 1.2.12 0.1.5 + ${project.version} 3.9.1 + 3.11.0 + 1.7.36 - - + + - io.micronaut - micronaut-bom - ${version.io.micronaut} - pom - import + io.kokuwa.micronaut + micronaut-logging + ${version.io.kokuwa.micronaut.logging} + + + + + org.slf4j + slf4j-api + ${version.org.slf4j.api} @@ -123,6 +132,11 @@ logback-classic ${version.ch.qos.logback} + + ch.qos.logback + logback-core + ${version.ch.qos.logback} + ch.qos.logback.contrib logback-json-classic @@ -147,31 +161,37 @@ io.micronaut micronaut-runtime + ${version.io.micronaut} provided io.micronaut.security micronaut-security + ${version.io.micronaut} provided io.micronaut.test micronaut-test-junit5 + ${version.io.micronaut} test io.micronaut micronaut-http-client + ${version.io.micronaut} test io.micronaut micronaut-http-server-netty + ${version.io.micronaut} test io.micronaut.security micronaut-security-jwt + ${version.io.micronaut} test @@ -258,6 +278,11 @@ maven-install-plugin ${version.org.apache.maven.plugins.install} + + org.apache.maven.plugins + maven-invoker-plugin + ${version.org.apache.maven.plugins.invoker} + org.apache.maven.plugins maven-jar-plugin @@ -276,6 +301,7 @@ @{project.version} release true + @{prefix} prepare release @{releaseLabel} [no ci] true @@ -311,6 +337,28 @@ + + + org.apache.maven.plugins + maven-invoker-plugin + + + + install + integration-test + verify + + + ${project.build.directory}/it + 1C + false + true + true + + + + + org.codehaus.mojo diff --git a/src/it/level-from-micronaut/invoker.properties b/src/it/level-from-micronaut/invoker.properties new file mode 100644 index 0000000..46bbf8c --- /dev/null +++ b/src/it/level-from-micronaut/invoker.properties @@ -0,0 +1 @@ +invoker.environmentVariables.LOGGER_LEVELS_IO_KOKUWA_MICRONAUT_LOGGING=DEBUG diff --git a/src/it/level-from-micronaut/pom.xml b/src/it/level-from-micronaut/pom.xml new file mode 100644 index 0000000..2a6450c --- /dev/null +++ b/src/it/level-from-micronaut/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + + @project.groupId@ + @project.artifactId@-it + LOCAL-SNAPSHOT + + + @project.artifactId@-it-level-from-micronaut + diff --git a/src/it/level-from-micronaut/postbuild.bsh b/src/it/level-from-micronaut/postbuild.bsh new file mode 100644 index 0000000..a280b60 --- /dev/null +++ b/src/it/level-from-micronaut/postbuild.bsh @@ -0,0 +1,21 @@ +// verify log + +String expected = "^[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{0,3} main DEBUG i.k.m.logging.LoggingTest test-output-marker$"; +String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n"); + +for (String log : logs) { + if (!log.contains("test-output-marker")) { + continue; + } + if (java.util.regex.Pattern.matches(expected, log)) { + return true; + } else { + System.out.println("marker found, but formatting invalid:"); + System.out.println("[EXPECTED] " + expected); + System.out.println("[ACTUAL] " + log); + return false; + } +} + +System.out.println("marker not found"); +return false; diff --git a/src/it/log-gcp-from-env/invoker.properties b/src/it/log-gcp-from-env/invoker.properties new file mode 100644 index 0000000..f9f63a8 --- /dev/null +++ b/src/it/log-gcp-from-env/invoker.properties @@ -0,0 +1 @@ +invoker.environmentVariables.LOGBACK_APPENDER=GCP diff --git a/src/it/log-gcp-from-env/pom.xml b/src/it/log-gcp-from-env/pom.xml new file mode 100644 index 0000000..1c56178 --- /dev/null +++ b/src/it/log-gcp-from-env/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + + @project.groupId@ + @project.artifactId@-it + LOCAL-SNAPSHOT + + + @project.artifactId@-it-log-gcp-from-env + diff --git a/src/it/log-gcp-from-env/postbuild.bsh b/src/it/log-gcp-from-env/postbuild.bsh new file mode 100644 index 0000000..d9e0657 --- /dev/null +++ b/src/it/log-gcp-from-env/postbuild.bsh @@ -0,0 +1,21 @@ +// verify log + +String expected = "^\\{\"time\":\"202[3-9]-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{0,3}Z\",\"severity\":\"INFO\",\"thread\":\"main\",\"logger\":\"io.kokuwa.micronaut.logging.LoggingTest\",\"message\":\"test-output-marker\",\"raw-message\":\"test-output-marker\"}$"; +String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n"); + +for (String log : logs) { + if (!log.contains("test-output-marker")) { + continue; + } + if (java.util.regex.Pattern.matches(expected, log)) { + return true; + } else { + System.out.println("marker found, but formatting invalid:"); + System.out.println("[EXPECTED] " + expected); + System.out.println("[ACTUAL] " + log); + return false; + } +} + +System.out.println("marker not found"); +return false; diff --git a/src/it/log-gcp-from-gcloud/invoker.properties b/src/it/log-gcp-from-gcloud/invoker.properties new file mode 100644 index 0000000..ec347b6 --- /dev/null +++ b/src/it/log-gcp-from-gcloud/invoker.properties @@ -0,0 +1 @@ +invoker.environmentVariables.GOOGLE_CLOUD_PROJECT=value diff --git a/src/it/log-gcp-from-gcloud/pom.xml b/src/it/log-gcp-from-gcloud/pom.xml new file mode 100644 index 0000000..0030546 --- /dev/null +++ b/src/it/log-gcp-from-gcloud/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + + @project.groupId@ + @project.artifactId@-it + LOCAL-SNAPSHOT + + + @project.artifactId@-it-log-gcp-from-gcloud + diff --git a/src/it/log-gcp-from-gcloud/postbuild.bsh b/src/it/log-gcp-from-gcloud/postbuild.bsh new file mode 100644 index 0000000..d9e0657 --- /dev/null +++ b/src/it/log-gcp-from-gcloud/postbuild.bsh @@ -0,0 +1,21 @@ +// verify log + +String expected = "^\\{\"time\":\"202[3-9]-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{0,3}Z\",\"severity\":\"INFO\",\"thread\":\"main\",\"logger\":\"io.kokuwa.micronaut.logging.LoggingTest\",\"message\":\"test-output-marker\",\"raw-message\":\"test-output-marker\"}$"; +String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n"); + +for (String log : logs) { + if (!log.contains("test-output-marker")) { + continue; + } + if (java.util.regex.Pattern.matches(expected, log)) { + return true; + } else { + System.out.println("marker found, but formatting invalid:"); + System.out.println("[EXPECTED] " + expected); + System.out.println("[ACTUAL] " + log); + return false; + } +} + +System.out.println("marker not found"); +return false; diff --git a/src/it/log-json-from-env/invoker.properties b/src/it/log-json-from-env/invoker.properties new file mode 100644 index 0000000..08de0de --- /dev/null +++ b/src/it/log-json-from-env/invoker.properties @@ -0,0 +1 @@ +invoker.environmentVariables.LOGBACK_APPENDER=JSON diff --git a/src/it/log-json-from-env/pom.xml b/src/it/log-json-from-env/pom.xml new file mode 100644 index 0000000..1ae3e61 --- /dev/null +++ b/src/it/log-json-from-env/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + + @project.groupId@ + @project.artifactId@-it + LOCAL-SNAPSHOT + + + @project.artifactId@-it-log-json-from-env + diff --git a/src/it/log-json-from-env/postbuild.bsh b/src/it/log-json-from-env/postbuild.bsh new file mode 100644 index 0000000..0693fe0 --- /dev/null +++ b/src/it/log-json-from-env/postbuild.bsh @@ -0,0 +1,21 @@ +// verify log + +String expected = "^\\{\"timestamp\":\"[0-9]{13}\",\"level\":\"INFO\",\"thread\":\"main\",\"logger\":\"io.kokuwa.micronaut.logging.LoggingTest\",\"message\":\"test-output-marker\",\"raw-message\":\"test-output-marker\"}$"; +String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n"); + +for (String log : logs) { + if (!log.contains("test-output-marker")) { + continue; + } + if (java.util.regex.Pattern.matches(expected, log)) { + return true; + } else { + System.out.println("marker found, but formatting invalid:"); + System.out.println("[EXPECTED] " + expected); + System.out.println("[ACTUAL] " + log); + return false; + } +} + +System.out.println("marker not found"); +return false; diff --git a/src/it/log-json-from-kubernetes/invoker.properties b/src/it/log-json-from-kubernetes/invoker.properties new file mode 100644 index 0000000..5bba112 --- /dev/null +++ b/src/it/log-json-from-kubernetes/invoker.properties @@ -0,0 +1 @@ +invoker.environmentVariables.KUBERNETES_SERVICE_HOST=value diff --git a/src/it/log-json-from-kubernetes/pom.xml b/src/it/log-json-from-kubernetes/pom.xml new file mode 100644 index 0000000..885bc3b --- /dev/null +++ b/src/it/log-json-from-kubernetes/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + + @project.groupId@ + @project.artifactId@-it + LOCAL-SNAPSHOT + + + @project.artifactId@-it-log-json-from-kubernetes + diff --git a/src/it/log-json-from-kubernetes/postbuild.bsh b/src/it/log-json-from-kubernetes/postbuild.bsh new file mode 100644 index 0000000..0693fe0 --- /dev/null +++ b/src/it/log-json-from-kubernetes/postbuild.bsh @@ -0,0 +1,21 @@ +// verify log + +String expected = "^\\{\"timestamp\":\"[0-9]{13}\",\"level\":\"INFO\",\"thread\":\"main\",\"logger\":\"io.kokuwa.micronaut.logging.LoggingTest\",\"message\":\"test-output-marker\",\"raw-message\":\"test-output-marker\"}$"; +String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n"); + +for (String log : logs) { + if (!log.contains("test-output-marker")) { + continue; + } + if (java.util.regex.Pattern.matches(expected, log)) { + return true; + } else { + System.out.println("marker found, but formatting invalid:"); + System.out.println("[EXPECTED] " + expected); + System.out.println("[ACTUAL] " + log); + return false; + } +} + +System.out.println("marker not found"); +return false; diff --git a/src/it/log-text/pom.xml b/src/it/log-text/pom.xml new file mode 100644 index 0000000..d245ffd --- /dev/null +++ b/src/it/log-text/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + + @project.groupId@ + @project.artifactId@-it + LOCAL-SNAPSHOT + + + @project.artifactId@-it-log-text + diff --git a/src/it/log-text/postbuild.bsh b/src/it/log-text/postbuild.bsh new file mode 100644 index 0000000..aa337ea --- /dev/null +++ b/src/it/log-text/postbuild.bsh @@ -0,0 +1,21 @@ +// verify log + +String expected = "^[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{0,3} main INFO i.k.m.logging.LoggingTest test-output-marker$"; +String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n"); + +for (String log : logs) { + if (!log.contains("test-output-marker")) { + continue; + } + if (java.util.regex.Pattern.matches(expected, log)) { + return true; + } else { + System.out.println("marker found, but formatting invalid:"); + System.out.println("[EXPECTED] " + expected); + System.out.println("[ACTUAL] " + log); + return false; + } +} + +System.out.println("marker not found"); +return false; diff --git a/src/it/logback-xml-custom/pom.xml b/src/it/logback-xml-custom/pom.xml new file mode 100644 index 0000000..d245ffd --- /dev/null +++ b/src/it/logback-xml-custom/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + + @project.groupId@ + @project.artifactId@-it + LOCAL-SNAPSHOT + + + @project.artifactId@-it-log-text + diff --git a/src/it/logback-xml-custom/postbuild.bsh b/src/it/logback-xml-custom/postbuild.bsh new file mode 100644 index 0000000..c6a3d94 --- /dev/null +++ b/src/it/logback-xml-custom/postbuild.bsh @@ -0,0 +1,21 @@ +// verify log + +String expected = "^TRACE io.kokuwa.micronaut.logging.LoggingTest test-output-marker$"; +String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n"); + +for (String log : logs) { + if (!log.contains("test-output-marker")) { + continue; + } + if (java.util.regex.Pattern.matches(expected, log)) { + return true; + } else { + System.out.println("marker found, but formatting invalid:"); + System.out.println("[EXPECTED] " + expected); + System.out.println("[ACTUAL] " + log); + return false; + } +} + +System.out.println("marker not found"); +return false; diff --git a/src/it/logback-xml-custom/src/test/resources/logback.xml b/src/it/logback-xml-custom/src/test/resources/logback.xml new file mode 100644 index 0000000..a704605 --- /dev/null +++ b/src/it/logback-xml-custom/src/test/resources/logback.xml @@ -0,0 +1,13 @@ + + + + + %-5level %logger{40} %msg%n + + + + + + + + diff --git a/src/it/pom.xml b/src/it/pom.xml new file mode 100644 index 0000000..0641bc1 --- /dev/null +++ b/src/it/pom.xml @@ -0,0 +1,179 @@ + + + 4.0.0 + + @project.groupId@ + @project.artifactId@-it + LOCAL-SNAPSHOT + pom + + + log-text + log-json-from-env + log-json-from-kubernetes + log-gcp-from-env + log-gcp-from-gcloud + level-from-micronaut + logback-xml-custom + + + + + + + + + @project.build.sourceEncoding@ + + @maven.compiler.source@ + @maven.compiler.target@ + true + true + true + true + false + + + + + + + + @version.org.apache.maven.plugins.compiler@ + @version.org.apache.maven.plugins.install@ + @version.org.apache.maven.plugins.jar@ + @version.org.apache.maven.plugins.resources@ + @version.org.apache.maven.plugins.surefire@ + + + + @version.io.kokuwa.micronaut.logging@ + @version.io.micronaut@ + + + + + + + io.kokuwa.micronaut + micronaut-logging + ${version.io.kokuwa.micronaut.logging} + pom + import + + + io.micronaut + micronaut-bom + ${version.io.micronaut} + pom + import + + + + + + + + io.micronaut + micronaut-runtime + + + io.micronaut.test + micronaut-test-junit5 + test + + + io.kokuwa.micronaut + micronaut-logging + runtime + + + + + + ${project.basedir}/../src/test/java + + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.org.apache.maven.plugins.compiler} + + + + io.micronaut + micronaut-inject-java + ${version.io.micronaut} + + + + + + org.apache.maven.plugins + maven-install-plugin + ${version.org.apache.maven.plugins.install} + + + org.apache.maven.plugins + maven-jar-plugin + ${version.org.apache.maven.plugins.jar} + + + org.apache.maven.plugins + maven-resources-plugin + ${version.org.apache.maven.plugins.resources} + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.org.apache.maven.plugins.surefire} + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + default-resources + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-compile + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + default-jar + + + + + + org.apache.maven.plugins + maven-install-plugin + + + default-install + + + + + + + + diff --git a/src/it/src/test/java/io/kokuwa/micronaut/logging/LoggingTest.java b/src/it/src/test/java/io/kokuwa/micronaut/logging/LoggingTest.java new file mode 100644 index 0000000..2d8463a --- /dev/null +++ b/src/it/src/test/java/io/kokuwa/micronaut/logging/LoggingTest.java @@ -0,0 +1,13 @@ +package io.kokuwa.micronaut.logging; + +@io.micronaut.test.extensions.junit5.annotation.MicronautTest +public class LoggingTest { + + @org.junit.jupiter.api.Test + void log() { + var log = org.slf4j.LoggerFactory.getLogger(LoggingTest.class); + log.trace("test-output-marker"); + log.debug("test-output-marker"); + log.info("test-output-marker"); + } +} From 92d6c62b174027584ba63d68478b8346dbd8f793 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 May 2023 07:35:41 +0000 Subject: [PATCH 106/195] Bump maven-gpg-plugin from 3.0.1 to 3.1.0 (#144) Bumps [maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.0.1 to 3.1.0. - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.0.1...maven-gpg-plugin-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0db353..eb8f12d 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 3.11.0 3.5.0 3.1.1 - 3.0.1 + 3.1.0 3.1.1 3.5.1 3.5.0 From d9744093e688ae615452d77c99c6bb48cc70ab3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 May 2023 07:35:47 +0000 Subject: [PATCH 107/195] Bump maven-surefire-plugin from 3.0.0 to 3.1.0 (#143) Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb8f12d..b7b3d83 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 3.0.0 3.3.1 3.2.1 - 3.0.0 + 3.1.0 1.2.0 1.6.13 10.10.0 From eea4e7169703f9256e55bae1fccfe4cc2889bc6a Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 10 May 2023 09:12:40 +0200 Subject: [PATCH 108/195] Set fixed version for `dependencyManagement` (#145) maven-release-plugin can handle this --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b7b3d83..f531869 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 1.2.12 0.1.5 - ${project.version} + 3.1.0-SNAPSHOT 3.9.1 3.11.0 1.7.36 @@ -111,7 +111,7 @@ - + io.kokuwa.micronaut From e461e78a212cbfd3829c72fe2073d2c91f2e1df1 Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Wed, 10 May 2023 07:15:38 +0000 Subject: [PATCH 109/195] [maven-release-plugin] prepare release 3.1.0 [no ci] --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f531869..85fd1ef 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.1.0-SNAPSHOT + 3.1.0 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.1.0 github @@ -102,7 +102,7 @@ 1.2.12 0.1.5 - 3.1.0-SNAPSHOT + 3.1.0 3.9.1 3.11.0 1.7.36 From 7fd89890115e49583fd7d03a5fc0bc16b6b24c0f Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Wed, 10 May 2023 07:15:41 +0000 Subject: [PATCH 110/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 85fd1ef..84fa2ee 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.1.0 + 3.1.1-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.1.0 + HEAD github @@ -102,7 +102,7 @@ 1.2.12 0.1.5 - 3.1.0 + 3.1.1-SNAPSHOT 3.9.1 3.11.0 1.7.36 From 2179afba578a1345f35afa2f964312d4310542b3 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Tue, 16 May 2023 09:24:40 +0200 Subject: [PATCH 111/195] Fix deprecated imports (#146) --- pom.xml | 16 ++++++++++++++++ .../io/kokuwa/micronaut/logging/LogbackUtil.java | 2 -- .../logging/http/level/LogLevelServerFilter.java | 5 ++--- .../logging/mdc/MDCTurboFilterConfigurer.java | 2 -- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 84fa2ee..ba4deeb 100644 --- a/pom.xml +++ b/pom.xml @@ -163,12 +163,28 @@ micronaut-runtime ${version.io.micronaut} provided + + + javax.annotation + javax.annotation-api + + io.micronaut.security micronaut-security ${version.io.micronaut} provided + + + io.micronaut + micronaut-http-server + + + io.micronaut + micronaut-validation + + io.micronaut.test diff --git a/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java b/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java index df1d6ab..f02ee78 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java +++ b/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java @@ -10,7 +10,6 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.turbo.TurboFilter; import io.micronaut.context.annotation.BootstrapContextCompatible; import io.micronaut.context.annotation.Requires; -import io.micronaut.core.annotation.Internal; import jakarta.inject.Singleton; /** @@ -21,7 +20,6 @@ import jakarta.inject.Singleton; @Requires(classes = LoggerContext.class) @BootstrapContextCompatible @Singleton -@Internal public class LogbackUtil { private final LoggerContext context; diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java index 0e5d07a..ae8475b 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java @@ -3,9 +3,6 @@ package io.kokuwa.micronaut.logging.http.level; import java.util.Map; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.reactivestreams.Publisher; import ch.qos.logback.classic.turbo.TurboFilter; @@ -20,6 +17,8 @@ import io.micronaut.http.annotation.Filter; import io.micronaut.http.filter.ServerFilterChain; import io.micronaut.http.filter.ServerFilterPhase; import io.micronaut.runtime.context.scope.Refreshable; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; /** * Http request logging filter. diff --git a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java index e3abfb4..5dfab9a 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java +++ b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java @@ -11,7 +11,6 @@ import io.micronaut.context.annotation.BootstrapContextCompatible; import io.micronaut.context.annotation.Context; import io.micronaut.context.annotation.Requires; import io.micronaut.context.env.Environment; -import io.micronaut.core.annotation.Internal; import io.micronaut.core.type.Argument; import io.micronaut.core.util.StringUtils; @@ -25,7 +24,6 @@ import io.micronaut.core.util.StringUtils; @Requires(property = MDCTurboFilterConfigurer.PREFIX + ".enabled", notEquals = StringUtils.FALSE) @BootstrapContextCompatible @Context -@Internal public class MDCTurboFilterConfigurer { public static final String PREFIX = "logger.mdc"; From cbe06a25f29dacf4b51e7ec36d72c2912ee7088b Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Tue, 16 May 2023 11:50:46 +0200 Subject: [PATCH 112/195] Build on version branches too (#148) --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index edc9809..ffeeea1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,7 +2,7 @@ name: CI on: push: - branches: [main] + branches: [main, "*.x"] pull_request: {} jobs: From 0ff96ad9ce384d1685460100f5c7f968adf4c195 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 11:27:57 +0000 Subject: [PATCH 113/195] Bump checkstyle from 10.10.0 to 10.11.0 (#150) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.10.0 to 10.11.0. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.10.0...checkstyle-10.11.0) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba4deeb..59a4286 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 3.1.0 1.2.0 1.6.13 - 10.10.0 + 10.11.0 0.5.6 From 909fd62283224f32c4ae9f76bc9691275c9408d0 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Tue, 16 May 2023 14:40:48 +0200 Subject: [PATCH 114/195] Add it for gcp with service context (#154) --- .../log-gcp-with-service/invoker.properties | 3 +++ src/it/log-gcp-with-service/pom.xml | 12 +++++++++++ src/it/log-gcp-with-service/postbuild.bsh | 21 +++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 src/it/log-gcp-with-service/invoker.properties create mode 100644 src/it/log-gcp-with-service/pom.xml create mode 100644 src/it/log-gcp-with-service/postbuild.bsh diff --git a/src/it/log-gcp-with-service/invoker.properties b/src/it/log-gcp-with-service/invoker.properties new file mode 100644 index 0000000..887fd80 --- /dev/null +++ b/src/it/log-gcp-with-service/invoker.properties @@ -0,0 +1,3 @@ +invoker.environmentVariables.LOGBACK_APPENDER=GCP +invoker.environmentVariables.SERVICE_NAME=test-service +invoker.environmentVariables.SERVICE_VERSION=0.1.2 diff --git a/src/it/log-gcp-with-service/pom.xml b/src/it/log-gcp-with-service/pom.xml new file mode 100644 index 0000000..f13550f --- /dev/null +++ b/src/it/log-gcp-with-service/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + + @project.groupId@ + @project.artifactId@-it + LOCAL-SNAPSHOT + + + @project.artifactId@-it-log-gcp-with-service + diff --git a/src/it/log-gcp-with-service/postbuild.bsh b/src/it/log-gcp-with-service/postbuild.bsh new file mode 100644 index 0000000..7ba1cab --- /dev/null +++ b/src/it/log-gcp-with-service/postbuild.bsh @@ -0,0 +1,21 @@ +// verify log + +String expected = "^\\{\"time\":\"202[3-9]-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{0,3}Z\",\"severity\":\"INFO\",\"thread\":\"main\",\"logger\":\"io.kokuwa.micronaut.logging.LoggingTest\",\"message\":\"test-output-marker\",\"raw-message\":\"test-output-marker\",\"serviceContext\":\\{\"version\":\"0.1.2\",\"service\":\"test-service\"}}$"; +String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n"); + +for (String log : logs) { + if (!log.contains("test-output-marker")) { + continue; + } + if (java.util.regex.Pattern.matches(expected, log)) { + return true; + } else { + System.out.println("marker found, but formatting invalid:"); + System.out.println("[EXPECTED] " + expected); + System.out.println("[ACTUAL] " + log); + return false; + } +} + +System.out.println("marker not found"); +return false; From 562cac6f896593b6ab7c4197065d690df715a6e7 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 17 May 2023 14:35:15 +0200 Subject: [PATCH 115/195] Remove unmaintained `logback-contrib` and replace by direct jackson (#155) --- pom.xml | 32 +-- src/it/log-gcp-with-service/postbuild.bsh | 2 +- .../logging/layout/GcpJsonLayout.java | 4 +- .../micronaut/logging/layout/JsonLayout.java | 182 ++++++++++++++++++ .../io/kokuwa/logback/appender-gcp.xml | 4 - .../io/kokuwa/logback/appender-json.xml | 7 +- 6 files changed, 194 insertions(+), 37 deletions(-) create mode 100644 src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java diff --git a/pom.xml b/pom.xml index 59a4286..7e0c704 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -101,8 +101,8 @@ 1.2.12 - 0.1.5 - 3.1.1-SNAPSHOT + 2.15.0 + 3.2.0-SNAPSHOT 3.9.1 3.11.0 1.7.36 @@ -138,19 +138,9 @@ ${version.ch.qos.logback} - ch.qos.logback.contrib - logback-json-classic - ${version.ch.qos.logback.contrib} - - - ch.qos.logback.contrib - logback-json-core - ${version.ch.qos.logback.contrib} - - - ch.qos.logback.contrib - logback-jackson - ${version.ch.qos.logback.contrib} + com.fasterxml.jackson.core + jackson-databind + ${version.com.fasterxml.jackson} @@ -217,13 +207,9 @@ logback-classic - ch.qos.logback.contrib - logback-json-classic - - - ch.qos.logback.contrib - logback-jackson - runtime + com.fasterxml.jackson.core + jackson-databind + provided diff --git a/src/it/log-gcp-with-service/postbuild.bsh b/src/it/log-gcp-with-service/postbuild.bsh index 7ba1cab..6264c10 100644 --- a/src/it/log-gcp-with-service/postbuild.bsh +++ b/src/it/log-gcp-with-service/postbuild.bsh @@ -1,6 +1,6 @@ // verify log -String expected = "^\\{\"time\":\"202[3-9]-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{0,3}Z\",\"severity\":\"INFO\",\"thread\":\"main\",\"logger\":\"io.kokuwa.micronaut.logging.LoggingTest\",\"message\":\"test-output-marker\",\"raw-message\":\"test-output-marker\",\"serviceContext\":\\{\"version\":\"0.1.2\",\"service\":\"test-service\"}}$"; +String expected = "^\\{\"time\":\"202[3-9]-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{0,3}Z\",\"severity\":\"INFO\",\"thread\":\"main\",\"logger\":\"io.kokuwa.micronaut.logging.LoggingTest\",\"message\":\"test-output-marker\",\"raw-message\":\"test-output-marker\",\"serviceContext\":\\{\"service\":\"test-service\",\"version\":\"0.1.2\"}}$"; String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n"); for (String log : logs) { diff --git a/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java index 139607c..524601c 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java +++ b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java @@ -1,12 +1,10 @@ package io.kokuwa.micronaut.logging.layout; import java.time.Instant; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.contrib.json.classic.JsonLayout; import io.micronaut.core.util.StringUtils; /** @@ -44,7 +42,7 @@ public class GcpJsonLayout extends JsonLayout { private void addServiceContext(Map map) { if (serviceContext == null) { - serviceContext = new HashMap<>(2); + serviceContext = new LinkedHashMap<>(2); if (StringUtils.isNotEmpty(serviceName) && !serviceName.endsWith(UNDEFINED)) { serviceContext.put("service", serviceName); } diff --git a/src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java b/src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java new file mode 100644 index 0000000..9617549 --- /dev/null +++ b/src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java @@ -0,0 +1,182 @@ +package io.kokuwa.micronaut.logging.layout; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.TimeZone; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import ch.qos.logback.classic.pattern.ThrowableHandlingConverter; +import ch.qos.logback.classic.pattern.ThrowableProxyConverter; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.CoreConstants; +import ch.qos.logback.core.LayoutBase; +import io.micronaut.http.MediaType; + +public class JsonLayout extends LayoutBase { + + public static final String TIMESTAMP_ATTR_NAME = "timestamp"; + public static final String LEVEL_ATTR_NAME = "level"; + public static final String THREAD_ATTR_NAME = "thread"; + public static final String MDC_ATTR_NAME = "mdc"; + public static final String LOGGER_ATTR_NAME = "logger"; + public static final String FORMATTED_MESSAGE_ATTR_NAME = "message"; + public static final String MESSAGE_ATTR_NAME = "raw-message"; + public static final String EXCEPTION_ATTR_NAME = "exception"; + public static final String CONTEXT_ATTR_NAME = "context"; + + private final ObjectMapper mapper = new ObjectMapper(); + + protected boolean includeLevel = true; + protected boolean includeThreadName = true; + protected boolean includeMDC = true; + protected boolean includeLoggerName = true; + protected boolean includeFormattedMessage = true; + protected boolean includeMessage = true; + protected boolean includeException = true; + protected boolean includeContextName = false; + protected boolean includeTimestamp = true; + private String timestampFormat; + private String timestampFormatTimezoneId; + private ThrowableHandlingConverter throwableHandlingConverter = new ThrowableProxyConverter(); + + @Override + public String getContentType() { + return MediaType.APPLICATION_JSON; + } + + @Override + public void start() { + this.throwableHandlingConverter.start(); + super.start(); + } + + @Override + public void stop() { + super.stop(); + this.throwableHandlingConverter.stop(); + } + + @Override + public String doLayout(ILoggingEvent event) { + var map = toJsonMap(event); + try { + return mapper.writeValueAsString(map) + CoreConstants.LINE_SEPARATOR; + } catch (JsonProcessingException e) { + addError("Failed to write json from event " + event + " and map " + map, e); + return null; + } + } + + protected Map toJsonMap(ILoggingEvent event) { + var map = new LinkedHashMap(); + addTimestamp(TIMESTAMP_ATTR_NAME, includeTimestamp, event.getTimeStamp(), map); + add(LEVEL_ATTR_NAME, includeLevel, String.valueOf(event.getLevel()), map); + add(THREAD_ATTR_NAME, includeThreadName, event.getThreadName(), map); + addMap(MDC_ATTR_NAME, includeMDC, event.getMDCPropertyMap(), map); + add(LOGGER_ATTR_NAME, includeLoggerName, event.getLoggerName(), map); + add(FORMATTED_MESSAGE_ATTR_NAME, includeFormattedMessage, event.getFormattedMessage(), map); + add(MESSAGE_ATTR_NAME, includeMessage, event.getMessage(), map); + add(CONTEXT_ATTR_NAME, includeContextName, event.getLoggerContextVO().getName(), map); + addThrowableInfo(EXCEPTION_ATTR_NAME, includeException, event, map); + return map; + } + + protected void addThrowableInfo(String fieldName, boolean field, ILoggingEvent value, Map map) { + if (field && value != null) { + var throwableProxy = value.getThrowableProxy(); + if (throwableProxy != null) { + var ex = throwableHandlingConverter.convert(value); + if (ex != null && !ex.equals("")) { + map.put(fieldName, ex); + } + } + } + } + + protected void addMap(String key, boolean field, Map mapValue, Map map) { + if (field && mapValue != null && !mapValue.isEmpty()) { + map.put(key, mapValue); + } + } + + protected void addTimestamp(String key, boolean field, long timeStamp, Map map) { + if (field) { + var formatted = formatTimestamp(timeStamp); + if (formatted != null) { + map.put(key, formatted); + } + } + } + + protected void add(String fieldName, boolean field, String value, Map map) { + if (field && value != null) { + map.put(fieldName, value); + } + } + + protected String formatTimestamp(long timestamp) { + if (timestampFormat == null || timestamp < 0) { + return String.valueOf(timestamp); + } + var date = new Date(timestamp); + var format = new SimpleDateFormat(timestampFormat); + if (timestampFormatTimezoneId != null) { + format.setTimeZone(TimeZone.getTimeZone(timestampFormatTimezoneId)); + } + return format.format(date); + } + + // setter + + public void setIncludeLevel(boolean includeLevel) { + this.includeLevel = includeLevel; + } + + public void setIncludeThreadName(boolean includeThreadName) { + this.includeThreadName = includeThreadName; + } + + public void setIncludeMDC(boolean includeMDC) { + this.includeMDC = includeMDC; + } + + public void setIncludeLoggerName(boolean includeLoggerName) { + this.includeLoggerName = includeLoggerName; + } + + public void setIncludeFormattedMessage(boolean includeFormattedMessage) { + this.includeFormattedMessage = includeFormattedMessage; + } + + public void setIncludeMessage(boolean includeMessage) { + this.includeMessage = includeMessage; + } + + public void setIncludeException(boolean includeException) { + this.includeException = includeException; + } + + public void setIncludeContextName(boolean includeContextName) { + this.includeContextName = includeContextName; + } + + public void setIncludeTimestamp(boolean includeTimestamp) { + this.includeTimestamp = includeTimestamp; + } + + public void setTimestampFormat(String timestampFormat) { + this.timestampFormat = timestampFormat; + } + + public void setTimestampFormatTimezoneId(String timestampFormatTimezoneId) { + this.timestampFormatTimezoneId = timestampFormatTimezoneId; + } + + public void setThrowableHandlingConverter(ThrowableHandlingConverter throwableHandlingConverter) { + this.throwableHandlingConverter = throwableHandlingConverter; + } +} diff --git a/src/main/resources/io/kokuwa/logback/appender-gcp.xml b/src/main/resources/io/kokuwa/logback/appender-gcp.xml index e847d99..a36210d 100644 --- a/src/main/resources/io/kokuwa/logback/appender-gcp.xml +++ b/src/main/resources/io/kokuwa/logback/appender-gcp.xml @@ -6,10 +6,6 @@ ${SERVICE_NAME} ${SERVICE_VERSION} - - true - true - false diff --git a/src/main/resources/io/kokuwa/logback/appender-json.xml b/src/main/resources/io/kokuwa/logback/appender-json.xml index b850ac7..e0034e4 100644 --- a/src/main/resources/io/kokuwa/logback/appender-json.xml +++ b/src/main/resources/io/kokuwa/logback/appender-json.xml @@ -3,12 +3,7 @@ - - - true - true - false - + From d57c2f05807ca9f0beb5999f6710c1337480bf3a Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Wed, 17 May 2023 12:37:35 +0000 Subject: [PATCH 116/195] [maven-release-plugin] prepare release 3.2.0 [no ci] --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7e0c704..af77833 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.2.0-SNAPSHOT + 3.2.0 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.2.0 github @@ -102,7 +102,7 @@ 1.2.12 2.15.0 - 3.2.0-SNAPSHOT + 3.2.0 3.9.1 3.11.0 1.7.36 From 7e56003ba384422d0e44fec75fb9d56b282c3651 Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Wed, 17 May 2023 12:37:38 +0000 Subject: [PATCH 117/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index af77833..cc04ebf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.2.0 + 3.2.1-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.2.0 + HEAD github @@ -102,7 +102,7 @@ 1.2.12 2.15.0 - 3.2.0 + 3.2.1-SNAPSHOT 3.9.1 3.11.0 1.7.36 From ed2420a32ff7229f837b4ab677ffc04f2920190e Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Sun, 2 Jul 2023 14:57:55 +0200 Subject: [PATCH 118/195] Migrate to kokuwa parent (#174) --- .github/dependabot.yml | 10 - .github/settings.xml | 16 ++ .github/workflows/build.yaml | 31 +++ .github/workflows/ci.yaml | 70 ------- .github/workflows/pr.yaml | 41 ++++ .github/workflows/release.yaml | 11 +- README.md | 27 +-- pom.xml | 347 ++++----------------------------- src/it/pom.xml | 4 +- 9 files changed, 140 insertions(+), 417 deletions(-) create mode 100644 .github/settings.xml create mode 100644 .github/workflows/build.yaml delete mode 100644 .github/workflows/ci.yaml create mode 100644 .github/workflows/pr.yaml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 845e2ce..11db3f6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,14 +2,9 @@ version: 2 updates: - package-ecosystem: maven directory: / - open-pull-requests-limit: 20 schedule: interval: monthly day: monday - # github parses time without quotes to int - # yamllint disable-line rule:quoted-strings - time: "09:00" - timezone: Europe/Berlin ignore: # logback 1.3 and 1.4 are compatible with slf4j 2.x only and not supported right now - dependency-name: ch.qos.logback:logback-classic @@ -21,11 +16,6 @@ updates: update-types: [version-update:semver-major] - package-ecosystem: github-actions directory: / - open-pull-requests-limit: 10 schedule: interval: monthly day: monday - # github parses time without quotes to int - # yamllint disable-line rule:quoted-strings - time: "09:00" - timezone: Europe/Berlin diff --git a/.github/settings.xml b/.github/settings.xml new file mode 100644 index 0000000..44fd9ea --- /dev/null +++ b/.github/settings.xml @@ -0,0 +1,16 @@ + + + + + + sonatype-nexus + ${env.SERVER_USERNAME} + ${env.SERVER_PASSWORD} + + + github.com + nope + ${env.GIT_ACTION_TOKEN} + + + diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..fb0ccb5 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,31 @@ +name: Build + +on: + push: + branches: [main] + +jobs: + + build: + runs-on: ubuntu-latest + env: + MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress --settings=.github/settings.xml + steps: + - run: git config --global user.name "${{ vars.KOKUWA_IO_BOT_NAME }}" + - run: git config --global user.email "${{ vars.KOKUWA_IO_BOT_EMAIL }}" + - uses: actions/checkout@v3 + with: + token: ${{ secrets.GIT_ACTION_TOKEN }} + - uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + cache: maven + - run: mvn $MAVEN_ARGS dependency:go-offline + - run: mvn $MAVEN_ARGS deploy + env: + SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} + SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} + - run: mvn $MAVEN_ARGS site-deploy + env: + GIT_ACTION_TOKEN: ${{ secrets.GIT_ACTION_TOKEN }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml deleted file mode 100644 index ffeeea1..0000000 --- a/.github/workflows/ci.yaml +++ /dev/null @@ -1,70 +0,0 @@ -name: CI - -on: - push: - branches: [main, "*.x"] - pull_request: {} - -jobs: - - yaml: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: ibiqlik/action-yamllint@v3 - with: - format: colored - strict: true - - markdown: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: avto-dev/markdown-lint@v1 - with: - args: /github/workspace - - javadoc: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: 11 - cache: maven - - run: mvn -B -ntp dependency:go-offline - - run: mvn -B -ntp javadoc:javadoc-no-fork -Dmaven.javadoc.failOnWarnings=true -Ddoclint=all - - checkstyle: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: 11 - cache: maven - - run: mvn -B -ntp dependency:go-offline - - run: mvn -B -ntp checkstyle:check - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: 11 - cache: maven - server-id: sonatype-nexus - server-username: SERVER_USERNAME - server-password: SERVER_PASSWORD - - run: mvn -B -ntp dependency:go-offline - - run: mvn -B -ntp verify -Dcheckstyle.skip - if: ${{ github.ref != 'refs/heads/main' }} - - run: mvn -B -ntp deploy -Dcheckstyle.skip - if: ${{ github.ref == 'refs/heads/main' }} - env: - SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml new file mode 100644 index 0000000..2034d14 --- /dev/null +++ b/.github/workflows/pr.yaml @@ -0,0 +1,41 @@ +name: PullRequest + +on: pull_request + +jobs: + + yaml: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: ibiqlik/action-yamllint@v3 + with: + format: colored + strict: true + + markdown: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: avto-dev/markdown-lint@v1 + with: + args: /github/workspace + + build: + runs-on: ubuntu-latest + env: + MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress -Dmaven.test.redirectTestOutputToFile=false + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + cache: maven + - run: mvn $MAVEN_ARGS dependency:go-offline + - run: mvn $MAVEN_ARGS verify + - run: mvn $MAVEN_ARGS site + - uses: actions/upload-artifact@v3 + if: always() + with: + path: target/site diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4f561a0..22c372f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -5,7 +5,11 @@ on: workflow_dispatch jobs: build: runs-on: ubuntu-latest + env: + MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress --settings=.github/settings.xml steps: + - run: git config --global user.name "${{ vars.KOKUWA_IO_BOT_NAME }}" + - run: git config --global user.email "${{ vars.KOKUWA_IO_BOT_EMAIL }}" - uses: actions/checkout@v3 with: token: ${{ secrets.GIT_ACTION_TOKEN }} @@ -25,10 +29,11 @@ jobs: server-password: SERVER_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE - - run: mvn -B -ntp dependency:go-offline - - run: mvn -B -ntp release:prepare - - run: mvn -B -ntp release:perform + - run: mvn $MAVEN_ARGS dependency:go-offline + - run: mvn $MAVEN_ARGS release:prepare -Darguments="$MAVEN_ARGS" + - run: mvn $MAVEN_ARGS release:perform -Darguments="$MAVEN_ARGS" env: SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} + GIT_ACTION_TOKEN: ${{ secrets.GIT_ACTION_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} diff --git a/README.md b/README.md index 2c09982..d8eec89 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,7 @@ [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/kokuwaio/micronaut-logging.svg?label=License)](http://www.apache.org/licenses/) [![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://central.sonatype.com/namespace/io.kokuwa.micronaut) -[![CI](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/ci.yaml?branch=main&label=3.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/ci.yaml?query=branch%3Amain) -[![CI](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/ci.yaml?branch=4.x&label=4.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/ci.yaml?query=branch%3A4.x) +[![Build](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/build.yaml?label=Build)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/build.yaml) Include in your `pom.xml`: @@ -16,29 +15,6 @@ Include in your `pom.xml`: ``` -Or use in `dependencyManagement` in `pom.xml`: - -```xml - - - - io.kokuwa.micronaut - micronaut-logging - ${version.io.kokuwa.micronaut.logging} - pom - import - - - io.micronaut - micronaut-bom - ${version.io.micronaut} - pom - import - - - -``` - ## Features * Version [3.x](https://github.com/kokuwaio/micronaut-logging/tree/main) is based on SLF4J 1.7 & Logback 1.2 @@ -56,4 +32,3 @@ Or use in `dependencyManagement` in `pom.xml`: * configure mdc on refresh event * read **serviceName** and **serviceVersion** from yaml * support auto select appender with custom `logback.xml` -* add maven site with jacoco / dependency updates for snapshot build diff --git a/pom.xml b/pom.xml index cc04ebf..ca2fdae 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,16 @@ 4.0.0 + + io.kokuwa.maven + maven-parent + 0.6.9 + + + io.kokuwa.micronaut micronaut-logging - 3.2.1-SNAPSHOT + 3.3.0-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -16,8 +23,9 @@ - Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0 + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo @@ -25,10 +33,11 @@ sschnabe Stephan Schnabel - https://github.com/sschnabe stephan@grayc.de + https://github.com/sschnabe GrayC GmbH https://grayc.de + Europe/Berlin @@ -46,16 +55,6 @@ github https://github.com/kokuwaio/micronaut-logging/actions - - - sonatype-nexus - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - @@ -63,86 +62,26 @@ - UTF-8 - 11 11 - true - true - true - true - true - - - 3.2.2 - 3.2.0 - 3.11.0 - 3.5.0 - 3.1.1 - 3.1.0 - 3.1.1 - 3.5.1 - 3.5.0 - 3.3.0 - 3.0.0 - 3.3.1 - 3.2.1 - 3.1.0 - 1.2.0 - 1.6.13 - 10.11.0 - 0.5.6 - - - - 1.2.12 - 2.15.0 - 3.2.1-SNAPSHOT - 3.9.1 - 3.11.0 - 1.7.36 + 3.9.4 - - - io.kokuwa.micronaut - micronaut-logging - ${version.io.kokuwa.micronaut.logging} + io.micronaut + micronaut-bom + ${version.io.micronaut} + pom + import - - - - org.slf4j - slf4j-api - ${version.org.slf4j.api} - - - - - ch.qos.logback - logback-classic - ${version.ch.qos.logback} - - - ch.qos.logback - logback-core - ${version.ch.qos.logback} - - - com.fasterxml.jackson.core - jackson-databind - ${version.com.fasterxml.jackson} - - @@ -151,7 +90,6 @@ io.micronaut micronaut-runtime - ${version.io.micronaut} provided @@ -163,7 +101,6 @@ io.micronaut.security micronaut-security - ${version.io.micronaut} provided @@ -179,166 +116,58 @@ io.micronaut.test micronaut-test-junit5 - ${version.io.micronaut} test io.micronaut micronaut-http-client - ${version.io.micronaut} test io.micronaut micronaut-http-server-netty - ${version.io.micronaut} test io.micronaut.security micronaut-security-jwt - ${version.io.micronaut} test - + + + org.slf4j + slf4j-api + ch.qos.logback logback-classic - com.fasterxml.jackson.core - jackson-databind - provided + ch.qos.logback + logback-core - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${version.org.apache.maven.plugins.checkstyle} - - checkstyle.xml - checkstyle-suppression.xml - true - - - - com.puppycrawl.tools - checkstyle - ${version.com.puppycrawl.tools.checkstyle} - - - io.kokuwa - maven-parent - ${version.io.kokuwa.checkstyle} - zip - checkstyle - - - - - org.apache.maven.plugins - maven-clean-plugin - ${version.org.apache.maven.plugins.clean} - - - org.apache.maven.plugins - maven-compiler-plugin - ${version.org.apache.maven.plugins.compiler} - - - - io.micronaut - micronaut-inject-java - ${version.io.micronaut} - - - - - - org.apache.maven.plugins - maven-dependency-plugin - ${version.org.apache.maven.plugins.dependency} - - - org.apache.maven.plugins - maven-deploy-plugin - ${version.org.apache.maven.plugins.deploy} - - - org.apache.maven.plugins - maven-gpg-plugin - ${version.org.apache.maven.plugins.gpg} - - - org.apache.maven.plugins - maven-install-plugin - ${version.org.apache.maven.plugins.install} - - - org.apache.maven.plugins - maven-invoker-plugin - ${version.org.apache.maven.plugins.invoker} - - - org.apache.maven.plugins - maven-jar-plugin - ${version.org.apache.maven.plugins.jar} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${version.org.apache.maven.plugins.javadoc} - - - org.apache.maven.plugins - maven-release-plugin - ${version.org.apache.maven.plugins.release} - - @{project.version} - release - true - @{prefix} prepare release @{releaseLabel} [no ci] - true - - - - org.apache.maven.plugins - maven-resources-plugin - ${version.org.apache.maven.plugins.resources} - - - org.apache.maven.plugins - maven-source-plugin - ${version.org.apache.maven.plugins.source} - - - org.apache.maven.plugins - maven-surefire-plugin - ${version.org.apache.maven.plugins.surefire} - - true - - - - org.codehaus.mojo - tidy-maven-plugin - ${version.org.codehaus.mojo.tidy} - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${version.org.sonatype.plugins.nexus-staging} - - - + + + org.apache.maven.plugins + maven-compiler-plugin + + + + io.micronaut + micronaut-inject-java + ${version.io.micronaut} + + + + + org.apache.maven.plugins @@ -351,104 +180,12 @@ verify - ${project.build.directory}/it - 1C - false - true - true + 0.5C - - - org.codehaus.mojo - tidy-maven-plugin - - - - check - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - check - - - - - - - - - release - - - - - - org.apache.maven.plugins - maven-source-plugin - - - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - jar - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - - sign - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - sonatype-nexus - https://oss.sonatype.org/ - true - - - - - - - diff --git a/src/it/pom.xml b/src/it/pom.xml index 0641bc1..0e43366 100644 --- a/src/it/pom.xml +++ b/src/it/pom.xml @@ -47,7 +47,7 @@ - @version.io.kokuwa.micronaut.logging@ + @project.version@ @version.io.micronaut@ @@ -58,8 +58,6 @@ io.kokuwa.micronaut micronaut-logging ${version.io.kokuwa.micronaut.logging} - pom - import io.micronaut From cd2d5cc54558e8a44a026f161014502997ef9f8f Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Sun, 2 Jul 2023 20:05:44 +0000 Subject: [PATCH 119/195] [maven-release-plugin] prepare release 3.3.0 [no ci] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ca2fdae..4d24236 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 3.3.0-SNAPSHOT + 3.3.0 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -45,7 +45,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 3.3.0 github From 52a0478cf13c130bae8cc5759a1df258f6e7b111 Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Sun, 2 Jul 2023 20:05:48 +0000 Subject: [PATCH 120/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4d24236..d654f86 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 3.3.0 + 3.3.1-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -45,7 +45,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 3.3.0 + HEAD github From 90a2d223b26033893b21124bd6a2c29aa70f3381 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Sun, 2 Jul 2023 15:56:57 +0200 Subject: [PATCH 121/195] Prepare version 4.x for current slf4j/logback/micronaut versions (#147) --- .github/workflows/build.yaml | 2 +- README.md | 7 ++++--- pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fb0ccb5..c707358 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,7 +2,7 @@ name: Build on: push: - branches: [main] + branches: [main, "*.x"] jobs: diff --git a/README.md b/README.md index d8eec89..2d20fba 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/kokuwaio/micronaut-logging.svg?label=License)](http://www.apache.org/licenses/) [![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://central.sonatype.com/namespace/io.kokuwa.micronaut) -[![Build](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/build.yaml?label=Build)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/build.yaml) +[![Build](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/build.yaml?branch=3.x&label=3.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/build.yaml?query=branch%3A3.x) +[![Build](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/build.yaml?branch=main&label=4.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/build.yaml?query=branch%3Amain) Include in your `pom.xml`: @@ -17,8 +18,8 @@ Include in your `pom.xml`: ## Features -* Version [3.x](https://github.com/kokuwaio/micronaut-logging/tree/main) is based on SLF4J 1.7 & Logback 1.2 -* Version [4.x](https://github.com/kokuwaio/micronaut-logging/tree/4.x) is based on SLF4J 2.0 & Logback 1.4 (WIP) +* Version [3.x](https://github.com/kokuwaio/micronaut-logging/tree/3.x) is based on SLF4J 1.7 & Logback 1.2 & Micronaut 3.x +* Version [4.x](https://github.com/kokuwaio/micronaut-logging/tree/main) is based on SLF4J 2.0 & Logback 1.4 & Micronaut 4.x * [set log level based on MDC values](docs/features/logback_mdc_level.md) * [add default xml](docs/features/logback_default.md) * [preconfigured appender for different environments](docs/features/logback_appender.md) diff --git a/pom.xml b/pom.xml index d654f86..1c4410d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ io.kokuwa.maven maven-parent - 0.6.9 + 0.6.10 io.kokuwa.micronaut micronaut-logging - 3.3.1-SNAPSHOT + 4.0.0-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. From ea7aa1ab1670e32ba7b1af73b7133c0fee795d66 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Sun, 2 Jul 2023 16:12:38 +0200 Subject: [PATCH 122/195] Bump slf4j to 2.x and logback to 1.4 --- docs/features/logback_appender.md | 2 - docs/features/logback_default.md | 2 - pom.xml | 20 ++++ src/it/pom.xml | 17 +++ .../configurator/DefaultConfigurator.java | 14 ++- .../MicronautJoranConfigurator.java | 6 +- .../RootAutoSelectAppenderAction.java | 112 ++++++++++++++---- .../micronaut-logging/resource-config.json | 12 -- .../io/kokuwa/logback/appender-console.xml | 12 -- .../io/kokuwa/logback/appender-gcp.xml | 13 -- .../io/kokuwa/logback/appender-json.xml | 10 -- src/main/resources/io/kokuwa/logback/base.xml | 8 -- .../io/kokuwa/logback/logback-default.xml | 2 - 13 files changed, 137 insertions(+), 93 deletions(-) delete mode 100644 src/main/resources/io/kokuwa/logback/appender-console.xml delete mode 100644 src/main/resources/io/kokuwa/logback/appender-gcp.xml delete mode 100644 src/main/resources/io/kokuwa/logback/appender-json.xml delete mode 100644 src/main/resources/io/kokuwa/logback/base.xml diff --git a/docs/features/logback_appender.md b/docs/features/logback_appender.md index 1975e8b..d71885b 100644 --- a/docs/features/logback_appender.md +++ b/docs/features/logback_appender.md @@ -12,5 +12,3 @@ 2. if GCP is detected gcp appender will be used 3. if Kubernetes is detected json appender will be used 4. console appender else - -*IMPORTENT*: only works without custom `logback.xml` diff --git a/docs/features/logback_default.md b/docs/features/logback_default.md index 3a73735..5b34f1a 100644 --- a/docs/features/logback_default.md +++ b/docs/features/logback_default.md @@ -6,8 +6,6 @@ If no `logback.xml` by user is provided a default [logback.xml](../../src/main/r - - diff --git a/pom.xml b/pom.xml index 1c4410d..940c33a 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,8 @@ 3.9.4 + 2.0.7 + 1.4.8 @@ -82,6 +84,21 @@ pom import + + org.slf4j + slf4j-api + ${version.org.slf4j} + + + ch.qos.logback + logback-classic + ${version.ch.qos.logback} + + + ch.qos.logback + logback-core + ${version.ch.qos.logback} + @@ -181,6 +198,9 @@ 0.5C + + + level-from-micronaut/pom.xml diff --git a/src/it/pom.xml b/src/it/pom.xml index 0e43366..e03c4d5 100644 --- a/src/it/pom.xml +++ b/src/it/pom.xml @@ -49,6 +49,8 @@ @project.version@ @version.io.micronaut@ + @version.org.slf4j@ + @version.ch.qos.logback@ @@ -66,6 +68,21 @@ pom import + + org.slf4j + slf4j-api + ${version.org.slf4j} + + + ch.qos.logback + logback-classic + ${version.ch.qos.logback} + + + ch.qos.logback + logback-core + ${version.ch.qos.logback} + diff --git a/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java b/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java index 1d808a9..f84feb8 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java +++ b/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java @@ -1,8 +1,8 @@ package io.kokuwa.micronaut.logging.configurator; -import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.Configurator; +import ch.qos.logback.classic.util.DefaultJoranConfigurator; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.spi.ContextAwareBase; @@ -14,12 +14,17 @@ import ch.qos.logback.core.spi.ContextAwareBase; public class DefaultConfigurator extends ContextAwareBase implements Configurator { @Override - public void configure(LoggerContext loggerContext) { + public ExecutionStatus configure(LoggerContext loggerContext) { + + if (new DefaultJoranConfigurator().findURLOfDefaultConfigurationFile(false) != null) { + // there is a default logback file, use this one instead of our default + return ExecutionStatus.INVOKE_NEXT_IF_ANY; + } var base = DefaultConfigurator.class.getResource("/io/kokuwa/logback/logback-default.xml"); if (base == null) { addError("Failed to find logback.xml from io.kokuwa:micronaut-logging"); - return; + return ExecutionStatus.NEUTRAL; } try { @@ -29,8 +34,9 @@ public class DefaultConfigurator extends ContextAwareBase implements Configurato configurator.doConfigure(base); } catch (JoranException e) { addError("Failed to load logback.xml from io.kokuwa:micronaut-logging", e); + return ExecutionStatus.NEUTRAL; } - loggerContext.getLogger("io.micronaut.logging.PropertiesLoggingLevelsConfigurer").setLevel(Level.WARN); + return ExecutionStatus.DO_NOT_INVOKE_NEXT_IF_ANY; } } diff --git a/src/main/java/io/kokuwa/micronaut/logging/configurator/MicronautJoranConfigurator.java b/src/main/java/io/kokuwa/micronaut/logging/configurator/MicronautJoranConfigurator.java index f89db16..a1010d7 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/configurator/MicronautJoranConfigurator.java +++ b/src/main/java/io/kokuwa/micronaut/logging/configurator/MicronautJoranConfigurator.java @@ -12,8 +12,8 @@ import ch.qos.logback.core.joran.spi.RuleStore; public class MicronautJoranConfigurator extends JoranConfigurator { @Override - public void addInstanceRules(RuleStore rs) { - super.addInstanceRules(rs); - rs.addRule(new ElementSelector("configuration/root/autoAppender"), new RootAutoSelectAppenderAction()); + public void addElementSelectorAndActionAssociations(RuleStore rs) { + super.addElementSelectorAndActionAssociations(rs); + rs.addRule(new ElementSelector("configuration/root/autoAppender"), () -> new RootAutoSelectAppenderAction()); } } diff --git a/src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java b/src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java index b490a35..1353690 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java +++ b/src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java @@ -1,16 +1,18 @@ package io.kokuwa.micronaut.logging.configurator; -import java.util.Map; - -import org.xml.sax.Attributes; +import java.util.Optional; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.PatternLayout; import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.Appender; +import ch.qos.logback.core.ConsoleAppender; +import ch.qos.logback.core.Layout; +import ch.qos.logback.core.encoder.LayoutWrappingEncoder; import ch.qos.logback.core.joran.action.Action; -import ch.qos.logback.core.joran.action.ActionConst; -import ch.qos.logback.core.joran.spi.InterpretationContext; +import ch.qos.logback.core.joran.spi.SaxEventInterpretationContext; +import io.kokuwa.micronaut.logging.layout.GcpJsonLayout; +import io.kokuwa.micronaut.logging.layout.JsonLayout; import io.micronaut.core.util.StringUtils; /** @@ -27,9 +29,16 @@ public class RootAutoSelectAppenderAction extends Action { private static final String APPENDER_JSON = "JSON"; private static final String APPENDER_GCP = "GCP"; private static final String LOGBACK_APPENDER = "LOGBACK_APPENDER"; + private static final String LOGBACK_PATTERN = "LOGBACK_PATTERN"; + private static final String LOGBACK_PATTERN_DEFAULT = "%cyan(%d{HH:mm:ss.SSS})" + + " %gray(%-6.6thread)" + + " %highlight(%-5level)" + + " %magenta(%32logger{32})" + + " %mdc" + + " %msg%n"; @Override - public void begin(InterpretationContext ic, String name, Attributes attributes) { + public void begin(SaxEventInterpretationContext ic, String name, org.xml.sax.Attributes attributes) { var rootLogger = LoggerContext.class.cast(context).getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); var rootLoggerAppenders = rootLogger.iteratorForAppenders(); @@ -38,36 +47,89 @@ public class RootAutoSelectAppenderAction extends Action { return; } - var envAppender = System.getenv(LOGBACK_APPENDER); - if (envAppender != null && setAppender(ic, rootLogger, envAppender)) { + var envAppender = env(LOGBACK_APPENDER, null); + if (envAppender != null) { + setAppender(rootLogger, envAppender); return; } - if (IS_KUBERNETES && setAppender(ic, rootLogger, APPENDER_JSON)) { + if (IS_KUBERNETES) { + setAppender(rootLogger, APPENDER_JSON); return; } - if (IS_GCP && setAppender(ic, rootLogger, APPENDER_GCP)) { + if (IS_GCP) { + setAppender(rootLogger, APPENDER_GCP); return; } - setAppender(ic, rootLogger, APPENDER_CONSOLE); + setAppender(rootLogger, APPENDER_CONSOLE); } @Override - public void end(InterpretationContext ic, String name) {} - - private boolean setAppender(InterpretationContext ic, Logger rootLogger, String appenderName) { - - @SuppressWarnings("unchecked") - var appenderBag = (Map>) ic.getObjectMap().get(ActionConst.APPENDER_BAG); - var appender = appenderBag.get(appenderName); - if (appender == null) { - addError("Could not find an appender named [" + appenderName - + "]. Did you define it below instead of above in the configuration file?"); - return false; - } + public void end(SaxEventInterpretationContext ic, String name) {} + private void setAppender(Logger rootLogger, String appenderName) { addInfo("Use appender: " + appenderName); + + Layout layout; + switch (appenderName) { + case APPENDER_JSON: + layout = json(); + break; + case APPENDER_GCP: + layout = gcp(); + break; + case APPENDER_CONSOLE: + layout = console(); + break; + default: + addError("Appender " + appenderName + " not found. Using console ..."); + layout = console(); + } + layout.start(); + + var encoder = new LayoutWrappingEncoder(); + encoder.setContext(context); + encoder.setLayout(layout); + encoder.start(); + + var appender = new ConsoleAppender(); + appender.setContext(context); + appender.setName(appenderName); + appender.setEncoder(encoder); + appender.start(); + rootLogger.addAppender(appender); - return true; + } + + private Layout console() { + var layout = new PatternLayout(); + layout.setContext(context); + layout.setPattern(env(LOGBACK_PATTERN, LOGBACK_PATTERN_DEFAULT)); + return layout; + } + + private Layout json() { + var layout = new JsonLayout(); + layout.setContext(context); + return layout; + } + + private Layout gcp() { + var layout = new GcpJsonLayout(); + layout.setContext(context); + layout.setServiceName(env("SERVICE_NAME", null)); + layout.setServiceVersion(env("SERVICE_VERSION", null)); + return layout; + } + + private String env(String name, String defaultValue) { + var envValue = Optional.ofNullable(System.getenv(name)).map(String::trim).filter(StringUtils::isNotEmpty); + var finalValue = envValue.orElse(defaultValue); + if (envValue.isPresent()) { + addInfo("Use provided config: " + name + "=" + finalValue); + } else { + addInfo("Use default config: " + name + "=" + finalValue); + } + return finalValue; } } diff --git a/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/resource-config.json b/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/resource-config.json index 46d679d..3a97089 100644 --- a/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/resource-config.json +++ b/src/main/resources/META-INF/native-image/io.kokuwa.micronaut/micronaut-logging/resource-config.json @@ -1,18 +1,6 @@ { "resources": { "includes": [ - { - "pattern": "\\Qio/kokuwa/logback/appender-console.xml\\E" - }, - { - "pattern": "\\Qio/kokuwa/logback/appender-gcp.xml\\E" - }, - { - "pattern": "\\Qio/kokuwa/logback/appender-json.xml\\E" - }, - { - "pattern": "\\Qio/kokuwa/logback/base.xml\\E" - }, { "pattern": "\\Qio/kokuwa/logback/logback-default.xml\\E" }, diff --git a/src/main/resources/io/kokuwa/logback/appender-console.xml b/src/main/resources/io/kokuwa/logback/appender-console.xml deleted file mode 100644 index e4bfb1d..0000000 --- a/src/main/resources/io/kokuwa/logback/appender-console.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - ${CONSOLE_LOG_JANSI:-true} - - ${CONSOLE_LOG_PATTERN:-%cyan(%d{HH:mm:ss.SSS}) %gray(%-6.6thread) %highlight(%-5level) %magenta(%32logger{32}) %mdc %msg%n} - ${CONSOLE_LOG_CHARSET:-default} - - - - diff --git a/src/main/resources/io/kokuwa/logback/appender-gcp.xml b/src/main/resources/io/kokuwa/logback/appender-gcp.xml deleted file mode 100644 index a36210d..0000000 --- a/src/main/resources/io/kokuwa/logback/appender-gcp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - ${SERVICE_NAME} - ${SERVICE_VERSION} - - - - - diff --git a/src/main/resources/io/kokuwa/logback/appender-json.xml b/src/main/resources/io/kokuwa/logback/appender-json.xml deleted file mode 100644 index e0034e4..0000000 --- a/src/main/resources/io/kokuwa/logback/appender-json.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/main/resources/io/kokuwa/logback/base.xml b/src/main/resources/io/kokuwa/logback/base.xml deleted file mode 100644 index 24ae946..0000000 --- a/src/main/resources/io/kokuwa/logback/base.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/main/resources/io/kokuwa/logback/logback-default.xml b/src/main/resources/io/kokuwa/logback/logback-default.xml index 1092ea9..78fe3f0 100644 --- a/src/main/resources/io/kokuwa/logback/logback-default.xml +++ b/src/main/resources/io/kokuwa/logback/logback-default.xml @@ -1,8 +1,6 @@ - - From 6de0f02d59944ec49b7f12273129c662db334640 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Sun, 2 Jul 2023 20:25:55 +0200 Subject: [PATCH 123/195] Bump to java 17 (micronaut dependency) --- .github/workflows/build.yaml | 2 +- .github/workflows/pr.yaml | 2 +- .github/workflows/release.yaml | 2 +- pom.xml | 4 +-- .../RootAutoSelectAppenderAction.java | 35 ++++++++----------- .../logging/http/mdc/HeaderMdcFilter.java | 10 ++---- .../micronaut/logging/layout/JsonLayout.java | 2 +- .../logging/http/mdc/PathMdcFilterTest.java | 6 ++-- 8 files changed, 27 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c707358..ed8d009 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 17 cache: maven - run: mvn $MAVEN_ARGS dependency:go-offline - run: mvn $MAVEN_ARGS deploy diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 2034d14..f50580b 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 17 cache: maven - run: mvn $MAVEN_ARGS dependency:go-offline - run: mvn $MAVEN_ARGS verify diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 22c372f..4c719f1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 17 cache: maven server-id: sonatype-nexus server-username: SERVER_USERNAME diff --git a/pom.xml b/pom.xml index 940c33a..e305f70 100644 --- a/pom.xml +++ b/pom.xml @@ -62,8 +62,8 @@ - 11 - 11 + 17 + 17 diff --git a/src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java b/src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java index 1353690..1d0db03 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java +++ b/src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java @@ -30,12 +30,13 @@ public class RootAutoSelectAppenderAction extends Action { private static final String APPENDER_GCP = "GCP"; private static final String LOGBACK_APPENDER = "LOGBACK_APPENDER"; private static final String LOGBACK_PATTERN = "LOGBACK_PATTERN"; - private static final String LOGBACK_PATTERN_DEFAULT = "%cyan(%d{HH:mm:ss.SSS})" - + " %gray(%-6.6thread)" - + " %highlight(%-5level)" - + " %magenta(%32logger{32})" - + " %mdc" - + " %msg%n"; + private static final String LOGBACK_PATTERN_DEFAULT = """ + %cyan(%d{HH:mm:ss.SSS}) \ + %gray(%-6.6thread) \ + %highlight(%-5level) \ + %magenta(%32logger{32}) \ + %mdc \ + %msg%n"""; @Override public void begin(SaxEventInterpretationContext ic, String name, org.xml.sax.Attributes attributes) { @@ -70,21 +71,15 @@ public class RootAutoSelectAppenderAction extends Action { private void setAppender(Logger rootLogger, String appenderName) { addInfo("Use appender: " + appenderName); - Layout layout; - switch (appenderName) { - case APPENDER_JSON: - layout = json(); - break; - case APPENDER_GCP: - layout = gcp(); - break; - case APPENDER_CONSOLE: - layout = console(); - break; - default: + var layout = switch (appenderName) { + case APPENDER_JSON -> json(); + case APPENDER_GCP -> gcp(); + case APPENDER_CONSOLE -> console(); + default -> { addError("Appender " + appenderName + " not found. Using console ..."); - layout = console(); - } + yield console(); + } + }; layout.start(); var encoder = new LayoutWrappingEncoder(); diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java index a59b425..a5a8b85 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java @@ -3,8 +3,6 @@ package io.kokuwa.micronaut.logging.http.mdc; import java.util.HashMap; import java.util.List; import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; import org.reactivestreams.Publisher; @@ -33,14 +31,14 @@ public class HeaderMdcFilter extends AbstractMdcFilter { public static final String PREFIX = "logger.http.header"; public static final int DEFAULT_ORDER = ServerFilterPhase.FIRST.before(); - private final Set headers; + private final List headers; public HeaderMdcFilter( @Value("${" + PREFIX + ".names}") List headers, @Value("${" + PREFIX + ".prefix}") Optional prefix, @Value("${" + PREFIX + ".order}") Optional order) { super(order.orElse(DEFAULT_ORDER), prefix.orElse(null)); - this.headers = headers.stream().map(String::toLowerCase).collect(Collectors.toSet()); + this.headers = headers.stream().map(String::toLowerCase).toList(); log.info("Configured with header names {}", headers); } @@ -48,9 +46,7 @@ public class HeaderMdcFilter extends AbstractMdcFilter { public Publisher> doFilter(HttpRequest request, ServerFilterChain chain) { var mdc = new HashMap(); for (var header : headers) { - request.getHeaders() - .getFirst(header) - .ifPresent(value -> mdc.put(header, String.valueOf(value))); + request.getHeaders().getFirst(header).ifPresent(value -> mdc.put(header, String.valueOf(value))); } return doFilter(request, chain, mdc); } diff --git a/src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java b/src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java index 9617549..48677e2 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java +++ b/src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java @@ -90,7 +90,7 @@ public class JsonLayout extends LayoutBase { var throwableProxy = value.getThrowableProxy(); if (throwableProxy != null) { var ex = throwableHandlingConverter.convert(value); - if (ex != null && !ex.equals("")) { + if (ex != null && !ex.isEmpty()) { map.put(fieldName, ex); } } diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilterTest.java index 3654d4d..3b7ac78 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilterTest.java @@ -89,9 +89,9 @@ public class PathMdcFilterTest extends AbstractFilterTest { @DisplayName("mdc: test for documentation example") @Test - @Property(name = "logger.http.path.patterns", value = "" - + "\\/gateway\\/(?[a-f0-9\\-]{36})," - + "\\/gateway\\/(?[a-f0-9\\-]{36})\\/configuration\\/(?[a-z]+)") + @Property(name = "logger.http.path.patterns", value = """ + \\/gateway\\/(?[a-f0-9\\-]{36}),\ + \\/gateway\\/(?[a-f0-9\\-]{36})\\/configuration\\/(?[a-z]+)""") void mdcMatchExample() { var uuid = UUID.randomUUID().toString(); assertContext(Map.of("gatewayId", uuid), "/gateway/" + uuid); From d53a54b8c3cfd861793c2c8a347b51c3b89b9a98 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 19 Jul 2023 14:52:12 +0200 Subject: [PATCH 124/195] Bump micronaut to 4.x --- pom.xml | 43 +++++++++---------- src/it/pom.xml | 21 +-------- .../logging/http/AbstractFilterTest.java | 5 ++- 3 files changed, 26 insertions(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index e305f70..005e3a9 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ - 3.9.4 + 4.0.0 2.0.7 1.4.8 @@ -78,8 +78,8 @@ - io.micronaut - micronaut-bom + io.micronaut.platform + micronaut-platform ${version.io.micronaut} pom import @@ -106,29 +106,13 @@ io.micronaut - micronaut-runtime + micronaut-http provided - - - javax.annotation - javax.annotation-api - - io.micronaut.security micronaut-security provided - - - io.micronaut - micronaut-http-server - - - io.micronaut - micronaut-validation - - io.micronaut.test @@ -150,6 +134,22 @@ micronaut-security-jwt test + + io.micronaut.serde + micronaut-serde-jackson + test + + + org.yaml + snakeyaml + test + + + + + com.fasterxml.jackson.core + jackson-databind + @@ -198,9 +198,6 @@ 0.5C - - - level-from-micronaut/pom.xml diff --git a/src/it/pom.xml b/src/it/pom.xml index e03c4d5..07f915c 100644 --- a/src/it/pom.xml +++ b/src/it/pom.xml @@ -49,8 +49,6 @@ @project.version@ @version.io.micronaut@ - @version.org.slf4j@ - @version.ch.qos.logback@ @@ -62,27 +60,12 @@ ${version.io.kokuwa.micronaut.logging} - io.micronaut - micronaut-bom + io.micronaut.platform + micronaut-platform ${version.io.micronaut} pom import - - org.slf4j - slf4j-api - ${version.org.slf4j} - - - ch.qos.logback - logback-classic - ${version.ch.qos.logback} - - - ch.qos.logback - logback-core - ${version.ch.qos.logback} - diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java index ab31e47..b7c89cc 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java @@ -20,6 +20,7 @@ import com.nimbusds.jwt.JWTClaimsSet; import ch.qos.logback.classic.Level; import io.kokuwa.micronaut.logging.AbstractTest; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.util.CollectionUtils; import io.micronaut.http.HttpHeaderValues; import io.micronaut.http.HttpRequest; @@ -34,6 +35,7 @@ import io.micronaut.runtime.server.EmbeddedServer; import io.micronaut.security.annotation.Secured; import io.micronaut.security.rules.SecurityRule; import io.micronaut.security.token.jwt.signature.SignatureGeneratorConfiguration; +import io.micronaut.serde.annotation.Serdeable; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; @@ -118,6 +120,7 @@ public abstract class AbstractFilterTest extends AbstractTest { } } + @Serdeable public static class TestResponse { private final String path; @@ -128,7 +131,7 @@ public abstract class AbstractFilterTest extends AbstractTest { public TestResponse( @JsonProperty("path") String path, @JsonProperty("level") String level, - @JsonProperty("context") Map context) { + @Nullable @JsonProperty("context") Map context) { this.path = path; this.level = level; this.context = context == null ? Map.of() : context; From c654786978e999a0a8e538bf166a52d877a15773 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 19 Jul 2023 14:58:11 +0200 Subject: [PATCH 125/195] Migrate from jackson to micronaut serde --- README.md | 6 ++++ pom.xml | 4 +++ src/it/log-gcp-from-env/pom.xml | 7 +++++ src/it/log-gcp-from-gcloud/pom.xml | 7 +++++ src/it/log-gcp-with-service/pom.xml | 7 +++++ .../invoker.properties | 0 .../log-json-from-env-serde-jackson/pom.xml | 19 ++++++++++++ .../postbuild.bsh | 0 .../invoker.properties | 1 + src/it/log-json-from-env-serde-jsonp/pom.xml | 19 ++++++++++++ .../postbuild.bsh | 21 ++++++++++++++ .../invoker.properties | 1 + .../pom.xml | 2 +- .../postbuild.bsh | 5 ++++ src/it/log-json-from-kubernetes/pom.xml | 7 +++++ .../micronaut/logging/layout/JsonLayout.java | 29 ++++++++++++++----- 16 files changed, 127 insertions(+), 8 deletions(-) rename src/it/{log-json-from-env => log-json-from-env-serde-jackson}/invoker.properties (100%) create mode 100644 src/it/log-json-from-env-serde-jackson/pom.xml rename src/it/{log-json-from-env => log-json-from-env-serde-jackson}/postbuild.bsh (100%) create mode 100644 src/it/log-json-from-env-serde-jsonp/invoker.properties create mode 100644 src/it/log-json-from-env-serde-jsonp/pom.xml create mode 100644 src/it/log-json-from-env-serde-jsonp/postbuild.bsh create mode 100644 src/it/log-json-from-env-serde-missing/invoker.properties rename src/it/{log-json-from-env => log-json-from-env-serde-missing}/pom.xml (84%) create mode 100644 src/it/log-json-from-env-serde-missing/postbuild.bsh diff --git a/README.md b/README.md index 2d20fba..94b617e 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,12 @@ Include in your `pom.xml`: ${version.io.kokuwa.micronaut.logging} runtime + + + io.micronaut.serde + micronaut-serde-jsonp + runtime + ``` ## Features diff --git a/pom.xml b/pom.xml index 005e3a9..d43a9b2 100644 --- a/pom.xml +++ b/pom.xml @@ -114,6 +114,10 @@ micronaut-security provided + + io.micronaut.serde + micronaut-serde-api + io.micronaut.test micronaut-test-junit5 diff --git a/src/it/log-gcp-from-env/pom.xml b/src/it/log-gcp-from-env/pom.xml index 1c56178..0859f9a 100644 --- a/src/it/log-gcp-from-env/pom.xml +++ b/src/it/log-gcp-from-env/pom.xml @@ -9,4 +9,11 @@ @project.artifactId@-it-log-gcp-from-env + + + + io.micronaut.serde + micronaut-serde-jsonp + + diff --git a/src/it/log-gcp-from-gcloud/pom.xml b/src/it/log-gcp-from-gcloud/pom.xml index 0030546..8de1353 100644 --- a/src/it/log-gcp-from-gcloud/pom.xml +++ b/src/it/log-gcp-from-gcloud/pom.xml @@ -9,4 +9,11 @@ @project.artifactId@-it-log-gcp-from-gcloud + + + + io.micronaut.serde + micronaut-serde-jsonp + + diff --git a/src/it/log-gcp-with-service/pom.xml b/src/it/log-gcp-with-service/pom.xml index f13550f..af3eadc 100644 --- a/src/it/log-gcp-with-service/pom.xml +++ b/src/it/log-gcp-with-service/pom.xml @@ -9,4 +9,11 @@ @project.artifactId@-it-log-gcp-with-service + + + + io.micronaut.serde + micronaut-serde-jsonp + + diff --git a/src/it/log-json-from-env/invoker.properties b/src/it/log-json-from-env-serde-jackson/invoker.properties similarity index 100% rename from src/it/log-json-from-env/invoker.properties rename to src/it/log-json-from-env-serde-jackson/invoker.properties diff --git a/src/it/log-json-from-env-serde-jackson/pom.xml b/src/it/log-json-from-env-serde-jackson/pom.xml new file mode 100644 index 0000000..66fb890 --- /dev/null +++ b/src/it/log-json-from-env-serde-jackson/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + + + @project.groupId@ + @project.artifactId@-it + LOCAL-SNAPSHOT + + + @project.artifactId@-it-log-json-from-env-serde-jackson + + + + io.micronaut.serde + micronaut-serde-jackson + + + diff --git a/src/it/log-json-from-env/postbuild.bsh b/src/it/log-json-from-env-serde-jackson/postbuild.bsh similarity index 100% rename from src/it/log-json-from-env/postbuild.bsh rename to src/it/log-json-from-env-serde-jackson/postbuild.bsh diff --git a/src/it/log-json-from-env-serde-jsonp/invoker.properties b/src/it/log-json-from-env-serde-jsonp/invoker.properties new file mode 100644 index 0000000..08de0de --- /dev/null +++ b/src/it/log-json-from-env-serde-jsonp/invoker.properties @@ -0,0 +1 @@ +invoker.environmentVariables.LOGBACK_APPENDER=JSON diff --git a/src/it/log-json-from-env-serde-jsonp/pom.xml b/src/it/log-json-from-env-serde-jsonp/pom.xml new file mode 100644 index 0000000..23ad54c --- /dev/null +++ b/src/it/log-json-from-env-serde-jsonp/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + + + @project.groupId@ + @project.artifactId@-it + LOCAL-SNAPSHOT + + + @project.artifactId@-it-log-json-from-env-serde-jsonp + + + + io.micronaut.serde + micronaut-serde-jsonp + + + diff --git a/src/it/log-json-from-env-serde-jsonp/postbuild.bsh b/src/it/log-json-from-env-serde-jsonp/postbuild.bsh new file mode 100644 index 0000000..0693fe0 --- /dev/null +++ b/src/it/log-json-from-env-serde-jsonp/postbuild.bsh @@ -0,0 +1,21 @@ +// verify log + +String expected = "^\\{\"timestamp\":\"[0-9]{13}\",\"level\":\"INFO\",\"thread\":\"main\",\"logger\":\"io.kokuwa.micronaut.logging.LoggingTest\",\"message\":\"test-output-marker\",\"raw-message\":\"test-output-marker\"}$"; +String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n"); + +for (String log : logs) { + if (!log.contains("test-output-marker")) { + continue; + } + if (java.util.regex.Pattern.matches(expected, log)) { + return true; + } else { + System.out.println("marker found, but formatting invalid:"); + System.out.println("[EXPECTED] " + expected); + System.out.println("[ACTUAL] " + log); + return false; + } +} + +System.out.println("marker not found"); +return false; diff --git a/src/it/log-json-from-env-serde-missing/invoker.properties b/src/it/log-json-from-env-serde-missing/invoker.properties new file mode 100644 index 0000000..08de0de --- /dev/null +++ b/src/it/log-json-from-env-serde-missing/invoker.properties @@ -0,0 +1 @@ +invoker.environmentVariables.LOGBACK_APPENDER=JSON diff --git a/src/it/log-json-from-env/pom.xml b/src/it/log-json-from-env-serde-missing/pom.xml similarity index 84% rename from src/it/log-json-from-env/pom.xml rename to src/it/log-json-from-env-serde-missing/pom.xml index 1ae3e61..68b86a0 100644 --- a/src/it/log-json-from-env/pom.xml +++ b/src/it/log-json-from-env-serde-missing/pom.xml @@ -8,5 +8,5 @@ LOCAL-SNAPSHOT - @project.artifactId@-it-log-json-from-env + @project.artifactId@-it-log-json-from-env-serde-missing diff --git a/src/it/log-json-from-env-serde-missing/postbuild.bsh b/src/it/log-json-from-env-serde-missing/postbuild.bsh new file mode 100644 index 0000000..465b88c --- /dev/null +++ b/src/it/log-json-from-env-serde-missing/postbuild.bsh @@ -0,0 +1,5 @@ +// verify log + +return org.codehaus.plexus.util.FileUtils + .fileRead(basedir + "/build.log") + .contains("Failed to get object mapper from micronaut, please check your classpath"); diff --git a/src/it/log-json-from-kubernetes/pom.xml b/src/it/log-json-from-kubernetes/pom.xml index 885bc3b..812ac1f 100644 --- a/src/it/log-json-from-kubernetes/pom.xml +++ b/src/it/log-json-from-kubernetes/pom.xml @@ -9,4 +9,11 @@ @project.artifactId@-it-log-json-from-kubernetes + + + + io.micronaut.serde + micronaut-serde-jsonp + + diff --git a/src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java b/src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java index 48677e2..4665494 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java +++ b/src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java @@ -1,20 +1,23 @@ package io.kokuwa.micronaut.logging.layout; +import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.Date; import java.util.LinkedHashMap; import java.util.Map; import java.util.TimeZone; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - import ch.qos.logback.classic.pattern.ThrowableHandlingConverter; import ch.qos.logback.classic.pattern.ThrowableProxyConverter; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.LayoutBase; +import ch.qos.logback.core.status.OnConsoleStatusListener; +import ch.qos.logback.core.status.StatusUtil; +import ch.qos.logback.core.util.StatusListenerConfigHelper; import io.micronaut.http.MediaType; +import io.micronaut.json.JsonMapper; public class JsonLayout extends LayoutBase { @@ -28,8 +31,6 @@ public class JsonLayout extends LayoutBase { public static final String EXCEPTION_ATTR_NAME = "exception"; public static final String CONTEXT_ATTR_NAME = "context"; - private final ObjectMapper mapper = new ObjectMapper(); - protected boolean includeLevel = true; protected boolean includeThreadName = true; protected boolean includeMDC = true; @@ -42,6 +43,7 @@ public class JsonLayout extends LayoutBase { private String timestampFormat; private String timestampFormatTimezoneId; private ThrowableHandlingConverter throwableHandlingConverter = new ThrowableProxyConverter(); + private JsonMapper mapper; @Override public String getContentType() { @@ -63,9 +65,22 @@ public class JsonLayout extends LayoutBase { @Override public String doLayout(ILoggingEvent event) { var map = toJsonMap(event); + + if (mapper == null) { + try { + mapper = JsonMapper.createDefault(); + } catch (IllegalStateException e) { + if (!StatusUtil.contextHasStatusListener(context)) { + addError("Failed to get object mapper from micronaut, please check your classpath"); + StatusListenerConfigHelper.addOnConsoleListenerInstance(context, new OnConsoleStatusListener()); + } + return map.toString() + CoreConstants.LINE_SEPARATOR; + } + } + try { - return mapper.writeValueAsString(map) + CoreConstants.LINE_SEPARATOR; - } catch (JsonProcessingException e) { + return new String(mapper.writeValueAsBytes(map), StandardCharsets.UTF_8) + CoreConstants.LINE_SEPARATOR; + } catch (IOException e) { addError("Failed to write json from event " + event + " and map " + map, e); return null; } From 434b42c0affd120e94ec942e943fd3bf6172aa3d Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Mon, 31 Jul 2023 14:13:20 +0200 Subject: [PATCH 126/195] Update badges --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 94b617e..ce79b1e 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ # Micronaut Logging support -[![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/kokuwaio/micronaut-logging.svg?label=License)](http://www.apache.org/licenses/) -[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://central.sonatype.com/namespace/io.kokuwa.micronaut) -[![Build](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/build.yaml?branch=3.x&label=3.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/build.yaml?query=branch%3A3.x) -[![Build](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/build.yaml?branch=main&label=4.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/build.yaml?query=branch%3Amain) +[![Apache License 2.0](https://img.shields.io/github/license/kokuwaio/helm-maven-plugin)](https://github.com/kokuwaio/micronaut-logging/blob/main/LICENSE) +[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging)](https://central.sonatype.com/namespace/io.kokuwa.micronaut) +[![Build](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/build.yaml?branch=main)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/build.yaml?query=branch%3Amain) Include in your `pom.xml`: From 1e8a4a1a1d82ab6253ebe5b3b36177c9291caced Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Mon, 31 Jul 2023 12:20:37 +0000 Subject: [PATCH 127/195] [maven-release-plugin] prepare release 4.0.0 [no ci] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d43a9b2..ca06d7c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 4.0.0-SNAPSHOT + 4.0.0 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -45,7 +45,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 4.0.0 github From 12da7acd305ce8916785388921b686a26c0f4661 Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Mon, 31 Jul 2023 12:20:40 +0000 Subject: [PATCH 128/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ca06d7c..58ee10d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 4.0.0 + 4.0.1-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -45,7 +45,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 4.0.0 + HEAD github From 3265af15bab6c220f1c3bd41c0ccf4be1885520f Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Mon, 31 Jul 2023 14:30:05 +0200 Subject: [PATCH 129/195] Removed version specification, updated dependabot --- .github/dependabot.yml | 26 +++++++++++++++----------- README.md | 2 +- pom.xml | 22 ++-------------------- 3 files changed, 18 insertions(+), 32 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 11db3f6..4004022 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,19 +3,23 @@ updates: - package-ecosystem: maven directory: / schedule: - interval: monthly - day: monday - ignore: - # logback 1.3 and 1.4 are compatible with slf4j 2.x only and not supported right now - - dependency-name: ch.qos.logback:logback-classic - update-types: [version-update:semver-major, version-update:semver-minor] - - dependency-name: org.slf4j:slf4j-api - update-types: [version-update:semver-major] - # micronaut 4 will ship logback 1.4 - - dependency-name: io.micronaut:* - update-types: [version-update:semver-major] + interval: daily - package-ecosystem: github-actions directory: / schedule: interval: monthly day: monday + - package-ecosystem: maven + directory: / + target-branch: 3.x + schedule: + interval: daily + ignore: + - dependency-name: io.micronaut:* + update-types: [version-update:semver-major] + - package-ecosystem: github-actions + directory: / + target-branch: 3.x + schedule: + interval: monthly + day: monday diff --git a/README.md b/README.md index ce79b1e..919ed66 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Micronaut Logging support -[![Apache License 2.0](https://img.shields.io/github/license/kokuwaio/helm-maven-plugin)](https://github.com/kokuwaio/micronaut-logging/blob/main/LICENSE) +[![Apache License 2.0](https://img.shields.io/github/license/kokuwaio/micronaut-logging)](https://github.com/kokuwaio/micronaut-logging/blob/main/LICENSE) [![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging)](https://central.sonatype.com/namespace/io.kokuwa.micronaut) [![Build](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/build.yaml?branch=main)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/build.yaml?query=branch%3Amain) diff --git a/pom.xml b/pom.xml index 58ee10d..5fa6831 100644 --- a/pom.xml +++ b/pom.xml @@ -65,13 +65,13 @@ 17 17 + 1C + 4.0.0 - 2.0.7 - 1.4.8 @@ -84,21 +84,6 @@ pom import - - org.slf4j - slf4j-api - ${version.org.slf4j} - - - ch.qos.logback - logback-classic - ${version.ch.qos.logback} - - - ch.qos.logback - logback-core - ${version.ch.qos.logback} - @@ -200,9 +185,6 @@ integration-test verify - - 0.5C - From 2ea33eed0decf3528fc0dfa53b152d9b1acbca9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 12:39:26 +0000 Subject: [PATCH 130/195] Bump version.io.micronaut from 4.0.0 to 4.0.2 (#188) Bumps `version.io.micronaut` from 4.0.0 to 4.0.2. Updates `io.micronaut.platform:micronaut-platform` from 4.0.0 to 4.0.2 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.0.0...v4.0.2) Updates `io.micronaut:micronaut-inject-java` from 4.0.0 to 4.0.2 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.0.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.0.0...v4.0.2) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5fa6831..349c7c9 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ - 4.0.0 + 4.0.2 From 32a2ec65ddcf0aa59f2ab14b785c9c4ae33167ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 20:29:46 +0000 Subject: [PATCH 131/195] Bump version.io.micronaut from 4.0.2 to 4.0.3 (#189) Bumps `version.io.micronaut` from 4.0.2 to 4.0.3. Updates `io.micronaut.platform:micronaut-platform` from 4.0.2 to 4.0.3 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.0.2...v4.0.3) Updates `io.micronaut:micronaut-inject-java` from 4.0.2 to 4.0.3 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.0.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.0.2...v4.0.3) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 349c7c9..46ae14b 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ - 4.0.2 + 4.0.3 From bd73dbed4f8d029e8ea67c5767193a3b1a557616 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 20:15:13 +0000 Subject: [PATCH 132/195] Bump version.io.micronaut from 4.0.3 to 4.0.4 (#191) Bumps `version.io.micronaut` from 4.0.3 to 4.0.4. Updates `io.micronaut.platform:micronaut-platform` from 4.0.3 to 4.0.4 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.0.3...v4.0.4) Updates `io.micronaut:micronaut-inject-java` from 4.0.3 to 4.0.4 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.0.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.0.3...v4.0.4) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 46ae14b..f9d3f83 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ - 4.0.3 + 4.0.4 From 4da7f6f8c5d6aacdeb7c04387149766ed66d852f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 20:34:25 +0000 Subject: [PATCH 133/195] Bump version.io.micronaut from 4.0.4 to 4.0.5 (#192) Bumps `version.io.micronaut` from 4.0.4 to 4.0.5. Updates `io.micronaut.platform:micronaut-platform` from 4.0.4 to 4.0.5 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.0.4...v4.0.5) Updates `io.micronaut:micronaut-inject-java` from 4.0.4 to 4.0.5 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.1.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.0.4...v4.0.5) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f9d3f83..411afef 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ - 4.0.4 + 4.0.5 From 62f089345ac667e9fed04f46a161e1b657e0000d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 21:00:36 +0000 Subject: [PATCH 134/195] Bump io.kokuwa.maven:maven-parent from 0.6.10 to 0.6.12 (#195) Bumps [io.kokuwa.maven:maven-parent](https://github.com/kokuwaio/maven-parent) from 0.6.10 to 0.6.12. - [Commits](https://github.com/kokuwaio/maven-parent/compare/0.6.10...0.6.12) --- updated-dependencies: - dependency-name: io.kokuwa.maven:maven-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 411afef..64908b4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.kokuwa.maven maven-parent - 0.6.10 + 0.6.12 From 7e99f1a6ed120bbc8b55129057ab6f9f49f7c058 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 21:01:01 +0000 Subject: [PATCH 135/195] Bump version.io.micronaut from 4.0.5 to 4.0.6 (#194) Bumps `version.io.micronaut` from 4.0.5 to 4.0.6. Updates `io.micronaut.platform:micronaut-platform` from 4.0.5 to 4.0.6 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.0.5...v4.0.6) Updates `io.micronaut:micronaut-inject-java` from 4.0.5 to 4.0.6 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.1.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.0.5...v4.0.6) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64908b4..c8f9e42 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ - 4.0.5 + 4.0.6 From 0357b67026788e0cb2d13b6e1b9a3b03036d3208 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Sep 2023 14:02:23 +0200 Subject: [PATCH 136/195] Bump version.io.micronaut from 4.0.6 to 4.1.0 (#196) * Bump version.io.micronaut from 4.0.6 to 4.1.0 Bumps `version.io.micronaut` from 4.0.6 to 4.1.0. Updates `io.micronaut.platform:micronaut-platform` from 4.0.6 to 4.1.0 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.0.6...v4.1.0) Updates `io.micronaut:micronaut-inject-java` from 4.0.6 to 4.1.0 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.1.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.0.6...v4.1.0) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * ignore deprecation --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stephan Schnabel --- pom.xml | 2 +- .../micronaut/logging/configurator/DefaultConfigurator.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8f9e42..adb5d81 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ - 4.0.6 + 4.1.0 diff --git a/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java b/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java index f84feb8..3b1a51a 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java +++ b/src/main/java/io/kokuwa/micronaut/logging/configurator/DefaultConfigurator.java @@ -13,6 +13,7 @@ import ch.qos.logback.core.spi.ContextAwareBase; */ public class DefaultConfigurator extends ContextAwareBase implements Configurator { + @SuppressWarnings("deprecation") @Override public ExecutionStatus configure(LoggerContext loggerContext) { From b3d0d49cc05583c2eb6d961755491f62a37e3d76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Sep 2023 10:45:14 +0200 Subject: [PATCH 137/195] Bump version.io.micronaut from 4.1.0 to 4.1.1 (#197) * Bump version.io.micronaut from 4.1.0 to 4.1.1 Bumps `version.io.micronaut` from 4.1.0 to 4.1.1. Updates `io.micronaut.platform:micronaut-platform` from 4.1.0 to 4.1.1 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.1.0...v4.1.1) Updates `io.micronaut:micronaut-inject-java` from 4.1.0 to 4.1.1 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.1.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * fix build --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stephan Schnabel --- pom.xml | 5 ++- .../logging/mdc/MDCTurboFilterConfigurer.java | 36 ++++++++++++++++--- src/test/resources/application-test-mdc.yaml | 2 ++ 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index adb5d81..b5b8087 100644 --- a/pom.xml +++ b/pom.xml @@ -64,14 +64,13 @@ 17 17 - - 1C + class - 4.1.0 + 4.1.1 diff --git a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java index 5dfab9a..7f4b176 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java +++ b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java @@ -1,5 +1,6 @@ package io.kokuwa.micronaut.logging.mdc; +import java.util.Collection; import java.util.Set; import org.slf4j.Logger; @@ -13,33 +14,58 @@ import io.micronaut.context.annotation.Requires; import io.micronaut.context.env.Environment; import io.micronaut.core.type.Argument; import io.micronaut.core.util.StringUtils; +import io.micronaut.logging.LogLevel; +import io.micronaut.logging.LoggingSystem; /** * Configure MDC filter. * * @author Stephan Schnabel */ +@BootstrapContextCompatible @Requires(beans = LogbackUtil.class) @Requires(property = MDCTurboFilterConfigurer.PREFIX) @Requires(property = MDCTurboFilterConfigurer.PREFIX + ".enabled", notEquals = StringUtils.FALSE) -@BootstrapContextCompatible @Context -public class MDCTurboFilterConfigurer { +public class MDCTurboFilterConfigurer implements LoggingSystem { public static final String PREFIX = "logger.mdc"; private static final Logger log = LoggerFactory.getLogger(MDCTurboFilterConfigurer.class); + private final LogbackUtil logback; private final Environment environment; + private Collection mdcs = Set.of(); + private boolean initialized; + public MDCTurboFilterConfigurer(LogbackUtil logback, Environment environment) { this.logback = logback; this.environment = environment; - configure(); + this.refresh(); } - public void configure() { - for (var name : environment.getPropertyEntries(PREFIX)) { + @Override + public void refresh() { + + mdcs = environment.getPropertyEntries(PREFIX); + initialized = false; + + if (environment.getProperties("logger.levels").isEmpty()) { + log.warn("MDCs are configured, but no levels are set. MDC may not work."); + } + } + + @Override + public void setLogLevel(String name, LogLevel level) { + if (!initialized) { + configure(); + initialized = true; + } + } + + private void configure() { + for (var name : mdcs) { var prefix = PREFIX + "." + name + "."; var key = environment.getProperty(prefix + "key", String.class, name); diff --git a/src/test/resources/application-test-mdc.yaml b/src/test/resources/application-test-mdc.yaml index c0fd2a2..69cbc89 100644 --- a/src/test/resources/application-test-mdc.yaml +++ b/src/test/resources/application-test-mdc.yaml @@ -1,4 +1,6 @@ logger: + levels: + io.micronaut.logging.PropertiesLoggingLevelsConfigurer: "OFF" mdc: key1: key: key From fb7a8e70c9e4ed5d63be3fd1c1026ab68b41cf35 Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Fri, 15 Sep 2023 09:08:51 +0000 Subject: [PATCH 138/195] [maven-release-plugin] prepare release 4.0.1 [no ci] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b5b8087..2d62c2c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 4.0.1-SNAPSHOT + 4.0.1 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -45,7 +45,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD + 4.0.1 github From 630d48043a7669b8af006d1a6f70e858f71b2ff1 Mon Sep 17 00:00:00 2001 From: "kokuwa.io Bot" Date: Fri, 15 Sep 2023 09:08:55 +0000 Subject: [PATCH 139/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2d62c2c..7d1a6d3 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.kokuwa.micronaut micronaut-logging - 4.0.1 + 4.0.2-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -45,7 +45,7 @@ https://github.com/kokuwaio/micronaut-logging scm:git:https://github.com/kokuwaio/micronaut-logging.git scm:git:https://github.com/kokuwaio/micronaut-logging.git - 4.0.1 + HEAD github From bf90c37c814bb574d02326b56ace264e08e92b13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 20:30:59 +0000 Subject: [PATCH 140/195] Bump version.io.micronaut from 4.1.1 to 4.1.2 (#198) Bumps `version.io.micronaut` from 4.1.1 to 4.1.2. Updates `io.micronaut.platform:micronaut-platform` from 4.1.1 to 4.1.2 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.1.1...v4.1.2) Updates `io.micronaut:micronaut-inject-java` from 4.1.1 to 4.1.2 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.1.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.1.1...v4.1.2) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d1a6d3..8af51af 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.1.1 + 4.1.2 From 24932fd4401df00c89c9b3f813ee39dec1dd8ce6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 20:35:36 +0000 Subject: [PATCH 141/195] Bump version.io.micronaut from 4.1.2 to 4.1.3 (#199) Bumps `version.io.micronaut` from 4.1.2 to 4.1.3. Updates `io.micronaut.platform:micronaut-platform` from 4.1.2 to 4.1.3 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.1.2...v4.1.3) Updates `io.micronaut:micronaut-inject-java` from 4.1.2 to 4.1.3 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.1.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.1.2...v4.1.3) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8af51af..18f2f00 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.1.2 + 4.1.3 From a13366b6ed644ad79fe567d9b71901d4b127a9be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 20:23:48 +0000 Subject: [PATCH 142/195] Bump actions/checkout from 3 to 4 (#202) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yaml | 2 +- .github/workflows/pr.yaml | 6 +++--- .github/workflows/release.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ed8d009..3fa6106 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ jobs: steps: - run: git config --global user.name "${{ vars.KOKUWA_IO_BOT_NAME }}" - run: git config --global user.email "${{ vars.KOKUWA_IO_BOT_EMAIL }}" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: token: ${{ secrets.GIT_ACTION_TOKEN }} - uses: actions/setup-java@v3 diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index f50580b..580821e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -7,7 +7,7 @@ jobs: yaml: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ibiqlik/action-yamllint@v3 with: format: colored @@ -16,7 +16,7 @@ jobs: markdown: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: avto-dev/markdown-lint@v1 with: args: /github/workspace @@ -26,7 +26,7 @@ jobs: env: MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress -Dmaven.test.redirectTestOutputToFile=false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: distribution: temurin diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4c719f1..3debf4e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,7 +10,7 @@ jobs: steps: - run: git config --global user.name "${{ vars.KOKUWA_IO_BOT_NAME }}" - run: git config --global user.email "${{ vars.KOKUWA_IO_BOT_EMAIL }}" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: token: ${{ secrets.GIT_ACTION_TOKEN }} - uses: crazy-max/ghaction-import-gpg@v5 From 45bc124cd30323dfd4041ee571ca0010bbde963e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 20:23:54 +0000 Subject: [PATCH 143/195] Bump crazy-max/ghaction-import-gpg from 5 to 6 (#203) Bumps [crazy-max/ghaction-import-gpg](https://github.com/crazy-max/ghaction-import-gpg) from 5 to 6. - [Release notes](https://github.com/crazy-max/ghaction-import-gpg/releases) - [Commits](https://github.com/crazy-max/ghaction-import-gpg/compare/v5...v6) --- updated-dependencies: - dependency-name: crazy-max/ghaction-import-gpg dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3debf4e..e040ba9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 with: token: ${{ secrets.GIT_ACTION_TOKEN }} - - uses: crazy-max/ghaction-import-gpg@v5 + - uses: crazy-max/ghaction-import-gpg@v6 with: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} passphrase: ${{ secrets.GPG_PASSPHRASE }} From 0227a7a2a8c07586e5a70b8769c26b1880269f3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 20:44:58 +0000 Subject: [PATCH 144/195] Bump version.io.micronaut from 4.1.3 to 4.1.4 (#204) Bumps `version.io.micronaut` from 4.1.3 to 4.1.4. Updates `io.micronaut.platform:micronaut-platform` from 4.1.3 to 4.1.4 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.1.3...v4.1.4) Updates `io.micronaut:micronaut-inject-java` from 4.1.3 to 4.1.4 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.2.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.1.3...v4.1.4) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 18f2f00..993b1e0 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.1.3 + 4.1.4 From 28e506e2a2e4363d4dd5fdc56c498a0fdb63a1bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 20:22:51 +0000 Subject: [PATCH 145/195] Bump io.kokuwa.maven:maven-parent from 0.6.12 to 0.6.13 (#206) Bumps [io.kokuwa.maven:maven-parent](https://github.com/kokuwaio/maven-parent) from 0.6.12 to 0.6.13. - [Commits](https://github.com/kokuwaio/maven-parent/compare/0.6.12...0.6.13) --- updated-dependencies: - dependency-name: io.kokuwa.maven:maven-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 993b1e0..aadd747 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.kokuwa.maven maven-parent - 0.6.12 + 0.6.13 From 528358238b08b741d8649b00a306f413ec25a12b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:36:25 +0000 Subject: [PATCH 146/195] Bump version.io.micronaut from 4.1.4 to 4.1.5 (#207) Bumps `version.io.micronaut` from 4.1.4 to 4.1.5. Updates `io.micronaut.platform:micronaut-platform` from 4.1.4 to 4.1.5 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.1.4...v4.1.5) Updates `io.micronaut:micronaut-inject-java` from 4.1.4 to 4.1.5 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.2.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.1.4...v4.1.5) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aadd747..067d769 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.1.4 + 4.1.5 From d7126347ebd62ff2b9f2c6d9b70bf4901a411005 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:42:18 +0000 Subject: [PATCH 147/195] Bump version.io.micronaut from 4.1.5 to 4.1.6 (#209) Bumps `version.io.micronaut` from 4.1.5 to 4.1.6. Updates `io.micronaut.platform:micronaut-platform` from 4.1.5 to 4.1.6 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.1.5...v4.1.6) Updates `io.micronaut:micronaut-inject-java` from 4.1.5 to 4.1.6 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.2.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.1.5...v4.1.6) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 067d769..7bb8ac7 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.1.5 + 4.1.6 From 4ae47ee52dd267158f8df478d7ee32af86a33933 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 20:44:56 +0000 Subject: [PATCH 148/195] Bump version.io.micronaut from 4.1.6 to 4.2.0 (#211) Bumps `version.io.micronaut` from 4.1.6 to 4.2.0. Updates `io.micronaut.platform:micronaut-platform` from 4.1.6 to 4.2.0 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.1.6...v4.2.0) Updates `io.micronaut:micronaut-inject-java` from 4.1.6 to 4.2.0 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.2.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.1.6...v4.2.0) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7bb8ac7..92a1c50 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.1.6 + 4.2.0 From 671f623b918527e08d0f6831fa66219c786d4d9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 21:00:55 +0000 Subject: [PATCH 149/195] Bump actions/setup-java from 3 to 4 (#213) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yaml | 2 +- .github/workflows/pr.yaml | 2 +- .github/workflows/release.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3fa6106..8a26df0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 with: token: ${{ secrets.GIT_ACTION_TOKEN }} - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 580821e..59519f5 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -27,7 +27,7 @@ jobs: MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress -Dmaven.test.redirectTestOutputToFile=false steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e040ba9..0e5bda9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -19,7 +19,7 @@ jobs: passphrase: ${{ secrets.GPG_PASSPHRASE }} git_user_signingkey: true git_commit_gpgsign: true - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 From 6689214d33ce6503a11ccfff8dc6f00183a33c99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 21:03:13 +0000 Subject: [PATCH 150/195] Bump version.io.micronaut from 4.2.0 to 4.2.1 (#214) Bumps `version.io.micronaut` from 4.2.0 to 4.2.1. Updates `io.micronaut.platform:micronaut-platform` from 4.2.0 to 4.2.1 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.2.0...v4.2.1) Updates `io.micronaut:micronaut-inject-java` from 4.2.0 to 4.2.1 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.2.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.2.0...v4.2.1) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92a1c50..f18a85e 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.2.0 + 4.2.1 From 158c0b569291c719b647a2f9154f65d7bb029da1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 20:59:21 +0000 Subject: [PATCH 151/195] Bump version.io.micronaut from 4.2.1 to 4.2.2 (#215) Bumps `version.io.micronaut` from 4.2.1 to 4.2.2. Updates `io.micronaut.platform:micronaut-platform` from 4.2.1 to 4.2.2 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.2.1...v4.2.2) Updates `io.micronaut:micronaut-inject-java` from 4.2.1 to 4.2.2 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.2.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f18a85e..46ee3c6 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.2.1 + 4.2.2 From cd98965445c24fdb07cf411813a7de1bd649c9eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 20:43:54 +0000 Subject: [PATCH 152/195] Bump io.kokuwa.maven:maven-parent from 0.6.13 to 0.6.14 (#217) Bumps [io.kokuwa.maven:maven-parent](https://github.com/kokuwaio/maven-parent) from 0.6.13 to 0.6.14. - [Commits](https://github.com/kokuwaio/maven-parent/compare/0.6.13...0.6.14) --- updated-dependencies: - dependency-name: io.kokuwa.maven:maven-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 46ee3c6..dce99e6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.kokuwa.maven maven-parent - 0.6.13 + 0.6.14 From 37d91497a98c89ec6b31d93f33e4c07dd9931777 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 20:03:06 +0000 Subject: [PATCH 153/195] Bump actions/upload-artifact from 3 to 4 (#218) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 59519f5..b8527ba 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -35,7 +35,7 @@ jobs: - run: mvn $MAVEN_ARGS dependency:go-offline - run: mvn $MAVEN_ARGS verify - run: mvn $MAVEN_ARGS site - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: path: target/site From 382d0f44973748bf3b4bbd545e31aefbe5e74dd4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 20:12:51 +0000 Subject: [PATCH 154/195] Bump version.io.micronaut from 4.2.2 to 4.2.3 (#220) Bumps `version.io.micronaut` from 4.2.2 to 4.2.3. Updates `io.micronaut.platform:micronaut-platform` from 4.2.2 to 4.2.3 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.2.2...v4.2.3) Updates `io.micronaut:micronaut-inject-java` from 4.2.2 to 4.2.3 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.3.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.2.2...v4.2.3) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dce99e6..fc6f90c 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.2.2 + 4.2.3 From a11b14200f632e371e2ad979ccfe3ddcd6c8b651 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 20:52:09 +0000 Subject: [PATCH 155/195] Bump version.io.micronaut from 4.2.3 to 4.2.4 (#221) Bumps `version.io.micronaut` from 4.2.3 to 4.2.4. Updates `io.micronaut.platform:micronaut-platform` from 4.2.3 to 4.2.4 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.2.3...v4.2.4) Updates `io.micronaut:micronaut-inject-java` from 4.2.3 to 4.2.4 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.3.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.2.3...v4.2.4) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc6f90c..3253767 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.2.3 + 4.2.4 From 7647500184d1ec661314c74136c5e99ca0d12a34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 20:52:55 +0000 Subject: [PATCH 156/195] Bump version.io.micronaut from 4.2.4 to 4.3.0 (#222) Bumps `version.io.micronaut` from 4.2.4 to 4.3.0. Updates `io.micronaut.platform:micronaut-platform` from 4.2.4 to 4.3.0 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.2.4...v4.3.0) Updates `io.micronaut:micronaut-inject-java` from 4.2.4 to 4.3.0 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.3.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.2.4...v4.3.0) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3253767..2f76571 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.2.4 + 4.3.0 From 2ea615a3144520a53c74a6f39752d4e1ec3f138b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 20:09:47 +0000 Subject: [PATCH 157/195] Bump version.io.micronaut from 4.3.0 to 4.3.1 (#223) Bumps `version.io.micronaut` from 4.3.0 to 4.3.1. Updates `io.micronaut.platform:micronaut-platform` from 4.3.0 to 4.3.1 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.3.0...v4.3.1) Updates `io.micronaut:micronaut-inject-java` from 4.3.0 to 4.3.1 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.3.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.3.0...v4.3.1) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2f76571..efadb22 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.3.0 + 4.3.1 From 5d59e3ce431264b7608fb9d2aeed32b41675a229 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 20:34:54 +0000 Subject: [PATCH 158/195] Bump version.io.micronaut from 4.3.1 to 4.3.2 (#224) Bumps `version.io.micronaut` from 4.3.1 to 4.3.2. Updates `io.micronaut.platform:micronaut-platform` from 4.3.1 to 4.3.2 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.3.1...v4.3.2) Updates `io.micronaut:micronaut-inject-java` from 4.3.1 to 4.3.2 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.3.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.3.1...v4.3.2) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index efadb22..99166f7 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.3.1 + 4.3.2 From 92a525b1ecf9bd19d217ce35d66f036caf83c7a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 20:09:20 +0000 Subject: [PATCH 159/195] Bump io.kokuwa.maven:maven-parent from 0.6.14 to 0.6.15 (#225) Bumps [io.kokuwa.maven:maven-parent](https://github.com/kokuwaio/maven-parent) from 0.6.14 to 0.6.15. - [Commits](https://github.com/kokuwaio/maven-parent/compare/0.6.14...0.6.15) --- updated-dependencies: - dependency-name: io.kokuwa.maven:maven-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99166f7..14519c1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.kokuwa.maven maven-parent - 0.6.14 + 0.6.15 From d4e748e751cbe53303ecbff93a59e2f2d77c2af9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 20:46:00 +0000 Subject: [PATCH 160/195] Bump version.io.micronaut from 4.3.2 to 4.3.3 (#227) Bumps `version.io.micronaut` from 4.3.2 to 4.3.3. Updates `io.micronaut.platform:micronaut-platform` from 4.3.2 to 4.3.3 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.3.2...v4.3.3) Updates `io.micronaut:micronaut-inject-java` from 4.3.2 to 4.3.3 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.3.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.3.2...v4.3.3) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 14519c1..ef742e7 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.3.2 + 4.3.3 From 3d092101f38984ffd3c171ef12625e0544772ca8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 20:13:25 +0000 Subject: [PATCH 161/195] Bump version.io.micronaut from 4.3.3 to 4.3.4 (#228) Bumps `version.io.micronaut` from 4.3.3 to 4.3.4. Updates `io.micronaut.platform:micronaut-platform` from 4.3.3 to 4.3.4 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.3.3...v4.3.4) Updates `io.micronaut:micronaut-inject-java` from 4.3.3 to 4.3.4 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.3.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.3.3...v4.3.4) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef742e7..8d55b45 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.3.3 + 4.3.4 From fe7fb21214e4d828c7464a43d4244279eb432bff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 20:28:14 +0000 Subject: [PATCH 162/195] Bump version.io.micronaut from 4.3.4 to 4.3.5 (#229) Bumps `version.io.micronaut` from 4.3.4 to 4.3.5. Updates `io.micronaut.platform:micronaut-platform` from 4.3.4 to 4.3.5 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.3.4...v4.3.5) Updates `io.micronaut:micronaut-inject-java` from 4.3.4 to 4.3.5 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.3.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.3.4...v4.3.5) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d55b45..0581e5f 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.3.4 + 4.3.5 From 67239a480c6cf9378c1e88e5faae1df6e900ce44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 20:33:17 +0000 Subject: [PATCH 163/195] Bump version.io.micronaut from 4.3.5 to 4.3.6 (#230) Bumps `version.io.micronaut` from 4.3.5 to 4.3.6. Updates `io.micronaut.platform:micronaut-platform` from 4.3.5 to 4.3.6 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.3.5...v4.3.6) Updates `io.micronaut:micronaut-inject-java` from 4.3.5 to 4.3.6 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.3.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.3.5...v4.3.6) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0581e5f..634d024 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.3.5 + 4.3.6 From 2cef8a86a95c1fe2d9af456563c09c43e51b4a33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 20:14:18 +0000 Subject: [PATCH 164/195] Bump version.io.micronaut from 4.3.6 to 4.3.7 (#231) Bumps `version.io.micronaut` from 4.3.6 to 4.3.7. Updates `io.micronaut.platform:micronaut-platform` from 4.3.6 to 4.3.7 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.3.6...v4.3.7) Updates `io.micronaut:micronaut-inject-java` from 4.3.6 to 4.3.7 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.4.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.3.6...v4.3.7) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 634d024..ce99e18 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.3.6 + 4.3.7 From acf763fc352d373b8f3943b1d9e7e6563b067319 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 20:48:42 +0000 Subject: [PATCH 165/195] Bump version.io.micronaut from 4.3.7 to 4.3.8 (#233) Bumps `version.io.micronaut` from 4.3.7 to 4.3.8. Updates `io.micronaut.platform:micronaut-platform` from 4.3.7 to 4.3.8 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.3.7...v4.3.8) Updates `io.micronaut:micronaut-inject-java` from 4.3.7 to 4.3.8 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.4.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.3.7...v4.3.8) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce99e18..8c30074 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.3.7 + 4.3.8 From 8199ed6b3d5c005ce4b1f771a093067500f93486 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 20:39:33 +0000 Subject: [PATCH 166/195] Bump version.io.micronaut from 4.3.8 to 4.4.0 (#234) Bumps `version.io.micronaut` from 4.3.8 to 4.4.0. Updates `io.micronaut.platform:micronaut-platform` from 4.3.8 to 4.4.0 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.3.8...v4.4.0) Updates `io.micronaut:micronaut-inject-java` from 4.3.8 to 4.4.0 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.5.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.3.8...v4.4.0) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c30074..696da2e 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.3.8 + 4.4.0 From c2b85cc634d4d75a6918142066f52d575ce8dc27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 20:47:45 +0000 Subject: [PATCH 167/195] Bump version.io.micronaut from 4.4.0 to 4.4.1 (#235) Bumps `version.io.micronaut` from 4.4.0 to 4.4.1. Updates `io.micronaut.platform:micronaut-platform` from 4.4.0 to 4.4.1 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.4.0...v4.4.1) Updates `io.micronaut:micronaut-inject-java` from 4.4.0 to 4.4.1 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.5.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.4.0...v4.4.1) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 696da2e..6af751f 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.4.0 + 4.4.1 From e9bff7c78b9b0a21a72ac8959b41f85ec8b80989 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 20:21:35 +0000 Subject: [PATCH 168/195] Bump version.io.micronaut from 4.4.1 to 4.4.2 (#236) Bumps `version.io.micronaut` from 4.4.1 to 4.4.2. Updates `io.micronaut.platform:micronaut-platform` from 4.4.1 to 4.4.2 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.4.1...v4.4.2) Updates `io.micronaut:micronaut-inject-java` from 4.4.1 to 4.4.2 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.5.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.4.1...v4.4.2) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6af751f..36fe788 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.4.1 + 4.4.2 From 639d740112b5c9d414d4ded74776d42907675c7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 20:25:55 +0000 Subject: [PATCH 169/195] Bump version.io.micronaut from 4.4.2 to 4.4.3 (#237) Bumps `version.io.micronaut` from 4.4.2 to 4.4.3. Updates `io.micronaut.platform:micronaut-platform` from 4.4.2 to 4.4.3 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.4.2...v4.4.3) Updates `io.micronaut:micronaut-inject-java` from 4.4.2 to 4.4.3 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.5.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.4.2...v4.4.3) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 36fe788..49759d7 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.4.2 + 4.4.3 From 765a053a41e14f270d9cd022f026b5dc0c475949 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 08:04:56 +0000 Subject: [PATCH 170/195] Bump version.io.micronaut from 4.4.3 to 4.5.0 (#238) Bumps `version.io.micronaut` from 4.4.3 to 4.5.0. Updates `io.micronaut.platform:micronaut-platform` from 4.4.3 to 4.5.0 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.4.3...v4.5.0) Updates `io.micronaut:micronaut-inject-java` from 4.4.3 to 4.5.0 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.5.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.4.3...v4.5.0) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 49759d7..fd25583 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.4.3 + 4.5.0 From fd8212dc6774190ee4e7941d4efcce076690701e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 20:57:31 +0000 Subject: [PATCH 171/195] Bump io.kokuwa.maven:maven-parent from 0.6.15 to 0.6.16 (#240) Bumps [io.kokuwa.maven:maven-parent](https://github.com/kokuwaio/maven-parent) from 0.6.15 to 0.6.16. - [Commits](https://github.com/kokuwaio/maven-parent/compare/0.6.15...0.6.16) --- updated-dependencies: - dependency-name: io.kokuwa.maven:maven-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd25583..aaaca39 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.kokuwa.maven maven-parent - 0.6.15 + 0.6.16 From ef345ea4b413a654ffa13594e725bce1e9c5d08d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 20:41:25 +0000 Subject: [PATCH 172/195] Bump version.io.micronaut from 4.5.0 to 4.5.1 (#241) Bumps `version.io.micronaut` from 4.5.0 to 4.5.1. Updates `io.micronaut.platform:micronaut-platform` from 4.5.0 to 4.5.1 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.5.0...v4.5.1) Updates `io.micronaut:micronaut-inject-java` from 4.5.0 to 4.5.1 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.6.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.5.0...v4.5.1) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aaaca39..12a3094 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.5.0 + 4.5.1 From 9dad10c57e67f8f5ee9283c6356c739d0fa19ead Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:48:47 +0000 Subject: [PATCH 173/195] Bump io.kokuwa.maven:maven-parent from 0.6.16 to 0.6.17 (#244) Bumps [io.kokuwa.maven:maven-parent](https://github.com/kokuwaio/maven-parent) from 0.6.16 to 0.6.17. - [Commits](https://github.com/kokuwaio/maven-parent/compare/0.6.16...0.6.17) --- updated-dependencies: - dependency-name: io.kokuwa.maven:maven-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 12a3094..a2cd224 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.kokuwa.maven maven-parent - 0.6.16 + 0.6.17 From 087f4604c483124b8592f072aa0e7c3e7fd9246c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:51:34 +0000 Subject: [PATCH 174/195] Bump version.io.micronaut from 4.5.1 to 4.6.1 (#243) Bumps `version.io.micronaut` from 4.5.1 to 4.6.1. Updates `io.micronaut.platform:micronaut-platform` from 4.5.1 to 4.6.1 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.5.1...v4.6.1) Updates `io.micronaut:micronaut-inject-java` from 4.5.1 to 4.6.1 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.7.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.5.1...v4.6.1) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2cd224..17ac576 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.5.1 + 4.6.1 From fb0b6293d2478820b935a1247fa2df696e36573f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 20:58:34 +0000 Subject: [PATCH 175/195] Bump version.io.micronaut from 4.6.1 to 4.6.2 (#246) Bumps `version.io.micronaut` from 4.6.1 to 4.6.2. Updates `io.micronaut.platform:micronaut-platform` from 4.6.1 to 4.6.2 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.6.1...v4.6.2) Updates `io.micronaut:micronaut-inject-java` from 4.6.1 to 4.6.2 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.7.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.6.1...v4.6.2) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 17ac576..2cee783 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.6.1 + 4.6.2 From b51be3e0642d7a46b367869dce728c9ca284cfbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 20:59:15 +0000 Subject: [PATCH 176/195] Bump version.io.micronaut from 4.6.2 to 4.6.3 (#247) Bumps `version.io.micronaut` from 4.6.2 to 4.6.3. Updates `io.micronaut.platform:micronaut-platform` from 4.6.2 to 4.6.3 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.6.2...v4.6.3) Updates `io.micronaut:micronaut-inject-java` from 4.6.2 to 4.6.3 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.7.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.6.2...v4.6.3) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2cee783..0fa6f80 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.6.2 + 4.6.3 From 13a083ee26729fbb92f982cbab67e9788033666d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 20:40:40 +0000 Subject: [PATCH 177/195] Bump version.io.micronaut from 4.6.3 to 4.7.0 (#248) Bumps `version.io.micronaut` from 4.6.3 to 4.7.0. Updates `io.micronaut.platform:micronaut-platform` from 4.6.3 to 4.7.0 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.6.3...v4.7.0) Updates `io.micronaut:micronaut-inject-java` from 4.6.3 to 4.7.0 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.7.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.6.3...v4.7.0) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0fa6f80..b1bb8c4 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.6.3 + 4.7.0 From 85cca360af6a50700de7b396a0baa5ed679377b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 20:35:30 +0000 Subject: [PATCH 178/195] Bump version.io.micronaut from 4.7.0 to 4.7.1 (#249) Bumps `version.io.micronaut` from 4.7.0 to 4.7.1. Updates `io.micronaut.platform:micronaut-platform` from 4.7.0 to 4.7.1 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.7.0...v4.7.1) Updates `io.micronaut:micronaut-inject-java` from 4.7.0 to 4.7.1 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.7.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.7.0...v4.7.1) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b1bb8c4..c7defe2 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.7.0 + 4.7.1 From 4bc8d2314ed4b9a2f4e827aa292aea060ce3b814 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 20:52:15 +0000 Subject: [PATCH 179/195] Bump version.io.micronaut from 4.7.1 to 4.7.2 (#250) Bumps `version.io.micronaut` from 4.7.1 to 4.7.2. Updates `io.micronaut.platform:micronaut-platform` from 4.7.1 to 4.7.2 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.7.1...v4.7.2) Updates `io.micronaut:micronaut-inject-java` from 4.7.1 to 4.7.2 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.8.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.7.1...v4.7.2) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c7defe2..4c24833 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.7.1 + 4.7.2 From 054a0f175d5434b305a1c4f9968e5ba4a523506a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:05:42 +0000 Subject: [PATCH 180/195] Bump io.kokuwa.maven:maven-parent from 0.6.17 to 0.6.18 (#251) Bumps [io.kokuwa.maven:maven-parent](https://github.com/kokuwaio/maven-parent) from 0.6.17 to 0.6.18. - [Commits](https://github.com/kokuwaio/maven-parent/compare/0.6.17...0.6.18) --- updated-dependencies: - dependency-name: io.kokuwa.maven:maven-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c24833..96d15bd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.kokuwa.maven maven-parent - 0.6.17 + 0.6.18 From 0b095c023d5a694eb0390bb3e553a1c566c11e4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 21:01:29 +0000 Subject: [PATCH 181/195] Bump version.io.micronaut from 4.7.2 to 4.7.3 (#253) Bumps `version.io.micronaut` from 4.7.2 to 4.7.3. Updates `io.micronaut.platform:micronaut-platform` from 4.7.2 to 4.7.3 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.7.2...v4.7.3) Updates `io.micronaut:micronaut-inject-java` from 4.7.2 to 4.7.3 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.8.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.7.2...v4.7.3) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 96d15bd..3b3fae8 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.7.2 + 4.7.3 From 5910af54291c87d73459fc79e3eaf14f82736a2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:33:24 +0000 Subject: [PATCH 182/195] Bump version.io.micronaut from 4.7.3 to 4.7.4 (#254) Bumps `version.io.micronaut` from 4.7.3 to 4.7.4. Updates `io.micronaut.platform:micronaut-platform` from 4.7.3 to 4.7.4 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.7.3...v4.7.4) Updates `io.micronaut:micronaut-inject-java` from 4.7.3 to 4.7.4 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.8.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.7.3...v4.7.4) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b3fae8..b5cc400 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.7.3 + 4.7.4 From 16a15c84fb9014631d70465066d0b7d99f62194c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 12:53:28 +0000 Subject: [PATCH 183/195] Bump version.io.micronaut from 4.7.4 to 4.7.5 (#255) * Bump version.io.micronaut from 4.7.4 to 4.7.5 Bumps `version.io.micronaut` from 4.7.4 to 4.7.5. Updates `io.micronaut.platform:micronaut-platform` from 4.7.4 to 4.7.5 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.7.4...v4.7.5) Updates `io.micronaut:micronaut-inject-java` from 4.7.4 to 4.7.5 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.8.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.7.4...v4.7.5) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Remove ansi codes. --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stephan Schnabel --- pom.xml | 2 +- src/it/level-from-micronaut/postbuild.bsh | 3 ++- src/it/log-text/postbuild.bsh | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b5cc400..a231f2f 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.7.4 + 4.7.5 diff --git a/src/it/level-from-micronaut/postbuild.bsh b/src/it/level-from-micronaut/postbuild.bsh index a280b60..026881f 100644 --- a/src/it/level-from-micronaut/postbuild.bsh +++ b/src/it/level-from-micronaut/postbuild.bsh @@ -7,12 +7,13 @@ for (String log : logs) { if (!log.contains("test-output-marker")) { continue; } - if (java.util.regex.Pattern.matches(expected, log)) { + if (java.util.regex.Pattern.matches(expected, log.replaceAll("\u001B\\[[;\\d]*m", ""))) { return true; } else { System.out.println("marker found, but formatting invalid:"); System.out.println("[EXPECTED] " + expected); System.out.println("[ACTUAL] " + log); + System.out.println("[BASE64] " + Base64.getEncoder().encodeToString(log.getBytes())); return false; } } diff --git a/src/it/log-text/postbuild.bsh b/src/it/log-text/postbuild.bsh index aa337ea..40e2f91 100644 --- a/src/it/log-text/postbuild.bsh +++ b/src/it/log-text/postbuild.bsh @@ -7,12 +7,13 @@ for (String log : logs) { if (!log.contains("test-output-marker")) { continue; } - if (java.util.regex.Pattern.matches(expected, log)) { + if (java.util.regex.Pattern.matches(expected, log.replaceAll("\u001B\\[[;\\d]*m", ""))) { return true; } else { System.out.println("marker found, but formatting invalid:"); System.out.println("[EXPECTED] " + expected); System.out.println("[ACTUAL] " + log); + System.out.println("[BASE64] " + Base64.getEncoder().encodeToString(log.getBytes())); return false; } } From 69a74fe2f86685e101384798b547feb8761aa59a Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 12 Feb 2025 13:58:21 +0100 Subject: [PATCH 184/195] Fix build. --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8a26df0..1c82019 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,7 +9,7 @@ jobs: build: runs-on: ubuntu-latest env: - MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress --settings=.github/settings.xml + MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress --settings=${{ github.workspace }}/.github/settings.xml steps: - run: git config --global user.name "${{ vars.KOKUWA_IO_BOT_NAME }}" - run: git config --global user.email "${{ vars.KOKUWA_IO_BOT_EMAIL }}" From 1360f6d38f113c6902580d1e9335631996da322b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 20:29:17 +0000 Subject: [PATCH 185/195] Bump version.io.micronaut from 4.7.5 to 4.7.6 (#256) Bumps `version.io.micronaut` from 4.7.5 to 4.7.6. Updates `io.micronaut.platform:micronaut-platform` from 4.7.5 to 4.7.6 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.7.5...v4.7.6) Updates `io.micronaut:micronaut-inject-java` from 4.7.5 to 4.7.6 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.9.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.7.5...v4.7.6) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a231f2f..85ab499 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.7.5 + 4.7.6 From 86564d34be1900782f88b17ffeb6bbe742da7423 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 20:12:05 +0000 Subject: [PATCH 186/195] Bump version.io.micronaut from 4.7.6 to 4.8.0 (#257) Bumps `version.io.micronaut` from 4.7.6 to 4.8.0. Updates `io.micronaut.platform:micronaut-platform` from 4.7.6 to 4.8.0 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.7.6...v4.8.0) Updates `io.micronaut:micronaut-inject-java` from 4.7.6 to 4.8.0 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.9.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.7.6...v4.8.0) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-version: 4.8.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micronaut:micronaut-inject-java dependency-version: 4.8.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 85ab499..7f75bfb 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.7.6 + 4.8.0 From 3f26c4d7a35f5c630ea782d09336a4f20a6a1ab1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 20:22:21 +0000 Subject: [PATCH 187/195] Bump version.io.micronaut from 4.8.0 to 4.8.1 (#258) Bumps `version.io.micronaut` from 4.8.0 to 4.8.1. Updates `io.micronaut.platform:micronaut-platform` from 4.8.0 to 4.8.1 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.8.0...v4.8.1) Updates `io.micronaut:micronaut-inject-java` from 4.8.0 to 4.8.1 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.9.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.8.0...v4.8.1) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-version: 4.8.1 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-version: 4.8.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f75bfb..6004d3f 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.8.0 + 4.8.1 From 6c09c3a7364e429d519026c7fbf363a42e251a05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Apr 2025 20:59:53 +0000 Subject: [PATCH 188/195] Bump version.io.micronaut from 4.8.1 to 4.8.2 (#259) Bumps `version.io.micronaut` from 4.8.1 to 4.8.2. Updates `io.micronaut.platform:micronaut-platform` from 4.8.1 to 4.8.2 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.8.1...v4.8.2) Updates `io.micronaut:micronaut-inject-java` from 4.8.1 to 4.8.2 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.9.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.8.1...v4.8.2) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-version: 4.8.2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-version: 4.8.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6004d3f..c0be9c4 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.8.1 + 4.8.2 From 47bc48b9d216f20e6e269034287f54baf4f66d95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Jun 2025 20:10:38 +0000 Subject: [PATCH 189/195] Bump version.io.micronaut from 4.8.2 to 4.8.3 (#260) Bumps `version.io.micronaut` from 4.8.2 to 4.8.3. Updates `io.micronaut.platform:micronaut-platform` from 4.8.2 to 4.8.3 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.8.2...v4.8.3) Updates `io.micronaut:micronaut-inject-java` from 4.8.2 to 4.8.3 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.10.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.8.2...v4.8.3) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-version: 4.8.3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.micronaut:micronaut-inject-java dependency-version: 4.8.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0be9c4..a0104b9 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.8.2 + 4.8.3 From 9c383a277fae9d6b92a03a80bafaa49b39e8defa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Jun 2025 20:52:04 +0000 Subject: [PATCH 190/195] Bump version.io.micronaut from 4.8.3 to 4.9.0 (#261) Bumps `version.io.micronaut` from 4.8.3 to 4.9.0. Updates `io.micronaut.platform:micronaut-platform` from 4.8.3 to 4.9.0 - [Release notes](https://github.com/micronaut-projects/micronaut-platform/releases) - [Commits](https://github.com/micronaut-projects/micronaut-platform/compare/v4.8.3...v4.9.0) Updates `io.micronaut:micronaut-inject-java` from 4.8.3 to 4.9.0 - [Release notes](https://github.com/micronaut-projects/micronaut-core/releases) - [Changelog](https://github.com/micronaut-projects/micronaut-core/blob/4.10.x/RELEASE.adoc) - [Commits](https://github.com/micronaut-projects/micronaut-core/compare/v4.8.3...v4.9.0) --- updated-dependencies: - dependency-name: io.micronaut.platform:micronaut-platform dependency-version: 4.9.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micronaut:micronaut-inject-java dependency-version: 4.9.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0104b9..5a94cbb 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 4.8.3 + 4.9.0 From 50fe4a86b80503292e5ed514bdc6548e654a5a8b Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Fri, 27 Jun 2025 14:22:44 +0200 Subject: [PATCH 191/195] chore: migrated repository from `github.com` to `git.kokuwa.io` --- .github/CODEOWNERS | 4 - .github/README.md | 11 + .github/dependabot.yml | 25 -- .github/settings.xml | 16 - .github/workflows/build.yaml | 31 -- .github/workflows/dependabot.yaml | 17 - .github/workflows/pr.yaml | 41 -- .github/workflows/release.yaml | 39 -- .justfile | 12 + .woodpecker/deploy.yaml | 16 + .woodpecker/lint.yaml | 21 + .woodpecker/maven/settings.xml | 23 + .woodpecker/release.yaml | 29 ++ .woodpecker/verify.yaml | 9 + .yamllint => .yamllint.yaml | 4 - LICENSE | 425 +++++++++++------- README.md | 10 +- docs/features/logback_mdc_level.md | 2 +- pom.xml | 381 +++++++++++++--- renovate.json | 4 + src/eclipse/formatter.xml | 404 +++++++++++++++++ src/it/invoker.properties | 3 + src/it/pom.xml | 81 +--- .../kokuwa/micronaut/logging/LogbackUtil.java | 3 +- .../http/level/LogLevelServerFilter.java | 5 +- .../logging/mdc/MDCTurboFilterConfigurer.java | 2 +- .../logging/http/AbstractFilterTest.java | 6 +- 27 files changed, 1145 insertions(+), 479 deletions(-) delete mode 100644 .github/CODEOWNERS create mode 100644 .github/README.md delete mode 100644 .github/dependabot.yml delete mode 100644 .github/settings.xml delete mode 100644 .github/workflows/build.yaml delete mode 100644 .github/workflows/dependabot.yaml delete mode 100644 .github/workflows/pr.yaml delete mode 100644 .github/workflows/release.yaml create mode 100644 .justfile create mode 100644 .woodpecker/deploy.yaml create mode 100644 .woodpecker/lint.yaml create mode 100644 .woodpecker/maven/settings.xml create mode 100644 .woodpecker/release.yaml create mode 100644 .woodpecker/verify.yaml rename .yamllint => .yamllint.yaml (83%) create mode 100644 renovate.json create mode 100644 src/eclipse/formatter.xml create mode 100644 src/it/invoker.properties diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index 6e53241..0000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1,4 +0,0 @@ -# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax -* @sschnabe @rpahli @fabian-schlegel @wistefan -.github/workflows/* @kokuwaio-bot @sschnabe @rpahli @fabian-schlegel @wistefan -pom.xml @kokuwaio-bot @sschnabe @rpahli @fabian-schlegel @wistefan diff --git a/.github/README.md b/.github/README.md new file mode 100644 index 0000000..f74f3b7 --- /dev/null +++ b/.github/README.md @@ -0,0 +1,11 @@ +# Micronaut Logging support + +Enhanced logging for Micronaut using MDC or request header. + +[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/io.kokuwa.micronaut/micronaut-logging) +[![license](https://img.shields.io/badge/License-EUPL%201.2-blue)](https://git.kokuwa.io/kokuwaio/micronaut-logging/src/branch/main/LICENSE) +[![prs](https://img.shields.io/gitea/pull-requests/open/kokuwaio/micronaut-logging?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/micronaut-logging/pulls) +[![issues](https://img.shields.io/gitea/issues/open/kokuwaio/micronaut-logging?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/micronaut-logging/issues) +[![build](https://ci.kokuwa.io/api/badges/kokuwaio/micronaut-logging/status.svg)](https://ci.kokuwa.io/repos/kokuwaio/micronaut-logging/) + +For more documention see: [git.kokuwa.io/kokuwaio/micronaut-logging](https://git.kokuwa.io/kokuwaio/micronaut-logging) diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 4004022..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: 2 -updates: - - package-ecosystem: maven - directory: / - schedule: - interval: daily - - package-ecosystem: github-actions - directory: / - schedule: - interval: monthly - day: monday - - package-ecosystem: maven - directory: / - target-branch: 3.x - schedule: - interval: daily - ignore: - - dependency-name: io.micronaut:* - update-types: [version-update:semver-major] - - package-ecosystem: github-actions - directory: / - target-branch: 3.x - schedule: - interval: monthly - day: monday diff --git a/.github/settings.xml b/.github/settings.xml deleted file mode 100644 index 44fd9ea..0000000 --- a/.github/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - sonatype-nexus - ${env.SERVER_USERNAME} - ${env.SERVER_PASSWORD} - - - github.com - nope - ${env.GIT_ACTION_TOKEN} - - - diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml deleted file mode 100644 index 1c82019..0000000 --- a/.github/workflows/build.yaml +++ /dev/null @@ -1,31 +0,0 @@ -name: Build - -on: - push: - branches: [main, "*.x"] - -jobs: - - build: - runs-on: ubuntu-latest - env: - MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress --settings=${{ github.workspace }}/.github/settings.xml - steps: - - run: git config --global user.name "${{ vars.KOKUWA_IO_BOT_NAME }}" - - run: git config --global user.email "${{ vars.KOKUWA_IO_BOT_EMAIL }}" - - uses: actions/checkout@v4 - with: - token: ${{ secrets.GIT_ACTION_TOKEN }} - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 17 - cache: maven - - run: mvn $MAVEN_ARGS dependency:go-offline - - run: mvn $MAVEN_ARGS deploy - env: - SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - - run: mvn $MAVEN_ARGS site-deploy - env: - GIT_ACTION_TOKEN: ${{ secrets.GIT_ACTION_TOKEN }} diff --git a/.github/workflows/dependabot.yaml b/.github/workflows/dependabot.yaml deleted file mode 100644 index ed63eca..0000000 --- a/.github/workflows/dependabot.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: Dependabot - -on: pull_request_target - -jobs: - auto-merge: - runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} - steps: - - run: gh pr review --approve "$PR_URL" - env: - PR_URL: ${{ github.event.pull_request.html_url }} - GITHUB_TOKEN: ${{ secrets.GIT_ACTION_TOKEN }} - - run: gh pr merge --auto --squash "$PR_URL" - env: - PR_URL: ${{ github.event.pull_request.html_url }} - GITHUB_TOKEN: ${{ secrets.GIT_ACTION_TOKEN }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml deleted file mode 100644 index b8527ba..0000000 --- a/.github/workflows/pr.yaml +++ /dev/null @@ -1,41 +0,0 @@ -name: PullRequest - -on: pull_request - -jobs: - - yaml: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ibiqlik/action-yamllint@v3 - with: - format: colored - strict: true - - markdown: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: avto-dev/markdown-lint@v1 - with: - args: /github/workspace - - build: - runs-on: ubuntu-latest - env: - MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress -Dmaven.test.redirectTestOutputToFile=false - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 17 - cache: maven - - run: mvn $MAVEN_ARGS dependency:go-offline - - run: mvn $MAVEN_ARGS verify - - run: mvn $MAVEN_ARGS site - - uses: actions/upload-artifact@v4 - if: always() - with: - path: target/site diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index 0e5bda9..0000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,39 +0,0 @@ -name: Release - -on: workflow_dispatch - -jobs: - build: - runs-on: ubuntu-latest - env: - MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress --settings=.github/settings.xml - steps: - - run: git config --global user.name "${{ vars.KOKUWA_IO_BOT_NAME }}" - - run: git config --global user.email "${{ vars.KOKUWA_IO_BOT_EMAIL }}" - - uses: actions/checkout@v4 - with: - token: ${{ secrets.GIT_ACTION_TOKEN }} - - uses: crazy-max/ghaction-import-gpg@v6 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.GPG_PASSPHRASE }} - git_user_signingkey: true - git_commit_gpgsign: true - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 17 - cache: maven - server-id: sonatype-nexus - server-username: SERVER_USERNAME - server-password: SERVER_PASSWORD - gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - gpg-passphrase: GPG_PASSPHRASE - - run: mvn $MAVEN_ARGS dependency:go-offline - - run: mvn $MAVEN_ARGS release:prepare -Darguments="$MAVEN_ARGS" - - run: mvn $MAVEN_ARGS release:perform -Darguments="$MAVEN_ARGS" - env: - SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - GIT_ACTION_TOKEN: ${{ secrets.GIT_ACTION_TOKEN }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} diff --git a/.justfile b/.justfile new file mode 100644 index 0000000..81f407b --- /dev/null +++ b/.justfile @@ -0,0 +1,12 @@ +# https://just.systems/man/en/ + +[private] +@default: + just --list --unsorted + +# Run linter. +@lint: + docker run --rm --read-only --volume=$(pwd):$(pwd):ro --workdir=$(pwd) kokuwaio/yamllint + docker run --rm --read-only --volume=$(pwd):$(pwd):rw --workdir=$(pwd) kokuwaio/markdownlint --fix + docker run --rm --read-only --volume=$(pwd):$(pwd):ro --workdir=$(pwd) kokuwaio/renovate-config-validator + docker run --rm --read-only --volume=$(pwd):$(pwd):ro --workdir=$(pwd) woodpeckerci/woodpecker-cli lint diff --git a/.woodpecker/deploy.yaml b/.woodpecker/deploy.yaml new file mode 100644 index 0000000..11f903e --- /dev/null +++ b/.woodpecker/deploy.yaml @@ -0,0 +1,16 @@ +when: + instance: ci.kokuwa.io + repo: kokuwaio/micronaut-logging + event: [manual, push] + branch: main + path: [.woodpecker/deploy.yaml, pom.xml, src/main/**] + +steps: + + maven: + image: maven:3.9.10-eclipse-temurin-17 + commands: mvn deploy --settings=.woodpecker/maven/settings.xml + environment: + MAVEN_GPG_KEY: {from_secret: woodpecker_gpg_key} + SONATYPE_ORG_USERNAME: {from_secret: sonatype_org_username} + SONATYPE_ORG_PASSWORD: {from_secret: sonatype_org_password} diff --git a/.woodpecker/lint.yaml b/.woodpecker/lint.yaml new file mode 100644 index 0000000..74bb114 --- /dev/null +++ b/.woodpecker/lint.yaml @@ -0,0 +1,21 @@ +when: + event: [manual, pull_request, push] + branch: main + path: [.woodpecker/lint.yaml, renovate.json, "**/*.y*ml", "**/*.md"] + +steps: + + renovate: + image: kokuwaio/renovate-config-validator + depends_on: [] + when: [path: [.woodpecker/lint.yaml, renovate.json]] + + yaml: + image: kokuwaio/yamllint + depends_on: [] + when: [path: [.woodpecker/lint.yaml, .yamllint.yaml, "**/*.y*ml"]] + + markdown: + image: kokuwaio/markdownlint + depends_on: [] + when: [path: [.woodpecker/lint.yaml, .markdownlint.yaml, "**/*.md"]] diff --git a/.woodpecker/maven/settings.xml b/.woodpecker/maven/settings.xml new file mode 100644 index 0000000..57ad1cb --- /dev/null +++ b/.woodpecker/maven/settings.xml @@ -0,0 +1,23 @@ + + + false + /woodpecker/.m2 + + + git.kokuwa.io + ${env.FORGEJO_USERNAME} + ${env.FORGEJO_PASSWORD} + + + sonatype.org + ${env.SONATYPE_ORG_USERNAME} + ${env.SONATYPE_ORG_PASSWORD} + + + + + http://mirror.woodpecker.svc.cluster.local/maven2 + central + + + diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml new file mode 100644 index 0000000..21a190e --- /dev/null +++ b/.woodpecker/release.yaml @@ -0,0 +1,29 @@ +when: + instance: ci.kokuwa.io + repo: kokuwaio/micronaut-logging + event: deployment + branch: main + +steps: + + maven: + image: maven:3.9.10-eclipse-temurin-17 + commands: + # setup git with ssk key signing + - git config user.email "$GIT_USER_EMAIL" + - git config user.name "$GIT_USER_NAME" + - git config commit.gpgsign true + - git config gpg.format ssh + - git config user.signingkey /run/secrets/sign.pub + - install -m 400 /dev/null /run/secrets/sign && echo "$GIT_SIGN_KEY" > /run/secrets/sign + - install -m 444 /dev/null /run/secrets/sign.pub && echo "$GIT_SIGN_PUB" > /run/secrets/sign.pub + # release + - mvn release:prepare release:perform --settings=.woodpecker/maven/settings.xml + environment: + MAVEN_GPG_KEY: {from_secret: woodpecker_gpg_key} + GIT_SIGN_KEY: {from_secret: woodpecker_sign_key} + GIT_SIGN_PUB: {from_secret: woodpecker_sign_pub} + FORGEJO_USERNAME: {from_secret: woodpecker_username} + FORGEJO_PASSWORD: {from_secret: woodpecker_password} + SONATYPE_ORG_USERNAME: {from_secret: sonatype_org_username} + SONATYPE_ORG_PASSWORD: {from_secret: sonatype_org_password} diff --git a/.woodpecker/verify.yaml b/.woodpecker/verify.yaml new file mode 100644 index 0000000..c947ea8 --- /dev/null +++ b/.woodpecker/verify.yaml @@ -0,0 +1,9 @@ +when: + event: [manual, pull_request] + path: [.woodpecker/verify.yaml, pom.xml, src/**] + +steps: + + test: + image: maven:3.9.10-eclipse-temurin-17 + commands: mvn verify --settings=.woodpecker/maven/settings.xml diff --git a/.yamllint b/.yamllint.yaml similarity index 83% rename from .yamllint rename to .yamllint.yaml index 8011808..21966f2 100644 --- a/.yamllint +++ b/.yamllint.yaml @@ -13,7 +13,3 @@ rules: quoted-strings: quote-type: double required: only-when-needed - - # allow everything on keys - truthy: - check-keys: false diff --git a/LICENSE b/LICENSE index 261eeb9..dacd3ae 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,288 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + EUROPEAN UNION PUBLIC LICENCE v. 1.2 + EUPL © the European Union 2007, 2016 - 1. Definitions. +This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined +below) which is provided under the terms of this Licence. Any use of the Work, +other than as authorised under this Licence is prohibited (to the extent such +use is covered by a right of the copyright holder of the Work). - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. +The Work is provided under the terms of this Licence when the Licensor (as +defined below) has placed the following notice immediately following the +copyright notice for the Work: - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. + Licensed under the EUPL - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. +or has expressed by any other means his willingness to license under the EUPL. - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. +1. Definitions - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. +In this Licence, the following terms have the following meaning: - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. +- ‘The Licence’: this Licence. - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). +- ‘The Original Work’: the work or software distributed or communicated by the + Licensor under this Licence, available as Source Code and also as Executable + Code as the case may be. - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. +- ‘Derivative Works’: the works or software that could be created by the + Licensee, based upon the Original Work or modifications thereof. This Licence + does not define the extent of modification or dependence on the Original Work + required in order to classify a work as a Derivative Work; this extent is + determined by copyright law applicable in the country mentioned in Article 15. - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." +- ‘The Work’: the Original Work or its Derivative Works. - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. +- ‘The Source Code’: the human-readable form of the Work which is the most + convenient for people to study and modify. - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. +- ‘The Executable Code’: any code which has generally been compiled and which is + meant to be interpreted by a computer as a program. - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. +- ‘The Licensor’: the natural or legal person that distributes or communicates + the Work under the Licence. - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: +- ‘Contributor(s)’: any natural or legal person who modifies the Work under the + Licence, or otherwise contributes to the creation of a Derivative Work. - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and +- ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of + the Work under the terms of the Licence. - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and +- ‘Distribution’ or ‘Communication’: any act of selling, giving, lending, + renting, distributing, communicating, transmitting, or otherwise making + available, online or offline, copies of the Work or providing access to its + essential functionalities at the disposal of any other natural or legal + person. - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and +2. Scope of the rights granted by the Licence - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. +The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +sublicensable licence to do the following, for the duration of copyright vested +in the Original Work: - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. +- use the Work in any circumstance and for all usage, +- reproduce the Work, +- modify the Work, and make Derivative Works based upon the Work, +- communicate to the public, including the right to make available or display + the Work or copies thereof to the public and perform publicly, as the case may + be, the Work, +- distribute the Work or copies thereof, +- lend and rent the Work or copies thereof, +- sublicense rights in the Work or copies thereof. - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. +Those rights can be exercised on any media, supports and formats, whether now +known or later invented, as far as the applicable law permits so. - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. +In the countries where moral rights apply, the Licensor waives his right to +exercise his moral right to the extent allowed by law in order to make effective +the licence of the economic rights here above listed. - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. +The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to +any patents held by the Licensor, to the extent necessary to make use of the +rights granted on the Work under this Licence. - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. +3. Communication of the Source Code - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. +The Licensor may provide the Work either in its Source Code form, or as +Executable Code. If the Work is provided as Executable Code, the Licensor +provides in addition a machine-readable copy of the Source Code of the Work +along with each copy of the Work that the Licensor distributes or indicates, in +a notice following the copyright notice attached to the Work, a repository where +the Source Code is easily and freely accessible for as long as the Licensor +continues to distribute or communicate the Work. - END OF TERMS AND CONDITIONS +4. Limitations on copyright - APPENDIX: How to apply the Apache License to your work. +Nothing in this Licence is intended to deprive the Licensee of the benefits from +any exception or limitation to the exclusive rights of the rights owners in the +Work, of the exhaustion of those rights or of other applicable limitations +thereto. - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. +5. Obligations of the Licensee - Copyright [yyyy] [name of copyright owner] +The grant of the rights mentioned above is subject to some restrictions and +obligations imposed on the Licensee. Those obligations are the following: - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +Attribution right: The Licensee shall keep intact all copyright, patent or +trademarks notices and all notices that refer to the Licence and to the +disclaimer of warranties. The Licensee must include a copy of such notices and a +copy of the Licence with every copy of the Work he/she distributes or +communicates. The Licensee must cause any Derivative Work to carry prominent +notices stating that the Work has been modified and the date of modification. - http://www.apache.org/licenses/LICENSE-2.0 +Copyleft clause: If the Licensee distributes or communicates copies of the +Original Works or Derivative Works, this Distribution or Communication will be +done under the terms of this Licence or of a later version of this Licence +unless the Original Work is expressly distributed only under this version of the +Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee +(becoming Licensor) cannot offer or impose any additional terms or conditions on +the Work or Derivative Work that alter or restrict the terms of the Licence. - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Compatibility clause: If the Licensee Distributes or Communicates Derivative +Works or copies thereof based upon both the Work and another work licensed under +a Compatible Licence, this Distribution or Communication can be done under the +terms of this Compatible Licence. For the sake of this clause, ‘Compatible +Licence’ refers to the licences listed in the appendix attached to this Licence. +Should the Licensee's obligations under the Compatible Licence conflict with +his/her obligations under this Licence, the obligations of the Compatible +Licence shall prevail. + +Provision of Source Code: When distributing or communicating copies of the Work, +the Licensee will provide a machine-readable copy of the Source Code or indicate +a repository where this Source will be easily and freely available for as long +as the Licensee continues to distribute or communicate the Work. + +Legal Protection: This Licence does not grant permission to use the trade names, +trademarks, service marks, or names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the copyright notice. + +6. Chain of Authorship + +The original Licensor warrants that the copyright in the Original Work granted +hereunder is owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each Contributor warrants that the copyright in the modifications he/she brings +to the Work are owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each time You accept the Licence, the original Licensor and subsequent +Contributors grant You a licence to their contributions to the Work, under the +terms of this Licence. + +7. Disclaimer of Warranty + +The Work is a work in progress, which is continuously improved by numerous +Contributors. It is not a finished work and may therefore contain defects or +‘bugs’ inherent to this type of development. + +For the above reason, the Work is provided under the Licence on an ‘as is’ basis +and without warranties of any kind concerning the Work, including without +limitation merchantability, fitness for a particular purpose, absence of defects +or errors, accuracy, non-infringement of intellectual property rights other than +copyright as stated in Article 6 of this Licence. + +This disclaimer of warranty is an essential part of the Licence and a condition +for the grant of any rights to the Work. + +8. Disclaimer of Liability + +Except in the cases of wilful misconduct or damages directly caused to natural +persons, the Licensor will in no event be liable for any direct or indirect, +material or moral, damages of any kind, arising out of the Licence or of the use +of the Work, including without limitation, damages for loss of goodwill, work +stoppage, computer failure or malfunction, loss of data or any commercial +damage, even if the Licensor has been advised of the possibility of such damage. +However, the Licensor will be liable under statutory product liability laws as +far such laws apply to the Work. + +9. Additional agreements + +While distributing the Work, You may choose to conclude an additional agreement, +defining obligations or services consistent with this Licence. However, if +accepting obligations, You may act only on your own behalf and on your sole +responsibility, not on behalf of the original Licensor or any other Contributor, +and only if You agree to indemnify, defend, and hold each Contributor harmless +for any liability incurred by, or claims asserted against such Contributor by +the fact You have accepted any warranty or additional liability. + +10. Acceptance of the Licence + +The provisions of this Licence can be accepted by clicking on an icon ‘I agree’ +placed under the bottom of a window displaying the text of this Licence or by +affirming consent in any other similar way, in accordance with the rules of +applicable law. Clicking on that icon indicates your clear and irrevocable +acceptance of this Licence and all of its terms and conditions. + +Similarly, you irrevocably accept this Licence and all of its terms and +conditions by exercising any rights granted to You by Article 2 of this Licence, +such as the use of the Work, the creation by You of a Derivative Work or the +Distribution or Communication by You of the Work or copies thereof. + +11. Information to the public + +In case of any Distribution or Communication of the Work by means of electronic +communication by You (for example, by offering to download the Work from a +remote location) the distribution channel or media (for example, a website) must +at least provide to the public the information requested by the applicable law +regarding the Licensor, the Licence and the way it may be accessible, concluded, +stored and reproduced by the Licensee. + +12. Termination of the Licence + +The Licence and the rights granted hereunder will terminate automatically upon +any breach by the Licensee of the terms of the Licence. + +Such a termination will not terminate the licences of any person who has +received the Work from the Licensee under the Licence, provided such persons +remain in full compliance with the Licence. + +13. Miscellaneous + +Without prejudice of Article 9 above, the Licence represents the complete +agreement between the Parties as to the Work. + +If any provision of the Licence is invalid or unenforceable under applicable +law, this will not affect the validity or enforceability of the Licence as a +whole. Such provision will be construed or reformed so as necessary to make it +valid and enforceable. + +The European Commission may publish other linguistic versions or new versions of +this Licence or updated versions of the Appendix, so far this is required and +reasonable, without reducing the scope of the rights granted by the Licence. New +versions of the Licence will be published with a unique version number. + +All linguistic versions of this Licence, approved by the European Commission, +have identical value. Parties can take advantage of the linguistic version of +their choice. + +14. Jurisdiction + +Without prejudice to specific agreement between parties, + +- any litigation resulting from the interpretation of this License, arising + between the European Union institutions, bodies, offices or agencies, as a + Licensor, and any Licensee, will be subject to the jurisdiction of the Court + of Justice of the European Union, as laid down in article 272 of the Treaty on + the Functioning of the European Union, + +- any litigation arising between other parties and resulting from the + interpretation of this License, will be subject to the exclusive jurisdiction + of the competent court where the Licensor resides or conducts its primary + business. + +15. Applicable Law + +Without prejudice to specific agreement between parties, + +- this Licence shall be governed by the law of the European Union Member State + where the Licensor has his seat, resides or has his registered office, + +- this licence shall be governed by Belgian law if the Licensor has no seat, + residence or registered office inside a European Union Member State. + +Appendix + +‘Compatible Licences’ according to Article 5 EUPL are: + +- GNU General Public License (GPL) v. 2, v. 3 +- GNU Affero General Public License (AGPL) v. 3 +- Open Software License (OSL) v. 2.1, v. 3.0 +- Eclipse Public License (EPL) v. 1.0 +- CeCILL v. 2.0, v. 2.1 +- Mozilla Public Licence (MPL) v. 2 +- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 +- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for + works other than software +- European Union Public Licence (EUPL) v. 1.1, v. 1.2 +- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong + Reciprocity (LiLiQ-R+). + +The European Commission may update this Appendix to later versions of the above +licences without producing a new version of the EUPL, as long as they provide +the rights granted in Article 2 of this Licence and protect the covered Source +Code from exclusive appropriation. + +All other changes or additions to this Appendix require the production of a new +EUPL version. diff --git a/README.md b/README.md index 919ed66..627aea3 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,12 @@ # Micronaut Logging support -[![Apache License 2.0](https://img.shields.io/github/license/kokuwaio/micronaut-logging)](https://github.com/kokuwaio/micronaut-logging/blob/main/LICENSE) -[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging)](https://central.sonatype.com/namespace/io.kokuwa.micronaut) -[![Build](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/build.yaml?branch=main)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/build.yaml?query=branch%3Amain) +Enhanced logging for Micronaut using MDC or request header. + +[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/io.kokuwa.micronaut/micronaut-logging) +[![license](https://img.shields.io/badge/License-EUPL%201.2-blue)](https://git.kokuwa.io/kokuwaio/micronaut-logging/src/branch/main/LICENSE) +[![prs](https://img.shields.io/gitea/pull-requests/open/kokuwaio/micronaut-logging?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/micronaut-logging/pulls) +[![issues](https://img.shields.io/gitea/issues/open/kokuwaio/micronaut-logging?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/micronaut-logging/issues) +[![build](https://ci.kokuwa.io/api/badges/kokuwaio/micronaut-logging/status.svg)](https://ci.kokuwa.io/repos/kokuwaio/micronaut-logging/) Include in your `pom.xml`: diff --git a/docs/features/logback_mdc_level.md b/docs/features/logback_mdc_level.md index 53887d5..ee1e853 100644 --- a/docs/features/logback_mdc_level.md +++ b/docs/features/logback_mdc_level.md @@ -7,7 +7,7 @@ This can be used to change the log level based on MDC valus. E.g. change log lev Property | Description | Default -------- | ----------- | ------- `logger.mdc.enabled` | MDC enabled? | `true` -`logger.mdc.` | MDC key to use | +`logger.mdc.` | MDC key to use | `` `logger.mdc..key` | MDC key override, see complex example below for usage | `` `logger.mdc..level` | log level to use | `TRACE` `logger.mdc..loggers` | passlist of logger names, matches all loggers if empty | `[]` diff --git a/pom.xml b/pom.xml index 5a94cbb..30b450b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,20 +2,13 @@ 4.0.0 - - io.kokuwa.maven - maven-parent - 0.6.18 - - - io.kokuwa.micronaut micronaut-logging - 4.0.2-SNAPSHOT + 5.0.0-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. - https://github.com/kokuwaio/micronaut-logging + https://git.kokuwa.io/kokuwaio/micronaut-logging 2020 Kokuwa.io @@ -23,55 +16,47 @@ - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt + EUPL-1.2 + https://eupl.eu/1.2/en repo - sschnabe + stephan.schnabel Stephan Schnabel - stephan@grayc.de - https://github.com/sschnabe - GrayC GmbH - https://grayc.de + https://schnabel.org + stephan@schnabel.org Europe/Berlin - https://github.com/kokuwaio/micronaut-logging - scm:git:https://github.com/kokuwaio/micronaut-logging.git - scm:git:https://github.com/kokuwaio/micronaut-logging.git + https://git.kokuwa.io/kokuwaio/micronaut-logging + scm:git:https://git.kokuwa.io/kokuwaio/micronaut-logging.git + scm:git:https://git.kokuwa.io/kokuwaio/micronaut-logging.git HEAD - github - https://github.com/kokuwaio/micronaut-logging/issues + forgejo + https://git.kokuwa.io/kokuwaio/micronaut-logging/issues - github - https://github.com/kokuwaio/micronaut-logging/actions + woodpecker + https://ci.kokuwa.io/repos/kokuwaio/micronaut-logging + + + sonatype.org + https://central.sonatype.com/repository/maven-snapshots/ + + - - - - - - 17 - 17 - class - - - - - - 4.9.0 - + 2025-06-27T00:00:00Z + UTF-8 + 17 @@ -79,7 +64,7 @@ io.micronaut.platform micronaut-platform - ${version.io.micronaut} + 4.9.0 pom import @@ -156,23 +141,120 @@ + verify + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.14.0 + + class + true + true + true + -Xlint:all,-processing + + + io.micronaut + micronaut-inject-java + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.4 + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.7 + + + org.apache.maven.plugins + maven-install-plugin + 3.1.4 + + + org.apache.maven.plugins + maven-invoker-plugin + 3.9.0 + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.11.2 + + + org.apache.maven.plugins + maven-release-plugin + 3.1.1 + + verify + check + deploy + deploy,release + true + @{prefix} prepare release @{releaseLabel} [CI SKIP] + @{project.version} + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + ISO-8859-1 + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.5.3 + + + org.codehaus.mojo + tidy-maven-plugin + 1.4.0 + + + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 + + + net.revelc.code.formatter + formatter-maven-plugin + 2.27.0 + + ${project.basedir}/src/eclipse/formatter.xml + + + + net.revelc.code + impsort-maven-plugin + 1.12.0 + + true + java.,javax.,jakarta.,org. + + + + - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.micronaut - micronaut-inject-java - ${version.io.micronaut} - - - - - org.apache.maven.plugins @@ -184,10 +266,201 @@ integration-test verify + + ${project.build.directory}/its + true + test + false + true + + + + + + + + org.apache.maven.plugins + maven-install-plugin + + + default-install + + + + + dev + + + !env.CI + + + + true + + + + + org.codehaus.mojo + tidy-maven-plugin + + + validate + + pom + + + + + + net.revelc.code + impsort-maven-plugin + + + validate + + sort + + + + + + net.revelc.code.formatter + formatter-maven-plugin + + + validate + + format + + + + + + + + + check + + + env.CI + + + + + + org.codehaus.mojo + tidy-maven-plugin + + + validate + + check + + + + + + net.revelc.code + impsort-maven-plugin + + + validate + + check + + + + + + net.revelc.code.formatter + formatter-maven-plugin + + + validate + + validate + + + + + + + + + deploy + + + env.CI + + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + jar + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + sign + + + bc + + + + + + + + + + release + + + + org.sonatype.central + central-publishing-maven-plugin + true + + sonatype.org + true + published + + + + + + diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..47fe869 --- /dev/null +++ b/renovate.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": ["local>infrastructure/renovate-config", ":reviewer(stephan.schnabel)"] +} diff --git a/src/eclipse/formatter.xml b/src/eclipse/formatter.xml new file mode 100644 index 0000000..61186a2 --- /dev/null +++ b/src/eclipse/formatter.xml @@ -0,0 +1,404 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/it/invoker.properties b/src/it/invoker.properties new file mode 100644 index 0000000..7920ff9 --- /dev/null +++ b/src/it/invoker.properties @@ -0,0 +1,3 @@ +invoker.environmentVariables.KUBERNETES_SERVICE_HOST= +invoker.environmentVariables.LOGBACK_APPENDER= +invoker.environmentVariables.GOOGLE_CLOUD_PROJECT= diff --git a/src/it/pom.xml b/src/it/pom.xml index 07f915c..35f3594 100644 --- a/src/it/pom.xml +++ b/src/it/pom.xml @@ -18,38 +18,9 @@ - - - - - - @project.build.sourceEncoding@ - - @maven.compiler.source@ - @maven.compiler.target@ - true - true - true - true - false - - - - - - - - @version.org.apache.maven.plugins.compiler@ - @version.org.apache.maven.plugins.install@ - @version.org.apache.maven.plugins.jar@ - @version.org.apache.maven.plugins.resources@ - @version.org.apache.maven.plugins.surefire@ - - - - @project.version@ - @version.io.micronaut@ - + 2025-06-27T00:00:00Z + UTF-8 + 17 @@ -57,12 +28,12 @@ io.kokuwa.micronaut micronaut-logging - ${version.io.kokuwa.micronaut.logging} + @project.version@ io.micronaut.platform micronaut-platform - ${version.io.micronaut} + 4.9.0 pom import @@ -95,36 +66,30 @@ org.apache.maven.plugins maven-compiler-plugin - ${version.org.apache.maven.plugins.compiler} + 3.14.0 + class + true + true + true + -Xlint:all,-processing io.micronaut micronaut-inject-java - ${version.io.micronaut} - - org.apache.maven.plugins - maven-install-plugin - ${version.org.apache.maven.plugins.install} - - - org.apache.maven.plugins - maven-jar-plugin - ${version.org.apache.maven.plugins.jar} - org.apache.maven.plugins maven-resources-plugin - ${version.org.apache.maven.plugins.resources} + 3.3.1 org.apache.maven.plugins maven-surefire-plugin - ${version.org.apache.maven.plugins.surefire} + 3.5.3 @@ -151,26 +116,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - default-jar - - - - - - org.apache.maven.plugins - maven-install-plugin - - - default-install - - - - diff --git a/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java b/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java index f02ee78..bb21701 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java +++ b/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java @@ -4,13 +4,14 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Supplier; +import jakarta.inject.Singleton; + import org.slf4j.LoggerFactory; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.turbo.TurboFilter; import io.micronaut.context.annotation.BootstrapContextCompatible; import io.micronaut.context.annotation.Requires; -import jakarta.inject.Singleton; /** * Utility class for Logback operations. diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java index ae8475b..6626fee 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java @@ -3,6 +3,9 @@ package io.kokuwa.micronaut.logging.http.level; import java.util.Map; import java.util.Optional; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; + import org.reactivestreams.Publisher; import ch.qos.logback.classic.turbo.TurboFilter; @@ -17,8 +20,6 @@ import io.micronaut.http.annotation.Filter; import io.micronaut.http.filter.ServerFilterChain; import io.micronaut.http.filter.ServerFilterPhase; import io.micronaut.runtime.context.scope.Refreshable; -import jakarta.annotation.PostConstruct; -import jakarta.annotation.PreDestroy; /** * Http request logging filter. diff --git a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java index 7f4b176..de87997 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java +++ b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java @@ -46,7 +46,7 @@ public class MDCTurboFilterConfigurer implements LoggingSystem { } @Override - public void refresh() { + public final void refresh() { mdcs = environment.getPropertyEntries(PREFIX); initialized = false; diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java index b7c89cc..4587dcb 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java @@ -7,18 +7,19 @@ import static org.junit.jupiter.api.Assertions.fail; import java.util.Map; import java.util.function.Consumer; +import jakarta.inject.Inject; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; +import ch.qos.logback.classic.Level; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.nimbusds.jose.JOSEException; import com.nimbusds.jwt.JWTClaimsSet; - -import ch.qos.logback.classic.Level; import io.kokuwa.micronaut.logging.AbstractTest; import io.micronaut.core.annotation.Nullable; import io.micronaut.core.util.CollectionUtils; @@ -37,7 +38,6 @@ import io.micronaut.security.rules.SecurityRule; import io.micronaut.security.token.jwt.signature.SignatureGeneratorConfiguration; import io.micronaut.serde.annotation.Serdeable; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; -import jakarta.inject.Inject; /** * Test for {@link HttpServerFilter}. From 39cdc84bbb588e556f0e8717b920ac871deae22f Mon Sep 17 00:00:00 2001 From: WoodpeckerCI Date: Fri, 27 Jun 2025 18:11:45 +0000 Subject: [PATCH 192/195] [maven-release-plugin] prepare release 5.0.0 [CI SKIP] --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 30b450b..b06dc54 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 5.0.0-SNAPSHOT + 5.0.0 Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://git.kokuwa.io/kokuwaio/micronaut-logging scm:git:https://git.kokuwa.io/kokuwaio/micronaut-logging.git scm:git:https://git.kokuwa.io/kokuwaio/micronaut-logging.git - HEAD + 5.0.0 forgejo @@ -54,7 +54,7 @@ - 2025-06-27T00:00:00Z + 2025-06-27T18:09:08Z UTF-8 17 From 4a1a7ad981ca4a3abde7344582cf8928eb9a66c0 Mon Sep 17 00:00:00 2001 From: WoodpeckerCI Date: Fri, 27 Jun 2025 18:11:48 +0000 Subject: [PATCH 193/195] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b06dc54..56ad346 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 5.0.0 + 5.0.1-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -36,7 +36,7 @@ https://git.kokuwa.io/kokuwaio/micronaut-logging scm:git:https://git.kokuwa.io/kokuwaio/micronaut-logging.git scm:git:https://git.kokuwa.io/kokuwaio/micronaut-logging.git - 5.0.0 + HEAD forgejo @@ -54,7 +54,7 @@ - 2025-06-27T18:09:08Z + 2025-06-27T18:11:48Z UTF-8 17 From 2682a7a5492109348b7b6a924e94d1deb5f2691f Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Fri, 27 Jun 2025 20:23:51 +0200 Subject: [PATCH 194/195] chore: fix invalid renovate preset configuration --- .github/README.md | 6 +++--- .woodpecker/verify.yaml | 2 +- README.md | 6 +++--- renovate.json | 6 +++++- src/it/level-from-micronaut/pom.xml | 6 +++--- src/it/log-gcp-from-env/pom.xml | 6 +++--- src/it/log-gcp-from-gcloud/pom.xml | 6 +++--- src/it/log-gcp-with-service/pom.xml | 6 +++--- src/it/log-json-from-env-serde-jackson/pom.xml | 6 +++--- src/it/log-json-from-env-serde-jsonp/pom.xml | 6 +++--- src/it/log-json-from-env-serde-missing/pom.xml | 6 +++--- src/it/log-json-from-kubernetes/pom.xml | 6 +++--- src/it/log-text/pom.xml | 6 +++--- src/it/logback-xml-custom/pom.xml | 6 +++--- src/it/pom.xml | 4 ++-- 15 files changed, 44 insertions(+), 40 deletions(-) diff --git a/.github/README.md b/.github/README.md index f74f3b7..8875cce 100644 --- a/.github/README.md +++ b/.github/README.md @@ -2,10 +2,10 @@ Enhanced logging for Micronaut using MDC or request header. -[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/io.kokuwa.micronaut/micronaut-logging) -[![license](https://img.shields.io/badge/License-EUPL%201.2-blue)](https://git.kokuwa.io/kokuwaio/micronaut-logging/src/branch/main/LICENSE) -[![prs](https://img.shields.io/gitea/pull-requests/open/kokuwaio/micronaut-logging?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/micronaut-logging/pulls) +[![maven](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=maven)](https://central.sonatype.com/artifact/io.kokuwa.micronaut/micronaut-logging) +[![license](https://img.shields.io/badge/license-EUPL%201.2-blue)](https://git.kokuwa.io/kokuwaio/micronaut-logging/src/branch/main/LICENSE) [![issues](https://img.shields.io/gitea/issues/open/kokuwaio/micronaut-logging?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/micronaut-logging/issues) +[![prs](https://img.shields.io/gitea/pull-requests/open/kokuwaio/micronaut-logging?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/micronaut-logging/pulls) [![build](https://ci.kokuwa.io/api/badges/kokuwaio/micronaut-logging/status.svg)](https://ci.kokuwa.io/repos/kokuwaio/micronaut-logging/) For more documention see: [git.kokuwa.io/kokuwaio/micronaut-logging](https://git.kokuwa.io/kokuwaio/micronaut-logging) diff --git a/.woodpecker/verify.yaml b/.woodpecker/verify.yaml index c947ea8..094b317 100644 --- a/.woodpecker/verify.yaml +++ b/.woodpecker/verify.yaml @@ -6,4 +6,4 @@ steps: test: image: maven:3.9.10-eclipse-temurin-17 - commands: mvn verify --settings=.woodpecker/maven/settings.xml + commands: mvn verify --settings=.woodpecker/maven/settings.xml -P-deploy diff --git a/README.md b/README.md index 627aea3..4a3a2ec 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ Enhanced logging for Micronaut using MDC or request header. -[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/io.kokuwa.micronaut/micronaut-logging) -[![license](https://img.shields.io/badge/License-EUPL%201.2-blue)](https://git.kokuwa.io/kokuwaio/micronaut-logging/src/branch/main/LICENSE) -[![prs](https://img.shields.io/gitea/pull-requests/open/kokuwaio/micronaut-logging?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/micronaut-logging/pulls) +[![maven](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=maven)](https://central.sonatype.com/artifact/io.kokuwa.micronaut/micronaut-logging) +[![license](https://img.shields.io/badge/license-EUPL%201.2-blue)](https://git.kokuwa.io/kokuwaio/micronaut-logging/src/branch/main/LICENSE) [![issues](https://img.shields.io/gitea/issues/open/kokuwaio/micronaut-logging?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/micronaut-logging/issues) +[![prs](https://img.shields.io/gitea/pull-requests/open/kokuwaio/micronaut-logging?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/micronaut-logging/pulls) [![build](https://ci.kokuwa.io/api/badges/kokuwaio/micronaut-logging/status.svg)](https://ci.kokuwa.io/repos/kokuwaio/micronaut-logging/) Include in your `pom.xml`: diff --git a/renovate.json b/renovate.json index 47fe869..4bf0e44 100644 --- a/renovate.json +++ b/renovate.json @@ -1,4 +1,8 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["local>infrastructure/renovate-config", ":reviewer(stephan.schnabel)"] + "extends": ["local>kokuwaio/renovate-config", ":reviewer(stephan.schnabel)"], + "packageRules": [{ + "matchPackageNames": ["io.kokuwa.micronaut:mirconaut-logging-it"], + "enabled": false + }] } diff --git a/src/it/level-from-micronaut/pom.xml b/src/it/level-from-micronaut/pom.xml index 2a6450c..cf36117 100644 --- a/src/it/level-from-micronaut/pom.xml +++ b/src/it/level-from-micronaut/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - @project.groupId@ - @project.artifactId@-it + io.kokuwa.micronaut + mirconaut-logging-it LOCAL-SNAPSHOT - @project.artifactId@-it-level-from-micronaut + mirconaut-logging-it-level-from-micronaut diff --git a/src/it/log-gcp-from-env/pom.xml b/src/it/log-gcp-from-env/pom.xml index 0859f9a..11f4a92 100644 --- a/src/it/log-gcp-from-env/pom.xml +++ b/src/it/log-gcp-from-env/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - @project.groupId@ - @project.artifactId@-it + io.kokuwa.micronaut + mirconaut-logging-it LOCAL-SNAPSHOT - @project.artifactId@-it-log-gcp-from-env + mirconaut-logging-it-log-gcp-from-env diff --git a/src/it/log-gcp-from-gcloud/pom.xml b/src/it/log-gcp-from-gcloud/pom.xml index 8de1353..0bf33a2 100644 --- a/src/it/log-gcp-from-gcloud/pom.xml +++ b/src/it/log-gcp-from-gcloud/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - @project.groupId@ - @project.artifactId@-it + io.kokuwa.micronaut + mirconaut-logging-it LOCAL-SNAPSHOT - @project.artifactId@-it-log-gcp-from-gcloud + mirconaut-logging-it-log-gcp-from-gcloud diff --git a/src/it/log-gcp-with-service/pom.xml b/src/it/log-gcp-with-service/pom.xml index af3eadc..0f81f40 100644 --- a/src/it/log-gcp-with-service/pom.xml +++ b/src/it/log-gcp-with-service/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - @project.groupId@ - @project.artifactId@-it + io.kokuwa.micronaut + mirconaut-logging-it LOCAL-SNAPSHOT - @project.artifactId@-it-log-gcp-with-service + mirconaut-logging-it-log-gcp-with-service diff --git a/src/it/log-json-from-env-serde-jackson/pom.xml b/src/it/log-json-from-env-serde-jackson/pom.xml index 66fb890..87283dd 100644 --- a/src/it/log-json-from-env-serde-jackson/pom.xml +++ b/src/it/log-json-from-env-serde-jackson/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - @project.groupId@ - @project.artifactId@-it + io.kokuwa.micronaut + mirconaut-logging-it LOCAL-SNAPSHOT - @project.artifactId@-it-log-json-from-env-serde-jackson + mirconaut-logging-it-log-json-from-env-serde-jackson diff --git a/src/it/log-json-from-env-serde-jsonp/pom.xml b/src/it/log-json-from-env-serde-jsonp/pom.xml index 23ad54c..2d0d0ad 100644 --- a/src/it/log-json-from-env-serde-jsonp/pom.xml +++ b/src/it/log-json-from-env-serde-jsonp/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - @project.groupId@ - @project.artifactId@-it + io.kokuwa.micronaut + mirconaut-logging-it LOCAL-SNAPSHOT - @project.artifactId@-it-log-json-from-env-serde-jsonp + mirconaut-logging-it-log-json-from-env-serde-jsonp diff --git a/src/it/log-json-from-env-serde-missing/pom.xml b/src/it/log-json-from-env-serde-missing/pom.xml index 68b86a0..fcf06e0 100644 --- a/src/it/log-json-from-env-serde-missing/pom.xml +++ b/src/it/log-json-from-env-serde-missing/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - @project.groupId@ - @project.artifactId@-it + io.kokuwa.micronaut + mirconaut-logging-it LOCAL-SNAPSHOT - @project.artifactId@-it-log-json-from-env-serde-missing + mirconaut-logging-it-log-json-from-env-serde-missing diff --git a/src/it/log-json-from-kubernetes/pom.xml b/src/it/log-json-from-kubernetes/pom.xml index 812ac1f..20d412c 100644 --- a/src/it/log-json-from-kubernetes/pom.xml +++ b/src/it/log-json-from-kubernetes/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - @project.groupId@ - @project.artifactId@-it + io.kokuwa.micronaut + mirconaut-logging-it LOCAL-SNAPSHOT - @project.artifactId@-it-log-json-from-kubernetes + mirconaut-logging-it-log-json-from-kubernetes diff --git a/src/it/log-text/pom.xml b/src/it/log-text/pom.xml index d245ffd..f89c081 100644 --- a/src/it/log-text/pom.xml +++ b/src/it/log-text/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - @project.groupId@ - @project.artifactId@-it + io.kokuwa.micronaut + mirconaut-logging-it LOCAL-SNAPSHOT - @project.artifactId@-it-log-text + mirconaut-logging-it-log-text diff --git a/src/it/logback-xml-custom/pom.xml b/src/it/logback-xml-custom/pom.xml index d245ffd..f89c081 100644 --- a/src/it/logback-xml-custom/pom.xml +++ b/src/it/logback-xml-custom/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - @project.groupId@ - @project.artifactId@-it + io.kokuwa.micronaut + mirconaut-logging-it LOCAL-SNAPSHOT - @project.artifactId@-it-log-text + mirconaut-logging-it-log-text diff --git a/src/it/pom.xml b/src/it/pom.xml index 35f3594..d08c441 100644 --- a/src/it/pom.xml +++ b/src/it/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - @project.groupId@ - @project.artifactId@-it + io.kokuwa.micronaut + mirconaut-logging-it LOCAL-SNAPSHOT pom From 1ddb6881d54045ebeae17414f59a9caede6d4139 Mon Sep 17 00:00:00 2001 From: Renovate Date: Sat, 28 Jun 2025 11:34:59 +0000 Subject: [PATCH 195/195] chore(deps): update dependency org.apache.maven.plugins:maven-invoker-plugin from 3.9.0 to 3.9.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56ad346..22f50e6 100644 --- a/pom.xml +++ b/pom.xml @@ -180,7 +180,7 @@ org.apache.maven.plugins maven-invoker-plugin - 3.9.0 + 3.9.1 org.apache.maven.plugins