From f35beed32661083e04b010a1cfdee77dc6117523 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 09:05:25 +0000 Subject: [PATCH 01/48] Bump quarkus.version from 2.9.0.Final to 2.10.0.Final Bumps `quarkus.version` from 2.9.0.Final to 2.10.0.Final. Updates `quarkus-bom` from 2.9.0.Final to 2.10.0.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.9.0.Final...2.10.0.Final) Updates `quarkus-jackson-deployment` from 2.9.0.Final to 2.10.0.Final Updates `quarkus-bootstrap-maven-plugin` from 2.9.0.Final to 2.10.0.Final Updates `quarkus-resteasy-deployment` from 2.9.0.Final to 2.10.0.Final Updates `quarkus-maven-plugin` from 2.9.0.Final to 2.10.0.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-jackson-deployment dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-bootstrap-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-resteasy-deployment dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1367665..1ff157e 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 1.8 true false - 2.9.0.Final + 2.10.0.Final 0.8.8 quarkiverse_quarkus-logging-json From ce1df2c5934e86790825ead4a85568e123e0613b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Jul 2022 09:08:12 +0000 Subject: [PATCH 02/48] Bump quarkus.version from 2.10.0.Final to 2.10.2.Final Bumps `quarkus.version` from 2.10.0.Final to 2.10.2.Final. Updates `quarkus-bom` from 2.10.0.Final to 2.10.2.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.10.0.Final...2.10.2.Final) Updates `quarkus-jackson-deployment` from 2.10.0.Final to 2.10.2.Final Updates `quarkus-bootstrap-maven-plugin` from 2.10.0.Final to 2.10.2.Final Updates `quarkus-resteasy-deployment` from 2.10.0.Final to 2.10.2.Final Updates `quarkus-maven-plugin` from 2.10.0.Final to 2.10.2.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-jackson-deployment dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-bootstrap-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-resteasy-deployment dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ff157e..27262b1 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 1.8 true false - 2.10.0.Final + 2.10.2.Final 0.8.8 quarkiverse_quarkus-logging-json From a9d85f3c9864f73a83f70adf1b23a12b10e17a69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Jul 2022 09:11:50 +0000 Subject: [PATCH 03/48] Bump quarkus.version from 2.10.2.Final to 2.10.3.Final Bumps `quarkus.version` from 2.10.2.Final to 2.10.3.Final. Updates `quarkus-bom` from 2.10.2.Final to 2.10.3.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.10.2.Final...2.10.3.Final) Updates `quarkus-jackson-deployment` from 2.10.2.Final to 2.10.3.Final Updates `quarkus-bootstrap-maven-plugin` from 2.10.2.Final to 2.10.3.Final Updates `quarkus-resteasy-deployment` from 2.10.2.Final to 2.10.3.Final Updates `quarkus-maven-plugin` from 2.10.2.Final to 2.10.3.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-jackson-deployment dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-bootstrap-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-resteasy-deployment dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 27262b1..c38b34d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 1.8 true false - 2.10.2.Final + 2.10.3.Final 0.8.8 quarkiverse_quarkus-logging-json From 75bb734ffa5e625f62f12a9a8d45e614a147c369 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 09:03:13 +0000 Subject: [PATCH 04/48] Bump quarkus.version from 2.10.3.Final to 2.12.0.Final Bumps `quarkus.version` from 2.10.3.Final to 2.12.0.Final. Updates `quarkus-bom` from 2.10.3.Final to 2.12.0.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.10.3.Final...2.12.0.Final) Updates `quarkus-jackson-deployment` from 2.10.3.Final to 2.12.0.Final Updates `quarkus-bootstrap-maven-plugin` from 2.10.3.Final to 2.12.0.Final Updates `quarkus-resteasy-deployment` from 2.10.3.Final to 2.12.0.Final Updates `quarkus-maven-plugin` from 2.10.3.Final to 2.12.0.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-jackson-deployment dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-bootstrap-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-resteasy-deployment dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c38b34d..39da1ea 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 1.8 true false - 2.10.3.Final + 2.12.0.Final 0.8.8 quarkiverse_quarkus-logging-json From 61658852de65fea26d434ce837c07985b30a5223 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Mon, 5 Sep 2022 19:23:05 +0200 Subject: [PATCH 05/48] More modern doc infrastructure And some additional small fixes for the build. --- .github/workflows/release.yml | 18 +++ .gitignore | 1 + docs/modules/ROOT/assets/images/.gitkeep | 0 docs/modules/ROOT/examples/.gitkeep | 0 .../ROOT/pages/includes/attributes.adoc | 3 + .../quarkus-log-console-json.adoc} | 98 +++++++++++++++- docs/modules/ROOT/pages/index.adoc | 9 +- docs/pom.xml | 106 ++++++++++++++++++ docs/templates/includes/attributes.adoc | 3 + pom.xml | 6 + runtime/pom.xml | 2 +- 11 files changed, 240 insertions(+), 6 deletions(-) create mode 100644 docs/modules/ROOT/assets/images/.gitkeep create mode 100644 docs/modules/ROOT/examples/.gitkeep create mode 100644 docs/modules/ROOT/pages/includes/attributes.adoc rename docs/modules/ROOT/pages/{config.adoc => includes/quarkus-log-console-json.adoc} (79%) create mode 100644 docs/pom.xml create mode 100644 docs/templates/includes/attributes.adoc diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9db5390..a7e7dc4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,10 +51,27 @@ jobs: gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.GPG_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg git checkout -b release mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml + if ! git diff --quiet docs/modules/ROOT/pages/includes/attributes.adoc; then + git add docs/modules/ROOT/pages/includes/attributes.adoc + git commit -m "Update stable version for documentation" + fi git checkout ${{github.base_ref}} git rebase release mvn -B release:perform -Darguments=-DperformRelease -Prelease -s maven-settings.xml + - name: Adjust tag for documentation changes + run: | + git checkout ${{steps.metadata.outputs.current-version}} + mvn -B clean install -DskipTests -DskipITs + if ! git diff --quiet docs/modules/ROOT/pages/includes/attributes.adoc; then + git add docs/modules/ROOT/pages/includes/attributes.adoc + git commit -m "Update stable version for documentation" + # Move the tag after inclusion of documentation adjustments + git tag -f ${{steps.metadata.outputs.current-version}} + fi + # Go back to master + git checkout master + - name: Push changes to ${{github.base_ref}} uses: ad-m/github-push-action@v0.6.0 with: @@ -66,3 +83,4 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} tags: true + branch: ${{github.base_ref}} diff --git a/.gitignore b/.gitignore index e655bf7..d750e8e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # Log file *.log +quarkus.log.* # BlueJ files *.ctxt diff --git a/docs/modules/ROOT/assets/images/.gitkeep b/docs/modules/ROOT/assets/images/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/docs/modules/ROOT/examples/.gitkeep b/docs/modules/ROOT/examples/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc new file mode 100644 index 0000000..337a2a3 --- /dev/null +++ b/docs/modules/ROOT/pages/includes/attributes.adoc @@ -0,0 +1,3 @@ +:project-version: 1.1.1 + +:examples-dir: ./../examples/ \ No newline at end of file diff --git a/docs/modules/ROOT/pages/config.adoc b/docs/modules/ROOT/pages/includes/quarkus-log-console-json.adoc similarity index 79% rename from docs/modules/ROOT/pages/config.adoc rename to docs/modules/ROOT/pages/includes/quarkus-log-console-json.adoc index f4bdb29..53f4632 100644 --- a/docs/modules/ROOT/pages/config.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-log-console-json.adoc @@ -1,3 +1,5 @@ + +:summaryTableId: quarkus-log-console-json [.configuration-legend] icon:lock[title=Fixed at build time] Configuration property fixed at build time - All other configuration properties are overridable at runtime [.configuration-reference.searchable, cols="80,.^10,.^10"] @@ -13,6 +15,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.arguments.field-na [.description] -- Used to wrap arguments in an json object, with this fieldName on root json. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ARGUMENTS_FIELD_NAME+++` --|string | @@ -22,6 +26,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.arguments.include- [.description] -- Enable output of structured logging arguments `StructuredArgument`, default is true. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ARGUMENTS_INCLUDE_STRUCTURED_ARGUMENTS+++` --|boolean |`true` @@ -31,6 +37,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.arguments.include- [.description] -- Enable output of non structured logging arguments, default is false. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ARGUMENTS_INCLUDE_NON_STRUCTURED_ARGUMENTS+++` --|boolean |`false` @@ -40,6 +48,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.arguments.non-stru [.description] -- What prefix to use, when outputting non structured arguments. Default is `arg`, example key for first argument will be `arg0`. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ARGUMENTS_NON_STRUCTURED_ARGUMENTS_FIELD_PREFIX+++` --|string |`arg` @@ -49,6 +59,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.timestamp.field-na [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_TIMESTAMP_FIELD_NAME+++` --|string | @@ -58,6 +70,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.timestamp.date-for [.description] -- The date format to use. The special string "default" indicates that the default format should be used. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_TIMESTAMP_DATE_FORMAT+++` --|string |`default` @@ -67,6 +81,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.timestamp.zone-id] [.description] -- The zone to use when formatting the timestamp. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_TIMESTAMP_ZONE_ID+++` --|string |`default` @@ -76,6 +92,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.timestamp.enabled] [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_TIMESTAMP_ENABLED+++` --|boolean | @@ -85,6 +103,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.hostname.field-nam [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_HOSTNAME_FIELD_NAME+++` --|string | @@ -94,6 +114,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.hostname.enabled]] [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_HOSTNAME_ENABLED+++` --|boolean | @@ -103,6 +125,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.sequence.field-nam [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_SEQUENCE_FIELD_NAME+++` --|string | @@ -112,6 +136,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.sequence.enabled]] [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_SEQUENCE_ENABLED+++` --|boolean | @@ -121,6 +147,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.logger-class-name. [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_LOGGER_CLASS_NAME_FIELD_NAME+++` --|string | @@ -130,6 +158,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.logger-class-name. [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_LOGGER_CLASS_NAME_ENABLED+++` --|boolean | @@ -139,6 +169,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.logger-name.field- [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_LOGGER_NAME_FIELD_NAME+++` --|string | @@ -148,6 +180,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.logger-name.enable [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_LOGGER_NAME_ENABLED+++` --|boolean | @@ -157,6 +191,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.level.field-name]] [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_LEVEL_FIELD_NAME+++` --|string | @@ -166,6 +202,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.level.enabled]]`li [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_LEVEL_ENABLED+++` --|boolean | @@ -175,6 +213,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.message.field-name [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_MESSAGE_FIELD_NAME+++` --|string | @@ -184,6 +224,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.message.enabled]]` [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_MESSAGE_ENABLED+++` --|boolean | @@ -193,6 +235,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.thread-name.field- [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_THREAD_NAME_FIELD_NAME+++` --|string | @@ -202,6 +246,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.thread-name.enable [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_THREAD_NAME_ENABLED+++` --|boolean | @@ -211,6 +257,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.thread-id.field-na [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_THREAD_ID_FIELD_NAME+++` --|string | @@ -220,6 +268,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.thread-id.enabled] [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_THREAD_ID_ENABLED+++` --|boolean | @@ -229,6 +279,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.mdc.field-name]]`l [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_MDC_FIELD_NAME+++` --|string | @@ -238,6 +290,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.mdc.enabled]]`link [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_MDC_ENABLED+++` --|boolean | @@ -247,6 +301,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.mdc.flat-fields]]` [.description] -- Will write the values at the top level of the JSON log object. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_MDC_FLAT_FIELDS+++` --|boolean |`false` @@ -256,6 +312,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.ndc.field-name]]`l [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_NDC_FIELD_NAME+++` --|string | @@ -265,6 +323,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.ndc.enabled]]`link [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_NDC_ENABLED+++` --|boolean | @@ -274,6 +334,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.process-name.field [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_PROCESS_NAME_FIELD_NAME+++` --|string | @@ -283,6 +345,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.process-name.enabl [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_PROCESS_NAME_ENABLED+++` --|boolean | @@ -292,6 +356,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.process-id.field-n [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_PROCESS_ID_FIELD_NAME+++` --|string | @@ -301,6 +367,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.process-id.enabled [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_PROCESS_ID_ENABLED+++` --|boolean | @@ -310,6 +378,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.stack-trace.field- [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_STACK_TRACE_FIELD_NAME+++` --|string | @@ -319,6 +389,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.stack-trace.enable [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_STACK_TRACE_ENABLED+++` --|boolean | @@ -328,6 +400,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.error-type.field-n [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ERROR_TYPE_FIELD_NAME+++` --|string | @@ -337,6 +411,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.error-type.enabled [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ERROR_TYPE_ENABLED+++` --|boolean | @@ -346,6 +422,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.error-message.fiel [.description] -- Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ERROR_MESSAGE_FIELD_NAME+++` --|string | @@ -355,6 +433,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.fields.error-message.enab [.description] -- Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ERROR_MESSAGE_ENABLED+++` --|boolean | @@ -364,6 +444,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json]]`link:#quarkus-log-conso [.description] -- Determine whether to enable the JSON console formatting extension, which disables "normal" console formatting. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON+++` --|boolean |`true` @@ -373,6 +455,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.pretty-print]]`link:#quar [.description] -- Enable "pretty printing" of the JSON record. Note that some JSON parsers will fail to read pretty printed output. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_PRETTY_PRINT+++` --|boolean |`false` @@ -382,6 +466,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.record-delimiter]]`link:# [.description] -- The special end-of-record delimiter to be used. By default, newline delimiter is used. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_RECORD_DELIMITER+++` --|string |` ` @@ -392,7 +478,10 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.log-format]]`link:#quarku [.description] -- Support changing logging format. ---|`default`, `ecs` + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_LOG_FORMAT+++` +-- a| +`default`, `ecs` |`default` @@ -406,6 +495,8 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.additional-field.-field-n [.description] -- Additional field value. + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_ADDITIONAL_FIELD__FIELD_NAME__VALUE+++` --|string |required icon:exclamation-circle[title=Configuration property is required] @@ -415,7 +506,10 @@ a| [[quarkus-log-console-json_quarkus.log.console.json.additional-field.-field-n [.description] -- Type of the field, default is STRING. Supported types: STRING, INT, LONG, FLOAT, DOUBLE. ---|`string`, `int`, `long`, `float`, `double` + +Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_ADDITIONAL_FIELD__FIELD_NAME__TYPE+++` +-- a| +`string`, `int`, `long`, `float`, `double` |`string` |=== \ No newline at end of file diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index f668c42..74798ae 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -1,22 +1,25 @@ = Quarkus Logging JSON :extension-status: preview -Quarkus logging extension outputting the logging in json. +include::./includes/attributes.adoc[] + +Quarkus logging extension outputting the logging in JSON. == Installation If you want to use this extension, you need to add the `quarkus-logging-json` extension first. In your `pom.xml` file, add: -[source,xml] +[source,xml,subs=attributes+] ---- io.quarkiverse.loggingjson quarkus-logging-json + {project-version} ---- [[extension-configuration-reference]] == Extension Configuration Reference -include::config.adoc[leveloffset=+1, opts=optional] +include::./includes/quarkus-log-console-json.adoc[leveloffset=+1, opts=optional] diff --git a/docs/pom.xml b/docs/pom.xml new file mode 100644 index 0000000..dc33270 --- /dev/null +++ b/docs/pom.xml @@ -0,0 +1,106 @@ + + + 4.0.0 + + io.quarkiverse.loggingjson + quarkus-logging-json-parent + 1.1.2-SNAPSHOT + ../pom.xml + + + quarkus-logging-json-docs + Quarkus Logging JSON - Documentation + + + + + io.quarkiverse.loggingjson + quarkus-logging-json-deployment + ${project.version} + + + + + modules/ROOT/examples + + + io.quarkus + quarkus-maven-plugin + + + + build + + + + + + it.ozimov + yaml-properties-maven-plugin + + + initialize + + read-project-properties + + + + ${project.basedir}/../.github/project.yml + + + + + + + maven-resources-plugin + + + copy-resources + prepare-package + + copy-resources + + + ${project.basedir}/modules/ROOT/pages/includes/ + + + ${project.basedir}/../target/asciidoc/generated/config/ + quarkus-log-console-json.adoc + false + + + ${project.basedir}/templates/includes + attributes.adoc + true + + + + + + copy-images + prepare-package + + copy-resources + + + ${project.build.directory}/generated-docs/_images/ + + + ${project.basedir}/modules/ROOT/assets/images/ + false + + + + + + + + org.asciidoctor + asciidoctor-maven-plugin + + + + + diff --git a/docs/templates/includes/attributes.adoc b/docs/templates/includes/attributes.adoc new file mode 100644 index 0000000..e1a2881 --- /dev/null +++ b/docs/templates/includes/attributes.adoc @@ -0,0 +1,3 @@ +:project-version: ${release.current-version} + +:examples-dir: ./../examples/ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 39da1ea..b0b7237 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ deployment runtime + docs @@ -64,6 +65,11 @@ maven-compiler-plugin ${version.compiler.plugin} + + io.quarkus + quarkus-maven-plugin + ${quarkus.version} + diff --git a/runtime/pom.xml b/runtime/pom.xml index 05f06f6..87614dd 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -43,7 +43,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${quarkus.version} From 2b1987701359f921611f18c8f86756bb28ef6d25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Sep 2022 09:05:55 +0000 Subject: [PATCH 06/48] Bump quarkus.version from 2.12.0.Final to 2.13.0.Final Bumps `quarkus.version` from 2.12.0.Final to 2.13.0.Final. Updates `quarkus-bom` from 2.12.0.Final to 2.13.0.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.12.0.Final...2.13.0.Final) Updates `quarkus-jackson-deployment` from 2.12.0.Final to 2.13.0.Final Updates `quarkus-bootstrap-maven-plugin` from 2.12.0.Final to 2.13.0.Final Updates `quarkus-resteasy-deployment` from 2.12.0.Final to 2.13.0.Final Updates `quarkus-maven-plugin` from 2.12.0.Final to 2.13.0.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-jackson-deployment dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-bootstrap-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-resteasy-deployment dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39da1ea..73020c2 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 1.8 true false - 2.12.0.Final + 2.13.0.Final 0.8.8 quarkiverse_quarkus-logging-json From 42f52cb9bd5183f844ab1b0c93f7d855be813df0 Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Tue, 4 Oct 2022 19:24:27 +0200 Subject: [PATCH 07/48] Updated quarkiverse-parent to version 10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b0b7237..5b450c8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse quarkiverse-parent - 9 + 10 io.quarkiverse.loggingjson From 9e7c4650e5b2e685dcf878277aba6aa1eccf98dc Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Tue, 4 Oct 2022 19:40:46 +0200 Subject: [PATCH 08/48] Fixed formatting --- .../src/main/java/io/quarkiverse/loggingjson/JsonProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/JsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/JsonProvider.java index bbb935f..d88949d 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/JsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/JsonProvider.java @@ -8,7 +8,7 @@ public interface JsonProvider { /** * Called every time log output is getting formatted. - * + * * @param generator Used to add data to the json log output. * @param event The log event to handle. * @throws IOException When failed to format the event. From 2eec8fb303e97539572573b0cf9d9081a133cb44 Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Tue, 4 Oct 2022 21:28:25 +0200 Subject: [PATCH 09/48] Added file formatter and refactored config. --- README.md | 12 +- .../deployment/LoggingJsonProcessor.java | 23 +- .../custom/CustomJsonProviderJsonbTest.java | 4 +- .../resources/application-json-ecs.properties | 8 +- .../resources/application-json.properties | 7 +- .../includes/quarkus-log-console-json.adoc | 515 ----------------- .../ROOT/pages/includes/quarkus-log-json.adoc | 526 ++++++++++++++++++ docs/modules/ROOT/pages/index.adoc | 2 +- docs/pom.xml | 2 +- .../loggingjson/JsonFormatter.java | 2 + .../loggingjson/LoggingJsonRecorder.java | 17 +- .../loggingjson/{ => config}/Config.java | 27 +- .../loggingjson/config/ConfigConsole.java | 18 + .../loggingjson/config/ConfigFile.java | 18 + .../loggingjson/config/ConfigFormatter.java | 6 + .../AdditionalFieldsJsonProvider.java | 2 +- .../providers/ArgumentsJsonProvider.java | 2 +- .../providers/ErrorMessageJsonProvider.java | 1 + .../providers/ErrorTypeJsonProvider.java | 1 + .../providers/HostNameJsonProvider.java | 1 + .../providers/LogLevelJsonProvider.java | 1 + .../LoggerClassNameJsonProvider.java | 2 +- .../providers/LoggerNameJsonProvider.java | 1 + .../providers/MDCJsonProvider.java | 2 +- .../providers/MessageJsonProvider.java | 2 +- .../providers/NDCJsonProvider.java | 2 +- .../providers/ProcessIdJsonProvider.java | 2 +- .../providers/ProcessNameJsonProvider.java | 2 +- .../providers/SequenceJsonProvider.java | 2 +- .../providers/StackTraceJsonProvider.java | 1 + .../providers/ThreadIdJsonProvider.java | 2 +- .../providers/ThreadNameJsonProvider.java | 2 +- .../providers/TimestampJsonProvider.java | 2 +- ...AdditionalFieldsJsonProviderJsonbTest.java | 2 +- .../ArgumentsJsonProviderJsonbTest.java | 2 +- .../ErrorMessageJsonProviderJsonbTest.java | 2 +- .../ErrorTypeJsonProviderJsonbTest.java | 2 +- .../HostNameJsonProviderJsonbTest.java | 2 +- .../LogLevelJsonProviderJsonbTest.java | 2 +- .../LoggerClassNameJsonProviderJsonbTest.java | 2 +- .../LoggerNameJsonProviderJsonbTest.java | 2 +- .../providers/MDCJsonProviderJsonbTest.java | 2 +- .../MessageJsonProviderJsonbTest.java | 2 +- .../providers/NDCJsonProviderJsonbTest.java | 2 +- .../ProcessIdJsonProviderJsonbTest.java | 2 +- .../ProcessNameJsonProviderJsonbTest.java | 2 +- .../SequenceJsonProviderJsonbTest.java | 2 +- .../StackTraceJsonProviderJsonbTest.java | 2 +- .../ThreadIdJsonProviderJsonbTest.java | 2 +- .../ThreadNameJsonProviderJsonbTest.java | 2 +- .../TimestampJsonProviderJsonbTest.java | 2 +- 51 files changed, 673 insertions(+), 580 deletions(-) delete mode 100644 docs/modules/ROOT/pages/includes/quarkus-log-console-json.adoc create mode 100644 docs/modules/ROOT/pages/includes/quarkus-log-json.adoc rename runtime/src/main/java/io/quarkiverse/loggingjson/{ => config}/Config.java (93%) create mode 100644 runtime/src/main/java/io/quarkiverse/loggingjson/config/ConfigConsole.java create mode 100644 runtime/src/main/java/io/quarkiverse/loggingjson/config/ConfigFile.java create mode 100644 runtime/src/main/java/io/quarkiverse/loggingjson/config/ConfigFormatter.java diff --git a/README.md b/README.md index 6799e1d..081a106 100644 --- a/README.md +++ b/README.md @@ -7,23 +7,23 @@ Quarkus logging extension outputting the logging in json. # Configuration -The extension is enabled by default, when added to the project. -Can be disabled using configuration: `quarkus.log.console.json=false` +The extension is enabled by default for console, when added to the project. +Console logging can be disabled using configuration: `quarkus.log.json.console.enable=false` To see additional configuration options take a look at [Config](https://quarkiverse.github.io/quarkiverse-docs/quarkus-logging-json/dev/index.html) ## Elastic Common Scheme ```properties -quarkus.log.console.json.log-format=ecs +quarkus.log.json.log-format=ecs ``` # Add additional fields to all log messages If you want to add a static field to all the log message, that is possible using the configuration. ```properties -quarkus.log.console.json.additional-field.serviceName.value=service-a +quarkus.log.json.additional-field.serviceName.value=service-a # type is by default STRING - Other is INT, LONG, FLOAT, DOUBLE -quarkus.log.console.json.additional-field.buildNumber.type=INT -quarkus.log.console.json.additional-field.buildNumber.value=42 +quarkus.log.json.additional-field.buildNumber.type=INT +quarkus.log.json.additional-field.buildNumber.value=42 ``` # Structured argument diff --git a/deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java b/deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java index 3ff2cec..e1d5ac5 100644 --- a/deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java +++ b/deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java @@ -4,8 +4,8 @@ import org.jboss.jandex.ClassInfo; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.LoggingJsonRecorder; +import io.quarkiverse.loggingjson.config.Config; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.deployment.Capabilities; import io.quarkus.deployment.Capability; @@ -16,6 +16,7 @@ import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.LogConsoleFormatBuildItem; +import io.quarkus.deployment.builditem.LogFileFormatBuildItem; class LoggingJsonProcessor { @@ -28,17 +29,27 @@ FeatureBuildItem feature() { @BuildStep @Record(ExecutionTime.RUNTIME_INIT) - LogConsoleFormatBuildItem setUpFormatter(Capabilities capabilities, LoggingJsonRecorder recorder, Config config) { - boolean useJackson; + LogConsoleFormatBuildItem setUpConsoleFormatter(Capabilities capabilities, LoggingJsonRecorder recorder, + Config config) { + return new LogConsoleFormatBuildItem(recorder.initializeConsoleJsonLogging(config, useJackson(capabilities))); + } + + @BuildStep + @Record(ExecutionTime.RUNTIME_INIT) + LogFileFormatBuildItem setUpFileFormatter(Capabilities capabilities, LoggingJsonRecorder recorder, + Config config) { + return new LogFileFormatBuildItem(recorder.initializeFileJsonLogging(config, useJackson(capabilities))); + } + + private boolean useJackson(Capabilities capabilities) { if (capabilities.isPresent(Capability.JACKSON)) { - useJackson = true; + return true; } else if (capabilities.isPresent(Capability.JSONB)) { - useJackson = false; + return false; } else { throw new RuntimeException( "Missing json implementation to use for logging-json. Supported: [quarkus-jackson, quarkus-jsonb]"); } - return new LogConsoleFormatBuildItem(recorder.initializeJsonLogging(config, useJackson)); } @BuildStep diff --git a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/CustomJsonProviderJsonbTest.java b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/CustomJsonProviderJsonbTest.java index b53caff..8f99034 100644 --- a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/CustomJsonProviderJsonbTest.java +++ b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/CustomJsonProviderJsonbTest.java @@ -54,11 +54,11 @@ void testCustomJsonProvider() throws Exception { Assertions.assertTrue(firstCustomJsonProvider.getWriteToNumberOfCalls() > 0); Assertions.assertTrue(fields.contains("second")); - Assertions.assertEquals(1, secondCustomJsonProvider.getIsEnabledNumberOfCalls()); + Assertions.assertEquals(2, secondCustomJsonProvider.getIsEnabledNumberOfCalls()); // expecting both console and file formatter to call Assertions.assertTrue(secondCustomJsonProvider.getWriteToNumberOfCalls() > 0); Assertions.assertFalse(fields.contains("third")); - Assertions.assertEquals(1, thirdCustomJsonProvider.getIsEnabledNumberOfCalls()); + Assertions.assertEquals(2, thirdCustomJsonProvider.getIsEnabledNumberOfCalls()); // expecting both console and file formatter to call Assertions.assertEquals(0, thirdCustomJsonProvider.getWriteToNumberOfCalls()); } } diff --git a/deployment/src/test/resources/application-json-ecs.properties b/deployment/src/test/resources/application-json-ecs.properties index c61901d..f4ef336 100644 --- a/deployment/src/test/resources/application-json-ecs.properties +++ b/deployment/src/test/resources/application-json-ecs.properties @@ -1,7 +1,7 @@ quarkus.log.level=INFO quarkus.log.console.enable=true quarkus.log.console.level=WARNING -quarkus.log.console.json=true -quarkus.log.console.json.log-format=ecs -quarkus.log.console.json.fields.arguments.include-non-structured-arguments=true -quarkus.log.console.json.additional-field."service.name".value=deployment-test +quarkus.log.json.console.enable=true +quarkus.log.json.log-format=ecs +quarkus.log.json.fields.arguments.include-non-structured-arguments=true +quarkus.log.json.additional-field."service.name".value=deployment-test diff --git a/deployment/src/test/resources/application-json.properties b/deployment/src/test/resources/application-json.properties index 4b6ae6f..58f677b 100644 --- a/deployment/src/test/resources/application-json.properties +++ b/deployment/src/test/resources/application-json.properties @@ -1,6 +1,7 @@ quarkus.log.level=INFO quarkus.log.console.enable=true quarkus.log.console.level=WARNING -quarkus.log.console.json=true -quarkus.log.console.json.fields.arguments.include-non-structured-arguments=true -quarkus.log.console.json.additional-field.serviceName.value=deployment-test +quarkus.log.json.console.enable=true +quarkus.log.json.fields.arguments.include-non-structured-arguments=true +quarkus.log.json.additional-field.serviceName.value=deployment-test +quarkus.log.json.file.enable=true diff --git a/docs/modules/ROOT/pages/includes/quarkus-log-console-json.adoc b/docs/modules/ROOT/pages/includes/quarkus-log-console-json.adoc deleted file mode 100644 index 53f4632..0000000 --- a/docs/modules/ROOT/pages/includes/quarkus-log-console-json.adoc +++ /dev/null @@ -1,515 +0,0 @@ - -:summaryTableId: quarkus-log-console-json -[.configuration-legend] -icon:lock[title=Fixed at build time] Configuration property fixed at build time - All other configuration properties are overridable at runtime -[.configuration-reference.searchable, cols="80,.^10,.^10"] -|=== - -h|[[quarkus-log-console-json_configuration]]link:#quarkus-log-console-json_configuration[Configuration property] - -h|Type -h|Default - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.arguments.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.arguments.field-name[quarkus.log.console.json.fields.arguments.field-name]` - -[.description] --- -Used to wrap arguments in an json object, with this fieldName on root json. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ARGUMENTS_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.arguments.include-structured-arguments]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.arguments.include-structured-arguments[quarkus.log.console.json.fields.arguments.include-structured-arguments]` - -[.description] --- -Enable output of structured logging arguments `StructuredArgument`, default is true. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ARGUMENTS_INCLUDE_STRUCTURED_ARGUMENTS+++` ---|boolean -|`true` - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.arguments.include-non-structured-arguments]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.arguments.include-non-structured-arguments[quarkus.log.console.json.fields.arguments.include-non-structured-arguments]` - -[.description] --- -Enable output of non structured logging arguments, default is false. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ARGUMENTS_INCLUDE_NON_STRUCTURED_ARGUMENTS+++` ---|boolean -|`false` - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.arguments.non-structured-arguments-field-prefix]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.arguments.non-structured-arguments-field-prefix[quarkus.log.console.json.fields.arguments.non-structured-arguments-field-prefix]` - -[.description] --- -What prefix to use, when outputting non structured arguments. Default is `arg`, example key for first argument will be `arg0`. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ARGUMENTS_NON_STRUCTURED_ARGUMENTS_FIELD_PREFIX+++` ---|string -|`arg` - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.timestamp.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.timestamp.field-name[quarkus.log.console.json.fields.timestamp.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_TIMESTAMP_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.timestamp.date-format]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.timestamp.date-format[quarkus.log.console.json.fields.timestamp.date-format]` - -[.description] --- -The date format to use. The special string "default" indicates that the default format should be used. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_TIMESTAMP_DATE_FORMAT+++` ---|string -|`default` - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.timestamp.zone-id]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.timestamp.zone-id[quarkus.log.console.json.fields.timestamp.zone-id]` - -[.description] --- -The zone to use when formatting the timestamp. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_TIMESTAMP_ZONE_ID+++` ---|string -|`default` - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.timestamp.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.timestamp.enabled[quarkus.log.console.json.fields.timestamp.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_TIMESTAMP_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.hostname.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.hostname.field-name[quarkus.log.console.json.fields.hostname.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_HOSTNAME_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.hostname.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.hostname.enabled[quarkus.log.console.json.fields.hostname.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_HOSTNAME_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.sequence.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.sequence.field-name[quarkus.log.console.json.fields.sequence.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_SEQUENCE_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.sequence.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.sequence.enabled[quarkus.log.console.json.fields.sequence.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_SEQUENCE_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.logger-class-name.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.logger-class-name.field-name[quarkus.log.console.json.fields.logger-class-name.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_LOGGER_CLASS_NAME_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.logger-class-name.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.logger-class-name.enabled[quarkus.log.console.json.fields.logger-class-name.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_LOGGER_CLASS_NAME_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.logger-name.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.logger-name.field-name[quarkus.log.console.json.fields.logger-name.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_LOGGER_NAME_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.logger-name.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.logger-name.enabled[quarkus.log.console.json.fields.logger-name.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_LOGGER_NAME_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.level.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.level.field-name[quarkus.log.console.json.fields.level.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_LEVEL_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.level.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.level.enabled[quarkus.log.console.json.fields.level.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_LEVEL_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.message.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.message.field-name[quarkus.log.console.json.fields.message.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_MESSAGE_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.message.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.message.enabled[quarkus.log.console.json.fields.message.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_MESSAGE_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.thread-name.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.thread-name.field-name[quarkus.log.console.json.fields.thread-name.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_THREAD_NAME_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.thread-name.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.thread-name.enabled[quarkus.log.console.json.fields.thread-name.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_THREAD_NAME_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.thread-id.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.thread-id.field-name[quarkus.log.console.json.fields.thread-id.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_THREAD_ID_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.thread-id.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.thread-id.enabled[quarkus.log.console.json.fields.thread-id.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_THREAD_ID_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.mdc.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.mdc.field-name[quarkus.log.console.json.fields.mdc.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_MDC_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.mdc.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.mdc.enabled[quarkus.log.console.json.fields.mdc.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_MDC_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.mdc.flat-fields]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.mdc.flat-fields[quarkus.log.console.json.fields.mdc.flat-fields]` - -[.description] --- -Will write the values at the top level of the JSON log object. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_MDC_FLAT_FIELDS+++` ---|boolean -|`false` - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.ndc.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.ndc.field-name[quarkus.log.console.json.fields.ndc.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_NDC_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.ndc.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.ndc.enabled[quarkus.log.console.json.fields.ndc.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_NDC_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.process-name.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.process-name.field-name[quarkus.log.console.json.fields.process-name.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_PROCESS_NAME_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.process-name.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.process-name.enabled[quarkus.log.console.json.fields.process-name.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_PROCESS_NAME_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.process-id.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.process-id.field-name[quarkus.log.console.json.fields.process-id.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_PROCESS_ID_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.process-id.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.process-id.enabled[quarkus.log.console.json.fields.process-id.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_PROCESS_ID_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.stack-trace.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.stack-trace.field-name[quarkus.log.console.json.fields.stack-trace.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_STACK_TRACE_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.stack-trace.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.stack-trace.enabled[quarkus.log.console.json.fields.stack-trace.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_STACK_TRACE_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.error-type.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.error-type.field-name[quarkus.log.console.json.fields.error-type.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ERROR_TYPE_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.error-type.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.error-type.enabled[quarkus.log.console.json.fields.error-type.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ERROR_TYPE_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.error-message.field-name]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.error-message.field-name[quarkus.log.console.json.fields.error-message.field-name]` - -[.description] --- -Used to change the json key for the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ERROR_MESSAGE_FIELD_NAME+++` ---|string -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json.fields.error-message.enabled]]`link:#quarkus-log-console-json_quarkus.log.console.json.fields.error-message.enabled[quarkus.log.console.json.fields.error-message.enabled]` - -[.description] --- -Enable or disable the field. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_FIELDS_ERROR_MESSAGE_ENABLED+++` ---|boolean -| - - -a| [[quarkus-log-console-json_quarkus.log.console.json]]`link:#quarkus-log-console-json_quarkus.log.console.json[quarkus.log.console.json]` - -[.description] --- -Determine whether to enable the JSON console formatting extension, which disables "normal" console formatting. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON+++` ---|boolean -|`true` - - -a| [[quarkus-log-console-json_quarkus.log.console.json.pretty-print]]`link:#quarkus-log-console-json_quarkus.log.console.json.pretty-print[quarkus.log.console.json.pretty-print]` - -[.description] --- -Enable "pretty printing" of the JSON record. Note that some JSON parsers will fail to read pretty printed output. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_PRETTY_PRINT+++` ---|boolean -|`false` - - -a| [[quarkus-log-console-json_quarkus.log.console.json.record-delimiter]]`link:#quarkus-log-console-json_quarkus.log.console.json.record-delimiter[quarkus.log.console.json.record-delimiter]` - -[.description] --- -The special end-of-record delimiter to be used. By default, newline delimiter is used. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_RECORD_DELIMITER+++` ---|string -|` -` - - -a| [[quarkus-log-console-json_quarkus.log.console.json.log-format]]`link:#quarkus-log-console-json_quarkus.log.console.json.log-format[quarkus.log.console.json.log-format]` - -[.description] --- -Support changing logging format. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_LOG_FORMAT+++` --- a| -`default`, `ecs` -|`default` - - -h|[[quarkus-log-console-json_quarkus.log.console.json.additional-field-for-adding-fields-to-the-json-output-directly-from-the-config]]link:#quarkus-log-console-json_quarkus.log.console.json.additional-field-for-adding-fields-to-the-json-output-directly-from-the-config[For adding fields to the json output directly from the config] - -h|Type -h|Default - -a| [[quarkus-log-console-json_quarkus.log.console.json.additional-field.-field-name-.value]]`link:#quarkus-log-console-json_quarkus.log.console.json.additional-field.-field-name-.value[quarkus.log.console.json.additional-field."field-name".value]` - -[.description] --- -Additional field value. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_ADDITIONAL_FIELD__FIELD_NAME__VALUE+++` ---|string -|required icon:exclamation-circle[title=Configuration property is required] - - -a| [[quarkus-log-console-json_quarkus.log.console.json.additional-field.-field-name-.type]]`link:#quarkus-log-console-json_quarkus.log.console.json.additional-field.-field-name-.type[quarkus.log.console.json.additional-field."field-name".type]` - -[.description] --- -Type of the field, default is STRING. Supported types: STRING, INT, LONG, FLOAT, DOUBLE. - -Environment variable: `+++QUARKUS_LOG_CONSOLE_JSON_ADDITIONAL_FIELD__FIELD_NAME__TYPE+++` --- a| -`string`, `int`, `long`, `float`, `double` -|`string` - -|=== \ No newline at end of file diff --git a/docs/modules/ROOT/pages/includes/quarkus-log-json.adoc b/docs/modules/ROOT/pages/includes/quarkus-log-json.adoc new file mode 100644 index 0000000..4eb4571 --- /dev/null +++ b/docs/modules/ROOT/pages/includes/quarkus-log-json.adoc @@ -0,0 +1,526 @@ + +:summaryTableId: quarkus-log-json +[.configuration-legend] +icon:lock[title=Fixed at build time] Configuration property fixed at build time - All other configuration properties are overridable at runtime +[.configuration-reference.searchable, cols="80,.^10,.^10"] +|=== + +h|[[quarkus-log-json_configuration]]link:#quarkus-log-json_configuration[Configuration property] + +h|Type +h|Default + +a| [[quarkus-log-json_quarkus.log.json.console.enable]]`link:#quarkus-log-json_quarkus.log.json.console.enable[quarkus.log.json.console.enable]` + +[.description] +-- +Determine whether to enable the JSON console formatting extension, which disables "normal" console formatting. + +Environment variable: `+++QUARKUS_LOG_JSON_CONSOLE_ENABLE+++` +--|boolean +|`true` + + +a| [[quarkus-log-json_quarkus.log.json.file.enable]]`link:#quarkus-log-json_quarkus.log.json.file.enable[quarkus.log.json.file.enable]` + +[.description] +-- +Determine whether to enable the JSON console formatting extension, which disables "normal" console formatting. + +Environment variable: `+++QUARKUS_LOG_JSON_FILE_ENABLE+++` +--|boolean +|`false` + + +a| [[quarkus-log-json_quarkus.log.json.fields.arguments.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.arguments.field-name[quarkus.log.json.fields.arguments.field-name]` + +[.description] +-- +Used to wrap arguments in an json object, with this fieldName on root json. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ARGUMENTS_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.arguments.include-structured-arguments]]`link:#quarkus-log-json_quarkus.log.json.fields.arguments.include-structured-arguments[quarkus.log.json.fields.arguments.include-structured-arguments]` + +[.description] +-- +Enable output of structured logging arguments `StructuredArgument`, default is true. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ARGUMENTS_INCLUDE_STRUCTURED_ARGUMENTS+++` +--|boolean +|`true` + + +a| [[quarkus-log-json_quarkus.log.json.fields.arguments.include-non-structured-arguments]]`link:#quarkus-log-json_quarkus.log.json.fields.arguments.include-non-structured-arguments[quarkus.log.json.fields.arguments.include-non-structured-arguments]` + +[.description] +-- +Enable output of non structured logging arguments, default is false. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ARGUMENTS_INCLUDE_NON_STRUCTURED_ARGUMENTS+++` +--|boolean +|`false` + + +a| [[quarkus-log-json_quarkus.log.json.fields.arguments.non-structured-arguments-field-prefix]]`link:#quarkus-log-json_quarkus.log.json.fields.arguments.non-structured-arguments-field-prefix[quarkus.log.json.fields.arguments.non-structured-arguments-field-prefix]` + +[.description] +-- +What prefix to use, when outputting non structured arguments. Default is `arg`, example key for first argument will be `arg0`. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ARGUMENTS_NON_STRUCTURED_ARGUMENTS_FIELD_PREFIX+++` +--|string +|`arg` + + +a| [[quarkus-log-json_quarkus.log.json.fields.timestamp.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.timestamp.field-name[quarkus.log.json.fields.timestamp.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_TIMESTAMP_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.timestamp.date-format]]`link:#quarkus-log-json_quarkus.log.json.fields.timestamp.date-format[quarkus.log.json.fields.timestamp.date-format]` + +[.description] +-- +The date format to use. The special string "default" indicates that the default format should be used. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_TIMESTAMP_DATE_FORMAT+++` +--|string +|`default` + + +a| [[quarkus-log-json_quarkus.log.json.fields.timestamp.zone-id]]`link:#quarkus-log-json_quarkus.log.json.fields.timestamp.zone-id[quarkus.log.json.fields.timestamp.zone-id]` + +[.description] +-- +The zone to use when formatting the timestamp. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_TIMESTAMP_ZONE_ID+++` +--|string +|`default` + + +a| [[quarkus-log-json_quarkus.log.json.fields.timestamp.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.timestamp.enabled[quarkus.log.json.fields.timestamp.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_TIMESTAMP_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.hostname.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.hostname.field-name[quarkus.log.json.fields.hostname.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_HOSTNAME_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.hostname.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.hostname.enabled[quarkus.log.json.fields.hostname.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_HOSTNAME_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.sequence.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.sequence.field-name[quarkus.log.json.fields.sequence.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_SEQUENCE_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.sequence.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.sequence.enabled[quarkus.log.json.fields.sequence.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_SEQUENCE_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.logger-class-name.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.logger-class-name.field-name[quarkus.log.json.fields.logger-class-name.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_LOGGER_CLASS_NAME_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.logger-class-name.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.logger-class-name.enabled[quarkus.log.json.fields.logger-class-name.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_LOGGER_CLASS_NAME_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.logger-name.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.logger-name.field-name[quarkus.log.json.fields.logger-name.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_LOGGER_NAME_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.logger-name.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.logger-name.enabled[quarkus.log.json.fields.logger-name.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_LOGGER_NAME_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.level.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.level.field-name[quarkus.log.json.fields.level.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_LEVEL_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.level.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.level.enabled[quarkus.log.json.fields.level.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_LEVEL_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.message.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.message.field-name[quarkus.log.json.fields.message.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_MESSAGE_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.message.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.message.enabled[quarkus.log.json.fields.message.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_MESSAGE_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.thread-name.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.thread-name.field-name[quarkus.log.json.fields.thread-name.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_THREAD_NAME_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.thread-name.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.thread-name.enabled[quarkus.log.json.fields.thread-name.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_THREAD_NAME_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.thread-id.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.thread-id.field-name[quarkus.log.json.fields.thread-id.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_THREAD_ID_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.thread-id.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.thread-id.enabled[quarkus.log.json.fields.thread-id.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_THREAD_ID_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.mdc.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.mdc.field-name[quarkus.log.json.fields.mdc.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_MDC_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.mdc.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.mdc.enabled[quarkus.log.json.fields.mdc.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_MDC_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.mdc.flat-fields]]`link:#quarkus-log-json_quarkus.log.json.fields.mdc.flat-fields[quarkus.log.json.fields.mdc.flat-fields]` + +[.description] +-- +Will write the values at the top level of the JSON log object. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_MDC_FLAT_FIELDS+++` +--|boolean +|`false` + + +a| [[quarkus-log-json_quarkus.log.json.fields.ndc.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.ndc.field-name[quarkus.log.json.fields.ndc.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_NDC_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.ndc.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.ndc.enabled[quarkus.log.json.fields.ndc.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_NDC_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.process-name.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.process-name.field-name[quarkus.log.json.fields.process-name.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_PROCESS_NAME_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.process-name.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.process-name.enabled[quarkus.log.json.fields.process-name.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_PROCESS_NAME_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.process-id.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.process-id.field-name[quarkus.log.json.fields.process-id.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_PROCESS_ID_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.process-id.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.process-id.enabled[quarkus.log.json.fields.process-id.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_PROCESS_ID_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.stack-trace.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.stack-trace.field-name[quarkus.log.json.fields.stack-trace.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_STACK_TRACE_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.stack-trace.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.stack-trace.enabled[quarkus.log.json.fields.stack-trace.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_STACK_TRACE_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.error-type.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.error-type.field-name[quarkus.log.json.fields.error-type.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ERROR_TYPE_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.error-type.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.error-type.enabled[quarkus.log.json.fields.error-type.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ERROR_TYPE_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.error-message.field-name]]`link:#quarkus-log-json_quarkus.log.json.fields.error-message.field-name[quarkus.log.json.fields.error-message.field-name]` + +[.description] +-- +Used to change the json key for the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ERROR_MESSAGE_FIELD_NAME+++` +--|string +| + + +a| [[quarkus-log-json_quarkus.log.json.fields.error-message.enabled]]`link:#quarkus-log-json_quarkus.log.json.fields.error-message.enabled[quarkus.log.json.fields.error-message.enabled]` + +[.description] +-- +Enable or disable the field. + +Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ERROR_MESSAGE_ENABLED+++` +--|boolean +| + + +a| [[quarkus-log-json_quarkus.log.json.pretty-print]]`link:#quarkus-log-json_quarkus.log.json.pretty-print[quarkus.log.json.pretty-print]` + +[.description] +-- +Enable "pretty printing" of the JSON record. Note that some JSON parsers will fail to read pretty printed output. + +Environment variable: `+++QUARKUS_LOG_JSON_PRETTY_PRINT+++` +--|boolean +|`false` + + +a| [[quarkus-log-json_quarkus.log.json.record-delimiter]]`link:#quarkus-log-json_quarkus.log.json.record-delimiter[quarkus.log.json.record-delimiter]` + +[.description] +-- +The special end-of-record delimiter to be used. By default, newline delimiter is used. + +Environment variable: `+++QUARKUS_LOG_JSON_RECORD_DELIMITER+++` +--|string +|` +` + + +a| [[quarkus-log-json_quarkus.log.json.log-format]]`link:#quarkus-log-json_quarkus.log.json.log-format[quarkus.log.json.log-format]` + +[.description] +-- +Support changing logging format. + +Environment variable: `+++QUARKUS_LOG_JSON_LOG_FORMAT+++` +-- a| +`default`, `ecs` +|`default` + + +h|[[quarkus-log-json_quarkus.log.json.additional-field-for-adding-fields-to-the-json-output-directly-from-the-config]]link:#quarkus-log-json_quarkus.log.json.additional-field-for-adding-fields-to-the-json-output-directly-from-the-config[For adding fields to the json output directly from the config] + +h|Type +h|Default + +a| [[quarkus-log-json_quarkus.log.json.additional-field.-field-name-.value]]`link:#quarkus-log-json_quarkus.log.json.additional-field.-field-name-.value[quarkus.log.json.additional-field."field-name".value]` + +[.description] +-- +Additional field value. + +Environment variable: `+++QUARKUS_LOG_JSON_ADDITIONAL_FIELD__FIELD_NAME__VALUE+++` +--|string +|required icon:exclamation-circle[title=Configuration property is required] + + +a| [[quarkus-log-json_quarkus.log.json.additional-field.-field-name-.type]]`link:#quarkus-log-json_quarkus.log.json.additional-field.-field-name-.type[quarkus.log.json.additional-field."field-name".type]` + +[.description] +-- +Type of the field, default is STRING. Supported types: STRING, INT, LONG, FLOAT, DOUBLE. + +Environment variable: `+++QUARKUS_LOG_JSON_ADDITIONAL_FIELD__FIELD_NAME__TYPE+++` +-- a| +`string`, `int`, `long`, `float`, `double` +|`string` + +|=== \ No newline at end of file diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 74798ae..a3c18ed 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -22,4 +22,4 @@ In your `pom.xml` file, add: [[extension-configuration-reference]] == Extension Configuration Reference -include::./includes/quarkus-log-console-json.adoc[leveloffset=+1, opts=optional] +include::./includes/quarkus-log-json.adoc[leveloffset=+1, opts=optional] diff --git a/docs/pom.xml b/docs/pom.xml index dc33270..eb2dd67 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -67,7 +67,7 @@ ${project.basedir}/../target/asciidoc/generated/config/ - quarkus-log-console-json.adoc + quarkus-log-json.adoc false diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/JsonFormatter.java b/runtime/src/main/java/io/quarkiverse/loggingjson/JsonFormatter.java index 1aab7ec..b70f58d 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/JsonFormatter.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/JsonFormatter.java @@ -5,6 +5,8 @@ import org.jboss.logmanager.ExtFormatter; import org.jboss.logmanager.ExtLogRecord; +import io.quarkiverse.loggingjson.config.Config; + public class JsonFormatter extends ExtFormatter { private final List providers; private final JsonFactory jsonFactory; diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java b/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java index bc7610c..135e6df 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java @@ -9,6 +9,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.quarkiverse.loggingjson.config.Config; +import io.quarkiverse.loggingjson.config.ConfigFormatter; import io.quarkiverse.loggingjson.jackson.JacksonJsonFactory; import io.quarkiverse.loggingjson.jsonb.JsonbJsonFactory; import io.quarkiverse.loggingjson.providers.*; @@ -21,8 +23,19 @@ public class LoggingJsonRecorder { private static final Logger log = LoggerFactory.getLogger(LoggingJsonRecorder.class); - public RuntimeValue> initializeJsonLogging(Config config, boolean useJackson) { - if (!config.enable) { + public RuntimeValue> initializeConsoleJsonLogging(Config config, + boolean useJackson) { + return initializeJsonLogging(config.console, config, useJackson); + } + + public RuntimeValue> initializeFileJsonLogging(Config config, + boolean useJackson) { + return initializeJsonLogging(config.file, config, useJackson); + } + + public RuntimeValue> initializeJsonLogging(ConfigFormatter formatter, Config config, + boolean useJackson) { + if (formatter == null || !formatter.isEnabled()) { return new RuntimeValue<>(Optional.empty()); } diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/Config.java b/runtime/src/main/java/io/quarkiverse/loggingjson/config/Config.java similarity index 93% rename from runtime/src/main/java/io/quarkiverse/loggingjson/Config.java rename to runtime/src/main/java/io/quarkiverse/loggingjson/config/Config.java index ef77447..5bdc7fc 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/Config.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/config/Config.java @@ -1,4 +1,4 @@ -package io.quarkiverse.loggingjson; +package io.quarkiverse.loggingjson.config; import java.util.Map; import java.util.Optional; @@ -7,28 +7,35 @@ import io.quarkiverse.loggingjson.providers.StructuredArgument; import io.quarkus.runtime.annotations.*; -@ConfigRoot(phase = ConfigPhase.RUN_TIME, name = "log.console.json") +@ConfigRoot(phase = ConfigPhase.RUN_TIME, name = "log.json") public class Config { + /** + * Configuration properties for console formatter. + */ + @ConfigItem(name = "console") + public ConfigConsole console; + + /** + * Configuration properties for file formatter. + */ + @ConfigItem(name = "file") + public ConfigFile file; + /** * Configuration properties to customize fields */ @ConfigItem public FieldsConfig fields; - /** - * Determine whether to enable the JSON console formatting extension, which disables "normal" console formatting. - */ - @ConfigItem(name = ConfigItem.PARENT, defaultValue = "true") - boolean enable; /** * Enable "pretty printing" of the JSON record. Note that some JSON parsers will fail to read pretty printed output. */ @ConfigItem - boolean prettyPrint; + public boolean prettyPrint; /** * The special end-of-record delimiter to be used. By default, newline delimiter is used. */ @ConfigItem(defaultValue = "\n") - String recordDelimiter; + public String recordDelimiter; /** * For adding fields to the json output directly from the config. */ @@ -41,7 +48,7 @@ public class Config { * Support changing logging format. */ @ConfigItem(defaultValue = "DEFAULT") - LogFormat logFormat; + public LogFormat logFormat; @ConfigGroup public static class FieldsConfig { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/config/ConfigConsole.java b/runtime/src/main/java/io/quarkiverse/loggingjson/config/ConfigConsole.java new file mode 100644 index 0000000..fd7a439 --- /dev/null +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/config/ConfigConsole.java @@ -0,0 +1,18 @@ +package io.quarkiverse.loggingjson.config; + +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; + +@ConfigGroup +public class ConfigConsole implements ConfigFormatter { + /** + * Determine whether to enable the JSON console formatting extension, which disables "normal" console formatting. + */ + @ConfigItem(defaultValue = "true") + boolean enable; + + @Override + public boolean isEnabled() { + return enable; + } +} diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/config/ConfigFile.java b/runtime/src/main/java/io/quarkiverse/loggingjson/config/ConfigFile.java new file mode 100644 index 0000000..0f7afbf --- /dev/null +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/config/ConfigFile.java @@ -0,0 +1,18 @@ +package io.quarkiverse.loggingjson.config; + +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; + +@ConfigGroup +public class ConfigFile implements ConfigFormatter { + /** + * Determine whether to enable the JSON file formatting extension, which disables "normal" file formatting. + */ + @ConfigItem(defaultValue = "false") + boolean enable; + + @Override + public boolean isEnabled() { + return enable; + } +} diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/config/ConfigFormatter.java b/runtime/src/main/java/io/quarkiverse/loggingjson/config/ConfigFormatter.java new file mode 100644 index 0000000..dcca6f7 --- /dev/null +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/config/ConfigFormatter.java @@ -0,0 +1,6 @@ +package io.quarkiverse.loggingjson.config; + +public interface ConfigFormatter { + + boolean isEnabled(); +} diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/AdditionalFieldsJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/AdditionalFieldsJsonProvider.java index ea2b81c..c1a3d54 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/AdditionalFieldsJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/AdditionalFieldsJsonProvider.java @@ -5,10 +5,10 @@ import org.jboss.logmanager.ExtLogRecord; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.Enabled; import io.quarkiverse.loggingjson.JsonGenerator; import io.quarkiverse.loggingjson.JsonProvider; +import io.quarkiverse.loggingjson.config.Config; public class AdditionalFieldsJsonProvider implements JsonProvider, Enabled { private final boolean enabled; diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ArgumentsJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ArgumentsJsonProvider.java index 65ad8d8..fb6b73d 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ArgumentsJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ArgumentsJsonProvider.java @@ -5,10 +5,10 @@ import org.jboss.logmanager.ExtLogRecord; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.Enabled; import io.quarkiverse.loggingjson.JsonGenerator; import io.quarkiverse.loggingjson.JsonProvider; +import io.quarkiverse.loggingjson.config.Config; public class ArgumentsJsonProvider implements JsonProvider, Enabled { private final boolean includeStructuredArguments; diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProvider.java index 86f5486..0a2939e 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProvider.java @@ -5,6 +5,7 @@ import org.jboss.logmanager.ExtLogRecord; import io.quarkiverse.loggingjson.*; +import io.quarkiverse.loggingjson.config.Config; public class ErrorMessageJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProvider.java index ba5d22d..57ffcaf 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProvider.java @@ -5,6 +5,7 @@ import org.jboss.logmanager.ExtLogRecord; import io.quarkiverse.loggingjson.*; +import io.quarkiverse.loggingjson.config.Config; public class ErrorTypeJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/HostNameJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/HostNameJsonProvider.java index c77b531..acff6e0 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/HostNameJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/HostNameJsonProvider.java @@ -5,6 +5,7 @@ import org.jboss.logmanager.ExtLogRecord; import io.quarkiverse.loggingjson.*; +import io.quarkiverse.loggingjson.config.Config; public class HostNameJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProvider.java index 17d5c40..f8e966d 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProvider.java @@ -5,6 +5,7 @@ import org.jboss.logmanager.ExtLogRecord; import io.quarkiverse.loggingjson.*; +import io.quarkiverse.loggingjson.config.Config; public class LogLevelJsonProvider implements JsonProvider, Enabled { private final String fieldName; diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/LoggerClassNameJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/LoggerClassNameJsonProvider.java index dfc92d9..ee164aa 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/LoggerClassNameJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/LoggerClassNameJsonProvider.java @@ -4,11 +4,11 @@ import org.jboss.logmanager.ExtLogRecord; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.Enabled; import io.quarkiverse.loggingjson.JsonGenerator; import io.quarkiverse.loggingjson.JsonProvider; import io.quarkiverse.loggingjson.JsonWritingUtils; +import io.quarkiverse.loggingjson.config.Config; public class LoggerClassNameJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/LoggerNameJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/LoggerNameJsonProvider.java index 691a083..7febf2d 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/LoggerNameJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/LoggerNameJsonProvider.java @@ -5,6 +5,7 @@ import org.jboss.logmanager.ExtLogRecord; import io.quarkiverse.loggingjson.*; +import io.quarkiverse.loggingjson.config.Config; public class LoggerNameJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/MDCJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/MDCJsonProvider.java index 73985d2..42f4f77 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/MDCJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/MDCJsonProvider.java @@ -4,11 +4,11 @@ import org.jboss.logmanager.ExtLogRecord; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.Enabled; import io.quarkiverse.loggingjson.JsonGenerator; import io.quarkiverse.loggingjson.JsonProvider; import io.quarkiverse.loggingjson.JsonWritingUtils; +import io.quarkiverse.loggingjson.config.Config; public class MDCJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/MessageJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/MessageJsonProvider.java index f9b1fba..8737370 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/MessageJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/MessageJsonProvider.java @@ -5,11 +5,11 @@ import org.jboss.logmanager.ExtFormatter; import org.jboss.logmanager.ExtLogRecord; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.Enabled; import io.quarkiverse.loggingjson.JsonGenerator; import io.quarkiverse.loggingjson.JsonProvider; import io.quarkiverse.loggingjson.JsonWritingUtils; +import io.quarkiverse.loggingjson.config.Config; public class MessageJsonProvider extends ExtFormatter implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/NDCJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/NDCJsonProvider.java index 25758ad..3a3f9aa 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/NDCJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/NDCJsonProvider.java @@ -4,11 +4,11 @@ import org.jboss.logmanager.ExtLogRecord; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.Enabled; import io.quarkiverse.loggingjson.JsonGenerator; import io.quarkiverse.loggingjson.JsonProvider; import io.quarkiverse.loggingjson.JsonWritingUtils; +import io.quarkiverse.loggingjson.config.Config; public class NDCJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ProcessIdJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ProcessIdJsonProvider.java index 2ab717a..782390f 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ProcessIdJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ProcessIdJsonProvider.java @@ -4,11 +4,11 @@ import org.jboss.logmanager.ExtLogRecord; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.Enabled; import io.quarkiverse.loggingjson.JsonGenerator; import io.quarkiverse.loggingjson.JsonProvider; import io.quarkiverse.loggingjson.JsonWritingUtils; +import io.quarkiverse.loggingjson.config.Config; public class ProcessIdJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ProcessNameJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ProcessNameJsonProvider.java index 6e671b4..bd01bcb 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ProcessNameJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ProcessNameJsonProvider.java @@ -4,11 +4,11 @@ import org.jboss.logmanager.ExtLogRecord; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.Enabled; import io.quarkiverse.loggingjson.JsonGenerator; import io.quarkiverse.loggingjson.JsonProvider; import io.quarkiverse.loggingjson.JsonWritingUtils; +import io.quarkiverse.loggingjson.config.Config; public class ProcessNameJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/SequenceJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/SequenceJsonProvider.java index cce465b..29322fa 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/SequenceJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/SequenceJsonProvider.java @@ -4,11 +4,11 @@ import org.jboss.logmanager.ExtLogRecord; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.Enabled; import io.quarkiverse.loggingjson.JsonGenerator; import io.quarkiverse.loggingjson.JsonProvider; import io.quarkiverse.loggingjson.JsonWritingUtils; +import io.quarkiverse.loggingjson.config.Config; public class SequenceJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/StackTraceJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/StackTraceJsonProvider.java index 52f31ce..65aeb4a 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/StackTraceJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/StackTraceJsonProvider.java @@ -6,6 +6,7 @@ import org.jboss.logmanager.ExtLogRecord; import io.quarkiverse.loggingjson.*; +import io.quarkiverse.loggingjson.config.Config; public class StackTraceJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ThreadIdJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ThreadIdJsonProvider.java index f495424..ea94e27 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ThreadIdJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ThreadIdJsonProvider.java @@ -4,11 +4,11 @@ import org.jboss.logmanager.ExtLogRecord; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.Enabled; import io.quarkiverse.loggingjson.JsonGenerator; import io.quarkiverse.loggingjson.JsonProvider; import io.quarkiverse.loggingjson.JsonWritingUtils; +import io.quarkiverse.loggingjson.config.Config; public class ThreadIdJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ThreadNameJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ThreadNameJsonProvider.java index 3fc4ec9..8ef6e8e 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ThreadNameJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ThreadNameJsonProvider.java @@ -4,11 +4,11 @@ import org.jboss.logmanager.ExtLogRecord; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.Enabled; import io.quarkiverse.loggingjson.JsonGenerator; import io.quarkiverse.loggingjson.JsonProvider; import io.quarkiverse.loggingjson.JsonWritingUtils; +import io.quarkiverse.loggingjson.config.Config; public class ThreadNameJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/TimestampJsonProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/TimestampJsonProvider.java index 8ee8025..88c3197 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/TimestampJsonProvider.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/TimestampJsonProvider.java @@ -7,11 +7,11 @@ import org.jboss.logmanager.ExtLogRecord; -import io.quarkiverse.loggingjson.Config; import io.quarkiverse.loggingjson.Enabled; import io.quarkiverse.loggingjson.JsonGenerator; import io.quarkiverse.loggingjson.JsonProvider; import io.quarkiverse.loggingjson.JsonWritingUtils; +import io.quarkiverse.loggingjson.config.Config; public class TimestampJsonProvider implements JsonProvider, Enabled { diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/AdditionalFieldsJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/AdditionalFieldsJsonProviderJsonbTest.java index 4671fbe..9586975 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/AdditionalFieldsJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/AdditionalFieldsJsonProviderJsonbTest.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableList; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class AdditionalFieldsJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ArgumentsJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ArgumentsJsonProviderJsonbTest.java index d94ea3d..1b374ba 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ArgumentsJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ArgumentsJsonProviderJsonbTest.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableList; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class ArgumentsJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProviderJsonbTest.java index 04cdeaf..f673d37 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class ErrorMessageJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProviderJsonbTest.java index fdc3b5e..758c7b6 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class ErrorTypeJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/HostNameJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/HostNameJsonProviderJsonbTest.java index 144f6ab..ada3a5a 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/HostNameJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/HostNameJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class HostNameJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProviderJsonbTest.java index 747035f..f098039 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class LogLevelJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerClassNameJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerClassNameJsonProviderJsonbTest.java index 3ae4a30..694a954 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerClassNameJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerClassNameJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class LoggerClassNameJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerNameJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerNameJsonProviderJsonbTest.java index 2f7d3a3..c3943b9 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerNameJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerNameJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class LoggerNameJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/MDCJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/MDCJsonProviderJsonbTest.java index f4b3b89..c80cc21 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/MDCJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/MDCJsonProviderJsonbTest.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableList; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class MDCJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/MessageJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/MessageJsonProviderJsonbTest.java index d36e306..1cd9ff6 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/MessageJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/MessageJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class MessageJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/NDCJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/NDCJsonProviderJsonbTest.java index 2d021d4..f383c5e 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/NDCJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/NDCJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class NDCJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessIdJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessIdJsonProviderJsonbTest.java index 95451c8..3073f9a 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessIdJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessIdJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class ProcessIdJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessNameJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessNameJsonProviderJsonbTest.java index 8aaa337..e704f1f 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessNameJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessNameJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class ProcessNameJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/SequenceJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/SequenceJsonProviderJsonbTest.java index 5afc930..20ce33b 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/SequenceJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/SequenceJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class SequenceJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/StackTraceJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/StackTraceJsonProviderJsonbTest.java index 12ee4f6..6195511 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/StackTraceJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/StackTraceJsonProviderJsonbTest.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class StackTraceJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadIdJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadIdJsonProviderJsonbTest.java index 97ea9e2..d27f20d 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadIdJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadIdJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class ThreadIdJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadNameJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadNameJsonProviderJsonbTest.java index 65e8095..0d35f96 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadNameJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadNameJsonProviderJsonbTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class ThreadNameJsonProviderJsonbTest extends JsonProviderBaseTest { @Override diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/TimestampJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/TimestampJsonProviderJsonbTest.java index c9c7bc5..3df1533 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/TimestampJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/TimestampJsonProviderJsonbTest.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import io.quarkiverse.loggingjson.Config; +import io.quarkiverse.loggingjson.config.Config; public class TimestampJsonProviderJsonbTest extends JsonProviderBaseTest { @Override From c9be83b3ba6e0fb406d5b4fc367ba850e4d78219 Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Wed, 5 Oct 2022 19:30:45 +0200 Subject: [PATCH 10/48] Release 2.0.0 --- .github/project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yml b/.github/project.yml index d119f13..fcd48e8 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,4 +1,4 @@ name: Quarkus Logging JSON release: - current-version: 1.1.1 - next-version: 1.1.2-SNAPSHOT + current-version: 2.0.0 + next-version: 2.0.1-SNAPSHOT From 0004615aa0cb27f989b572da2584386d74d20027 Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Fri, 7 Oct 2022 09:20:35 +0200 Subject: [PATCH 11/48] Revert "Release 2.0.0" --- .github/project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yml b/.github/project.yml index fcd48e8..d119f13 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,4 +1,4 @@ name: Quarkus Logging JSON release: - current-version: 2.0.0 - next-version: 2.0.1-SNAPSHOT + current-version: 1.1.1 + next-version: 1.1.2-SNAPSHOT From dd4ec9718e5e6f428f0cffe2955e3eec9bb95e7d Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Fri, 7 Oct 2022 13:34:18 +0200 Subject: [PATCH 12/48] Release 2.0.0 --- .github/project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yml b/.github/project.yml index d119f13..fcd48e8 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,4 +1,4 @@ name: Quarkus Logging JSON release: - current-version: 1.1.1 - next-version: 1.1.2-SNAPSHOT + current-version: 2.0.0 + next-version: 2.0.1-SNAPSHOT From af101b44fe203054bae0b837ab41f3f3d3a010bf Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Fri, 7 Oct 2022 15:32:43 +0200 Subject: [PATCH 13/48] Updated quarkus-log-json.adoc --- .../ROOT/pages/includes/quarkus-log-json.adoc | 232 +++++++++++++++++- 1 file changed, 231 insertions(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/includes/quarkus-log-json.adoc b/docs/modules/ROOT/pages/includes/quarkus-log-json.adoc index 4eb4571..7539e35 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-log-json.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-log-json.adoc @@ -16,7 +16,12 @@ a| [[quarkus-log-json_quarkus.log.json.console.enable]]`link:#quarkus-log-json_q -- Determine whether to enable the JSON console formatting extension, which disables "normal" console formatting. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_CONSOLE_ENABLE+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_CONSOLE_ENABLE+++` +endif::add-copy-button-to-env-var[] --|boolean |`true` @@ -25,9 +30,14 @@ a| [[quarkus-log-json_quarkus.log.json.file.enable]]`link:#quarkus-log-json_quar [.description] -- -Determine whether to enable the JSON console formatting extension, which disables "normal" console formatting. +Determine whether to enable the JSON file formatting extension, which disables "normal" file formatting. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FILE_ENABLE+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FILE_ENABLE+++` +endif::add-copy-button-to-env-var[] --|boolean |`false` @@ -38,7 +48,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.arguments.field-name]]`link:#quark -- Used to wrap arguments in an json object, with this fieldName on root json. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_ARGUMENTS_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ARGUMENTS_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -49,7 +64,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.arguments.include-structured-argum -- Enable output of structured logging arguments `StructuredArgument`, default is true. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_ARGUMENTS_INCLUDE_STRUCTURED_ARGUMENTS+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ARGUMENTS_INCLUDE_STRUCTURED_ARGUMENTS+++` +endif::add-copy-button-to-env-var[] --|boolean |`true` @@ -60,7 +80,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.arguments.include-non-structured-a -- Enable output of non structured logging arguments, default is false. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_ARGUMENTS_INCLUDE_NON_STRUCTURED_ARGUMENTS+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ARGUMENTS_INCLUDE_NON_STRUCTURED_ARGUMENTS+++` +endif::add-copy-button-to-env-var[] --|boolean |`false` @@ -71,7 +96,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.arguments.non-structured-arguments -- What prefix to use, when outputting non structured arguments. Default is `arg`, example key for first argument will be `arg0`. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_ARGUMENTS_NON_STRUCTURED_ARGUMENTS_FIELD_PREFIX+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ARGUMENTS_NON_STRUCTURED_ARGUMENTS_FIELD_PREFIX+++` +endif::add-copy-button-to-env-var[] --|string |`arg` @@ -82,7 +112,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.timestamp.field-name]]`link:#quark -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_TIMESTAMP_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_TIMESTAMP_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -93,7 +128,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.timestamp.date-format]]`link:#quar -- The date format to use. The special string "default" indicates that the default format should be used. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_TIMESTAMP_DATE_FORMAT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_TIMESTAMP_DATE_FORMAT+++` +endif::add-copy-button-to-env-var[] --|string |`default` @@ -104,7 +144,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.timestamp.zone-id]]`link:#quarkus- -- The zone to use when formatting the timestamp. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_TIMESTAMP_ZONE_ID+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_TIMESTAMP_ZONE_ID+++` +endif::add-copy-button-to-env-var[] --|string |`default` @@ -115,7 +160,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.timestamp.enabled]]`link:#quarkus- -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_TIMESTAMP_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_TIMESTAMP_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -126,7 +176,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.hostname.field-name]]`link:#quarku -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_HOSTNAME_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_HOSTNAME_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -137,7 +192,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.hostname.enabled]]`link:#quarkus-l -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_HOSTNAME_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_HOSTNAME_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -148,7 +208,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.sequence.field-name]]`link:#quarku -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_SEQUENCE_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_SEQUENCE_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -159,7 +224,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.sequence.enabled]]`link:#quarkus-l -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_SEQUENCE_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_SEQUENCE_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -170,7 +240,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.logger-class-name.field-name]]`lin -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_LOGGER_CLASS_NAME_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_LOGGER_CLASS_NAME_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -181,7 +256,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.logger-class-name.enabled]]`link:# -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_LOGGER_CLASS_NAME_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_LOGGER_CLASS_NAME_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -192,7 +272,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.logger-name.field-name]]`link:#qua -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_LOGGER_NAME_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_LOGGER_NAME_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -203,7 +288,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.logger-name.enabled]]`link:#quarku -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_LOGGER_NAME_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_LOGGER_NAME_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -214,7 +304,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.level.field-name]]`link:#quarkus-l -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_LEVEL_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_LEVEL_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -225,7 +320,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.level.enabled]]`link:#quarkus-log- -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_LEVEL_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_LEVEL_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -236,7 +336,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.message.field-name]]`link:#quarkus -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_MESSAGE_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_MESSAGE_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -247,7 +352,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.message.enabled]]`link:#quarkus-lo -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_MESSAGE_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_MESSAGE_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -258,7 +368,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.thread-name.field-name]]`link:#qua -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_THREAD_NAME_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_THREAD_NAME_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -269,7 +384,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.thread-name.enabled]]`link:#quarku -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_THREAD_NAME_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_THREAD_NAME_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -280,7 +400,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.thread-id.field-name]]`link:#quark -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_THREAD_ID_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_THREAD_ID_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -291,7 +416,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.thread-id.enabled]]`link:#quarkus- -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_THREAD_ID_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_THREAD_ID_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -302,7 +432,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.mdc.field-name]]`link:#quarkus-log -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_MDC_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_MDC_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -313,7 +448,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.mdc.enabled]]`link:#quarkus-log-js -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_MDC_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_MDC_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -324,7 +464,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.mdc.flat-fields]]`link:#quarkus-lo -- Will write the values at the top level of the JSON log object. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_MDC_FLAT_FIELDS+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_MDC_FLAT_FIELDS+++` +endif::add-copy-button-to-env-var[] --|boolean |`false` @@ -335,7 +480,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.ndc.field-name]]`link:#quarkus-log -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_NDC_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_NDC_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -346,7 +496,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.ndc.enabled]]`link:#quarkus-log-js -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_NDC_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_NDC_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -357,7 +512,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.process-name.field-name]]`link:#qu -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_PROCESS_NAME_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_PROCESS_NAME_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -368,7 +528,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.process-name.enabled]]`link:#quark -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_PROCESS_NAME_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_PROCESS_NAME_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -379,7 +544,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.process-id.field-name]]`link:#quar -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_PROCESS_ID_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_PROCESS_ID_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -390,7 +560,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.process-id.enabled]]`link:#quarkus -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_PROCESS_ID_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_PROCESS_ID_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -401,7 +576,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.stack-trace.field-name]]`link:#qua -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_STACK_TRACE_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_STACK_TRACE_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -412,7 +592,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.stack-trace.enabled]]`link:#quarku -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_STACK_TRACE_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_STACK_TRACE_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -423,7 +608,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.error-type.field-name]]`link:#quar -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_ERROR_TYPE_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ERROR_TYPE_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -434,7 +624,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.error-type.enabled]]`link:#quarkus -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_ERROR_TYPE_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ERROR_TYPE_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -445,7 +640,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.error-message.field-name]]`link:#q -- Used to change the json key for the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_ERROR_MESSAGE_FIELD_NAME+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ERROR_MESSAGE_FIELD_NAME+++` +endif::add-copy-button-to-env-var[] --|string | @@ -456,7 +656,12 @@ a| [[quarkus-log-json_quarkus.log.json.fields.error-message.enabled]]`link:#quar -- Enable or disable the field. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FIELDS_ERROR_MESSAGE_ENABLED+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_FIELDS_ERROR_MESSAGE_ENABLED+++` +endif::add-copy-button-to-env-var[] --|boolean | @@ -467,7 +672,12 @@ a| [[quarkus-log-json_quarkus.log.json.pretty-print]]`link:#quarkus-log-json_qua -- Enable "pretty printing" of the JSON record. Note that some JSON parsers will fail to read pretty printed output. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_PRETTY_PRINT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_PRETTY_PRINT+++` +endif::add-copy-button-to-env-var[] --|boolean |`false` @@ -478,7 +688,12 @@ a| [[quarkus-log-json_quarkus.log.json.record-delimiter]]`link:#quarkus-log-json -- The special end-of-record delimiter to be used. By default, newline delimiter is used. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_RECORD_DELIMITER+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_RECORD_DELIMITER+++` +endif::add-copy-button-to-env-var[] --|string |` ` @@ -490,7 +705,12 @@ a| [[quarkus-log-json_quarkus.log.json.log-format]]`link:#quarkus-log-json_quark -- Support changing logging format. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_LOG_FORMAT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_LOG_FORMAT+++` +endif::add-copy-button-to-env-var[] -- a| `default`, `ecs` |`default` @@ -507,7 +727,12 @@ a| [[quarkus-log-json_quarkus.log.json.additional-field.-field-name-.value]]`lin -- Additional field value. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_ADDITIONAL_FIELD__FIELD_NAME__VALUE+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_ADDITIONAL_FIELD__FIELD_NAME__VALUE+++` +endif::add-copy-button-to-env-var[] --|string |required icon:exclamation-circle[title=Configuration property is required] @@ -518,7 +743,12 @@ a| [[quarkus-log-json_quarkus.log.json.additional-field.-field-name-.type]]`link -- Type of the field, default is STRING. Supported types: STRING, INT, LONG, FLOAT, DOUBLE. +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_ADDITIONAL_FIELD__FIELD_NAME__TYPE+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] Environment variable: `+++QUARKUS_LOG_JSON_ADDITIONAL_FIELD__FIELD_NAME__TYPE+++` +endif::add-copy-button-to-env-var[] -- a| `string`, `int`, `long`, `float`, `double` |`string` From 20d06c844cf81d969948736c6398bc054cc100a1 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 9 Oct 2022 20:01:23 +0000 Subject: [PATCH 14/48] [maven-release-plugin] prepare release 2.0.0 --- deployment/pom.xml | 4 ++-- docs/pom.xml | 6 ++---- integration-tests/pom.xml | 2 +- pom.xml | 6 +++++- runtime/pom.xml | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index fd56148..eba3b49 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 1.1.2-SNAPSHOT + 2.0.0 ../pom.xml @@ -29,7 +29,7 @@ io.quarkiverse.loggingjson quarkus-logging-json - 1.1.2-SNAPSHOT + 2.0.0 diff --git a/docs/pom.xml b/docs/pom.xml index eb2dd67..5d4da29 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.quarkiverse.loggingjson quarkus-logging-json-parent - 1.1.2-SNAPSHOT + 2.0.0 ../pom.xml diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 17e14b3..64a953d 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 1.1.2-SNAPSHOT + 2.0.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 276b906..1b67973 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent Quarkus Logging JSON - Parent - 1.1.2-SNAPSHOT + 2.0.0 pom @@ -200,4 +200,8 @@ + + + 2.0.0 + diff --git a/runtime/pom.xml b/runtime/pom.xml index 87614dd..eee6b6e 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 1.1.2-SNAPSHOT + 2.0.0 ../pom.xml From a3bb0fc14dceeb439b3262532fb8ed47ba65da12 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 9 Oct 2022 20:01:23 +0000 Subject: [PATCH 15/48] [maven-release-plugin] prepare for next development iteration --- deployment/pom.xml | 4 ++-- docs/pom.xml | 2 +- integration-tests/pom.xml | 2 +- pom.xml | 6 +----- runtime/pom.xml | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index eba3b49..12b7d36 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.0 + 2.0.1-SNAPSHOT ../pom.xml @@ -29,7 +29,7 @@ io.quarkiverse.loggingjson quarkus-logging-json - 2.0.0 + 2.0.1-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index 5d4da29..e0699b8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.0 + 2.0.1-SNAPSHOT ../pom.xml diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 64a953d..746f2a8 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.0 + 2.0.1-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 1b67973..065c922 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent Quarkus Logging JSON - Parent - 2.0.0 + 2.0.1-SNAPSHOT pom @@ -200,8 +200,4 @@ - - - 2.0.0 - diff --git a/runtime/pom.xml b/runtime/pom.xml index eee6b6e..ccd8136 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.0 + 2.0.1-SNAPSHOT ../pom.xml From b50215c09cb75162d90898a49e84207ce1a9320e Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 9 Oct 2022 20:01:23 +0000 Subject: [PATCH 16/48] Update stable version for documentation --- docs/modules/ROOT/pages/includes/attributes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc index 337a2a3..f35dd52 100644 --- a/docs/modules/ROOT/pages/includes/attributes.adoc +++ b/docs/modules/ROOT/pages/includes/attributes.adoc @@ -1,3 +1,3 @@ -:project-version: 1.1.1 +:project-version: 2.0.0 :examples-dir: ./../examples/ \ No newline at end of file From c965f4277e27146849daf02a13e65a019fe0ed52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 09:01:45 +0000 Subject: [PATCH 17/48] Bump quarkiverse-parent from 10 to 12 Bumps [quarkiverse-parent](https://github.com/quarkiverse/quarkiverse-parent) from 10 to 12. - [Release notes](https://github.com/quarkiverse/quarkiverse-parent/releases) - [Commits](https://github.com/quarkiverse/quarkiverse-parent/commits) --- updated-dependencies: - dependency-name: io.quarkiverse:quarkiverse-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 065c922..07ef793 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse quarkiverse-parent - 10 + 12 io.quarkiverse.loggingjson From 74c4e9a597dc9118ad7042bffa88019325db454d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 09:57:04 +0000 Subject: [PATCH 18/48] Bump jacoco.version from 0.8.8 to 0.8.9 Bumps `jacoco.version` from 0.8.8 to 0.8.9. Updates `org.jacoco.agent` from 0.8.8 to 0.8.9 - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.8...v0.8.9) Updates `jacoco-maven-plugin` from 0.8.8 to 0.8.9 - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.8...v0.8.9) --- updated-dependencies: - dependency-name: org.jacoco:org.jacoco.agent:runtime dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 07ef793..91bab55 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ true false 2.13.0.Final - 0.8.8 + 0.8.9 quarkiverse_quarkus-logging-json ${project.artifactId} From bb073e9460c229e24fa62962fbea94dc70b0bf42 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Tue, 18 Apr 2023 14:13:00 -0300 Subject: [PATCH 19/48] Update release script (#233) --- .github/release/maven-settings.xml.gpg | Bin 856 -> 0 bytes .github/workflows/build.yml | 73 ++++++++++------------- .github/workflows/pre-release.yml | 8 +++ .github/workflows/quarkus-snapshot.yaml | 29 ++++++--- .github/workflows/release.yml | 76 ++++++++++-------------- docs/pom.xml | 2 +- 6 files changed, 94 insertions(+), 94 deletions(-) delete mode 100644 .github/release/maven-settings.xml.gpg diff --git a/.github/release/maven-settings.xml.gpg b/.github/release/maven-settings.xml.gpg deleted file mode 100644 index b342f7c1f62cd53c74527af166e36c3b5b45e701..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 856 zcmV-e1E>6j0t^F0JI%MV2--pc5CF7mLz1Q7ICpW1>rN1SZ93bnmX$kRj7+ymY|l~M zOfF{8Ib7y8Q5zngSD0_9X+rR zc``gl)ud618Zp}e;4U@9lLqZ_fhr#mw5Ru)HY-1v0nZ2OEC~wk&jY5Pd%x$B^9I!4z?zBXg@pHP|3lkb30WIU3o5XDbh6t7$2h=RxS zn|03P=#^E>+XI~<;JU}oRxET~k%b&XTX_yvW97@sl*GH+6_I3@f7HojrCJ7zM=5QG z+m3d#ft?Y8B4+pAWSgL&sR^}asK=6s93y^uwJ?cr*2Qbr8i7PMQ2rxOpp to manually launch the ecosystem CI in addition to the bots + if: github.actor == 'quarkusbot' || github.actor == 'quarkiversebot' || github.actor == '' steps: - name: Install yq - run: sudo add-apt-repository ppa:rmescandon/yq && sudo apt update && sudo apt install yq -y + uses: dcarbone/install-yq-action@v1.0.1 - name: Set up Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: temurin java-version: ${{ env.JAVA_VERSION }} - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: current-repo - name: Checkout Ecosystem - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: ${{ env.ECOSYSTEM_CI_REPO }} path: ecosystem-ci @@ -46,4 +57,4 @@ jobs: - name: Setup and Run Tests run: ./ecosystem-ci/setup-and-test env: - ECOSYSTEM_CI_TOKEN: ${{ secrets.ECOSYSTEM_CI_TOKEN }} + ECOSYSTEM_CI_TOKEN: ${{ secrets.ECOSYSTEM_CI_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a7e7dc4..c55c17e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,6 +6,14 @@ on: paths: - '.github/project.yml' +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +defaults: + run: + shell: bash + jobs: release: runs-on: ubuntu-latest @@ -13,74 +21,54 @@ jobs: if: ${{github.event.pull_request.merged == true}} steps: - - uses: radcortez/project-metadata-action@master + - uses: radcortez/project-metadata-action@main name: Retrieve project metadata id: metadata with: github-token: ${{secrets.GITHUB_TOKEN}} metadata-file-path: '.github/project.yml' - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Import GPG key id: import_gpg - uses: crazy-max/ghaction-import-gpg@v3 + uses: crazy-max/ghaction-import-gpg@v5 with: - gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} passphrase: ${{ secrets.GPG_PASSPHRASE }} - - uses: actions/setup-java@v1.4.3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 with: + distribution: temurin java-version: 11 - - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- + cache: 'maven' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD - name: Configure Git author run: | git config --local user.email "action@github.com" git config --local user.name "GitHub Action" - - name: Maven release ${{steps.metadata.outputs.current-version}} + - name: Update latest release version in docs run: | - gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.GPG_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg - git checkout -b release - mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml + mvn -B -ntp -pl docs -am generate-resources -Denforcer.skip -Dformatter.skip -Dimpsort.skip if ! git diff --quiet docs/modules/ROOT/pages/includes/attributes.adoc; then git add docs/modules/ROOT/pages/includes/attributes.adoc - git commit -m "Update stable version for documentation" + git commit -m "Update the latest release version ${{steps.metadata.outputs.current-version}} in documentation" fi - git checkout ${{github.base_ref}} - git rebase release - mvn -B release:perform -Darguments=-DperformRelease -Prelease -s maven-settings.xml - - name: Adjust tag for documentation changes + - name: Maven release ${{steps.metadata.outputs.current-version}} run: | - git checkout ${{steps.metadata.outputs.current-version}} - mvn -B clean install -DskipTests -DskipITs - if ! git diff --quiet docs/modules/ROOT/pages/includes/attributes.adoc; then - git add docs/modules/ROOT/pages/includes/attributes.adoc - git commit -m "Update stable version for documentation" - # Move the tag after inclusion of documentation adjustments - git tag -f ${{steps.metadata.outputs.current-version}} - fi - # Go back to master - git checkout master - - - name: Push changes to ${{github.base_ref}} - uses: ad-m/github-push-action@v0.6.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: ${{github.base_ref}} + mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} + mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - - name: Push tags - uses: ad-m/github-push-action@v0.6.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - tags: true - branch: ${{github.base_ref}} + - name: Push changes to ${{github.base_ref}} branch + run: | + git push + git push origin ${{steps.metadata.outputs.current-version}} diff --git a/docs/pom.xml b/docs/pom.xml index e0699b8..2e09124 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -56,7 +56,7 @@ copy-resources - prepare-package + generate-resources copy-resources From 42b80a489a76b264fdb25127a4f1e2dfd4439dec Mon Sep 17 00:00:00 2001 From: KarlScheibelhofer Date: Sun, 2 Apr 2023 11:30:45 +0200 Subject: [PATCH 20/48] update for quarkus 3.0.0 (javax/jakarta) --- README.md | 2 +- deployment/pom.xml | 4 ++-- .../providers/custom/CustomJsonProviderJsonbTest.java | 2 +- .../providers/custom/FirstCustomJsonProvider.java | 2 +- .../providers/custom/SecondCustomJsonProvider.java | 2 +- .../providers/custom/ThirdCustomJsonProvider.java | 2 +- docs/pom.xml | 2 +- integration-tests/pom.xml | 2 +- .../io/quarkiverse/loggingjson/it/CustomJsonProvider.java | 2 +- .../io/quarkiverse/loggingjson/it/GreetingResource.java | 8 ++++---- .../loggingjson/it/NativeGreetingResourceIT.java | 4 ++-- pom.xml | 7 +++---- runtime/pom.xml | 2 +- .../quarkiverse/loggingjson/jsonb/JsonbJsonFactory.java | 4 ++-- .../quarkiverse/loggingjson/jsonb/JsonbJsonGenerator.java | 8 ++++---- 15 files changed, 26 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 081a106..70a492d 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ If you want to add your own custom way to handle the LogRecords. You can create your own implementations of `io.quarkiverse.loggingjson.JsonProvider`, and provide it using CDI. Example implementation: ```java -import javax.inject.Singleton; +import jakarta.inject.Singleton; import java.io.IOException; import io.quarkiverse.loggingjson.JsonProvider; diff --git a/deployment/pom.xml b/deployment/pom.xml index 12b7d36..3ea0388 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml @@ -29,7 +29,7 @@ io.quarkiverse.loggingjson quarkus-logging-json - 2.0.1-SNAPSHOT + 3.0.0-SNAPSHOT diff --git a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/CustomJsonProviderJsonbTest.java b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/CustomJsonProviderJsonbTest.java index 8f99034..c9bdbca 100644 --- a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/CustomJsonProviderJsonbTest.java +++ b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/CustomJsonProviderJsonbTest.java @@ -2,7 +2,7 @@ import java.util.Collections; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/FirstCustomJsonProvider.java b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/FirstCustomJsonProvider.java index 2545fe7..619fd04 100644 --- a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/FirstCustomJsonProvider.java +++ b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/FirstCustomJsonProvider.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.logmanager.ExtLogRecord; diff --git a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/SecondCustomJsonProvider.java b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/SecondCustomJsonProvider.java index f4ff4a1..227eeec 100644 --- a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/SecondCustomJsonProvider.java +++ b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/SecondCustomJsonProvider.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.logmanager.ExtLogRecord; diff --git a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/ThirdCustomJsonProvider.java b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/ThirdCustomJsonProvider.java index ded68fb..6332daf 100644 --- a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/ThirdCustomJsonProvider.java +++ b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/providers/custom/ThirdCustomJsonProvider.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.logmanager.ExtLogRecord; diff --git a/docs/pom.xml b/docs/pom.xml index 2e09124..47b806e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 746f2a8..f613987 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/integration-tests/src/main/java/io/quarkiverse/loggingjson/it/CustomJsonProvider.java b/integration-tests/src/main/java/io/quarkiverse/loggingjson/it/CustomJsonProvider.java index e553400..94b4d5d 100644 --- a/integration-tests/src/main/java/io/quarkiverse/loggingjson/it/CustomJsonProvider.java +++ b/integration-tests/src/main/java/io/quarkiverse/loggingjson/it/CustomJsonProvider.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.logmanager.ExtLogRecord; diff --git a/integration-tests/src/main/java/io/quarkiverse/loggingjson/it/GreetingResource.java b/integration-tests/src/main/java/io/quarkiverse/loggingjson/it/GreetingResource.java index ed7d69b..dc812e7 100644 --- a/integration-tests/src/main/java/io/quarkiverse/loggingjson/it/GreetingResource.java +++ b/integration-tests/src/main/java/io/quarkiverse/loggingjson/it/GreetingResource.java @@ -2,10 +2,10 @@ import java.util.logging.Logger; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/hello") public class GreetingResource { diff --git a/integration-tests/src/test/java/io/quarkiverse/loggingjson/it/NativeGreetingResourceIT.java b/integration-tests/src/test/java/io/quarkiverse/loggingjson/it/NativeGreetingResourceIT.java index 568c552..d301c5b 100644 --- a/integration-tests/src/test/java/io/quarkiverse/loggingjson/it/NativeGreetingResourceIT.java +++ b/integration-tests/src/test/java/io/quarkiverse/loggingjson/it/NativeGreetingResourceIT.java @@ -1,8 +1,8 @@ package io.quarkiverse.loggingjson.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class NativeGreetingResourceIT extends GreetingResourceTest { // Execute the same tests but in native mode. diff --git a/pom.xml b/pom.xml index 91bab55..223c487 100644 --- a/pom.xml +++ b/pom.xml @@ -10,17 +10,16 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent Quarkus Logging JSON - Parent - 2.0.1-SNAPSHOT + 3.0.0-SNAPSHOT pom UTF-8 UTF-8 - 1.8 - 1.8 + 11 true false - 2.13.0.Final + 3.0.0.Final 0.8.9 quarkiverse_quarkus-logging-json diff --git a/runtime/pom.xml b/runtime/pom.xml index ccd8136..5ad1f1f 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.1-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/jsonb/JsonbJsonFactory.java b/runtime/src/main/java/io/quarkiverse/loggingjson/jsonb/JsonbJsonFactory.java index 8421408..e2a5660 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/jsonb/JsonbJsonFactory.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/jsonb/JsonbJsonFactory.java @@ -2,8 +2,8 @@ import java.util.HashMap; -import javax.json.Json; -import javax.json.stream.JsonGeneratorFactory; +import jakarta.json.Json; +import jakarta.json.stream.JsonGeneratorFactory; import org.eclipse.yasson.YassonJsonb; import org.eclipse.yasson.internal.JsonBindingBuilder; diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/jsonb/JsonbJsonGenerator.java b/runtime/src/main/java/io/quarkiverse/loggingjson/jsonb/JsonbJsonGenerator.java index f775191..cdc8206 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/jsonb/JsonbJsonGenerator.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/jsonb/JsonbJsonGenerator.java @@ -5,18 +5,18 @@ import java.math.BigInteger; import java.util.List; -import javax.json.JsonStructure; -import javax.json.JsonValue; +import jakarta.json.JsonStructure; +import jakarta.json.JsonValue; import org.eclipse.yasson.YassonJsonb; import io.quarkiverse.loggingjson.JsonGenerator; public class JsonbJsonGenerator implements JsonGenerator { - private final javax.json.stream.JsonGenerator generator; + private final jakarta.json.stream.JsonGenerator generator; private final YassonJsonb jsonb; - public JsonbJsonGenerator(javax.json.stream.JsonGenerator generator, YassonJsonb jsonb) { + public JsonbJsonGenerator(jakarta.json.stream.JsonGenerator generator, YassonJsonb jsonb) { this.generator = generator; this.jsonb = jsonb; } From c2188542499f3e6791f39c17a01bac0a9f120913 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Apr 2023 09:56:36 +0000 Subject: [PATCH 21/48] Bump quarkiverse-parent from 12 to 13 Bumps [quarkiverse-parent](https://github.com/quarkiverse/quarkiverse-parent) from 12 to 13. - [Release notes](https://github.com/quarkiverse/quarkiverse-parent/releases) - [Commits](https://github.com/quarkiverse/quarkiverse-parent/commits) --- updated-dependencies: - dependency-name: io.quarkiverse:quarkiverse-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91bab55..b0f46a5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse quarkiverse-parent - 12 + 13 io.quarkiverse.loggingjson From caa7cbf3458fa298a4364a120e9130dabf3fa2b7 Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Thu, 20 Apr 2023 16:35:09 +0200 Subject: [PATCH 22/48] Added version matrix to README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 081a106..0ff31d4 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,12 @@ # Quarkus Logging Json Quarkus logging extension outputting the logging in json. +## Version to use +| Quarkus Version | Use version | +|-------|-------| +| 3.x.x | 3.x.x | +| 2.x.x | 1.x.x, 2.x.x | + # Configuration The extension is enabled by default for console, when added to the project. Console logging can be disabled using configuration: `quarkus.log.json.console.enable=false` From 30dec5c41b1406477c8f34ec6b0c0a275ecf3996 Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Thu, 20 Apr 2023 16:38:25 +0200 Subject: [PATCH 23/48] Release 2.0.1 --- .github/project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yml b/.github/project.yml index fcd48e8..03763f3 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,4 +1,4 @@ name: Quarkus Logging JSON release: - current-version: 2.0.0 - next-version: 2.0.1-SNAPSHOT + current-version: 2.0.1 + next-version: 2.0.2-SNAPSHOT From 86fbe46fddbdd1d79eebe503979a18981cf9ffff Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 20 Apr 2023 14:46:38 +0000 Subject: [PATCH 24/48] Update the latest release version 2.0.1 in documentation --- docs/modules/ROOT/pages/includes/attributes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc index f35dd52..ca824b3 100644 --- a/docs/modules/ROOT/pages/includes/attributes.adoc +++ b/docs/modules/ROOT/pages/includes/attributes.adoc @@ -1,3 +1,3 @@ -:project-version: 2.0.0 +:project-version: 2.0.1 :examples-dir: ./../examples/ \ No newline at end of file From 11d1066ee2d4d9b0670a2be534b07f597966e7ee Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 20 Apr 2023 14:48:39 +0000 Subject: [PATCH 25/48] [maven-release-plugin] prepare release 2.0.1 --- deployment/pom.xml | 4 ++-- docs/pom.xml | 2 +- integration-tests/pom.xml | 2 +- pom.xml | 6 +++++- runtime/pom.xml | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index 12b7d36..19342c7 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.1-SNAPSHOT + 2.0.1 ../pom.xml @@ -29,7 +29,7 @@ io.quarkiverse.loggingjson quarkus-logging-json - 2.0.1-SNAPSHOT + 2.0.1 diff --git a/docs/pom.xml b/docs/pom.xml index 2e09124..8c599d1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.1-SNAPSHOT + 2.0.1 ../pom.xml diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 746f2a8..04c9eb6 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.1-SNAPSHOT + 2.0.1 ../pom.xml diff --git a/pom.xml b/pom.xml index 91bab55..ba35d31 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent Quarkus Logging JSON - Parent - 2.0.1-SNAPSHOT + 2.0.1 pom @@ -200,4 +200,8 @@ + + + 2.0.1 + diff --git a/runtime/pom.xml b/runtime/pom.xml index ccd8136..fd69284 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.1-SNAPSHOT + 2.0.1 ../pom.xml From 141d4b252622876550dbf9df3df3e597a22f910b Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 20 Apr 2023 14:48:39 +0000 Subject: [PATCH 26/48] [maven-release-plugin] prepare for next development iteration --- deployment/pom.xml | 4 ++-- docs/pom.xml | 2 +- integration-tests/pom.xml | 2 +- pom.xml | 6 +----- runtime/pom.xml | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index 19342c7..b515a3d 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.1 + 2.0.2-SNAPSHOT ../pom.xml @@ -29,7 +29,7 @@ io.quarkiverse.loggingjson quarkus-logging-json - 2.0.1 + 2.0.2-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index 8c599d1..e82f867 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.1 + 2.0.2-SNAPSHOT ../pom.xml diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 04c9eb6..e5feb4b 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.1 + 2.0.2-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index ba35d31..610a2fd 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent Quarkus Logging JSON - Parent - 2.0.1 + 2.0.2-SNAPSHOT pom @@ -200,8 +200,4 @@ - - - 2.0.1 - diff --git a/runtime/pom.xml b/runtime/pom.xml index fd69284..f3e28d0 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 2.0.1 + 2.0.2-SNAPSHOT ../pom.xml From 0e8515e3cafb679c35eafd724886f0444d5bc725 Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Thu, 20 Apr 2023 20:43:24 +0200 Subject: [PATCH 27/48] Release 3.0.0 --- .github/project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yml b/.github/project.yml index 03763f3..5952845 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,4 +1,4 @@ name: Quarkus Logging JSON release: - current-version: 2.0.1 - next-version: 2.0.2-SNAPSHOT + current-version: 3.0.0 + next-version: 3.0.1-SNAPSHOT From acc6b2028ff3e97257c4806e388428894b92c0a1 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 20 Apr 2023 18:52:01 +0000 Subject: [PATCH 28/48] Update the latest release version 3.0.0 in documentation --- docs/modules/ROOT/pages/includes/attributes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc index ca824b3..933165d 100644 --- a/docs/modules/ROOT/pages/includes/attributes.adoc +++ b/docs/modules/ROOT/pages/includes/attributes.adoc @@ -1,3 +1,3 @@ -:project-version: 2.0.1 +:project-version: 3.0.0 :examples-dir: ./../examples/ \ No newline at end of file From d653c15ac0a3a79ff4052092d0796e82eddfb2d9 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 20 Apr 2023 18:53:35 +0000 Subject: [PATCH 29/48] [maven-release-plugin] prepare release 3.0.0 --- deployment/pom.xml | 4 ++-- docs/pom.xml | 2 +- integration-tests/pom.xml | 2 +- pom.xml | 6 +++++- runtime/pom.xml | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index 3ea0388..5b32609 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 3.0.0-SNAPSHOT + 3.0.0 ../pom.xml @@ -29,7 +29,7 @@ io.quarkiverse.loggingjson quarkus-logging-json - 3.0.0-SNAPSHOT + 3.0.0 diff --git a/docs/pom.xml b/docs/pom.xml index 47b806e..63f7f18 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 3.0.0-SNAPSHOT + 3.0.0 ../pom.xml diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index f613987..cc1d83a 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 3.0.0-SNAPSHOT + 3.0.0 ../pom.xml diff --git a/pom.xml b/pom.xml index ba57d95..e552d5a 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent Quarkus Logging JSON - Parent - 3.0.0-SNAPSHOT + 3.0.0 pom @@ -199,4 +199,8 @@ + + + 3.0.0 + diff --git a/runtime/pom.xml b/runtime/pom.xml index 5ad1f1f..b0b7d7d 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 3.0.0-SNAPSHOT + 3.0.0 ../pom.xml From 479579b09fd2837ae9e2fca0aef4cf75933dbd90 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 20 Apr 2023 18:53:35 +0000 Subject: [PATCH 30/48] [maven-release-plugin] prepare for next development iteration --- deployment/pom.xml | 4 ++-- docs/pom.xml | 2 +- integration-tests/pom.xml | 2 +- pom.xml | 6 +----- runtime/pom.xml | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index 5b32609..cd134bf 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 3.0.0 + 3.0.1-SNAPSHOT ../pom.xml @@ -29,7 +29,7 @@ io.quarkiverse.loggingjson quarkus-logging-json - 3.0.0 + 3.0.1-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index 63f7f18..d7f3f23 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 3.0.0 + 3.0.1-SNAPSHOT ../pom.xml diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index cc1d83a..1907b15 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 3.0.0 + 3.0.1-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index e552d5a..dbe7991 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent Quarkus Logging JSON - Parent - 3.0.0 + 3.0.1-SNAPSHOT pom @@ -199,8 +199,4 @@ - - - 3.0.0 - diff --git a/runtime/pom.xml b/runtime/pom.xml index b0b7d7d..21278c8 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 3.0.0 + 3.0.1-SNAPSHOT ../pom.xml From f8765e91fcdaa82e36a2a727442edc4ad7c84622 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 09:56:49 +0000 Subject: [PATCH 31/48] Bump quarkus.version from 3.0.0.Final to 3.0.1.Final Bumps `quarkus.version` from 3.0.0.Final to 3.0.1.Final. Updates `quarkus-bom` from 3.0.0.Final to 3.0.1.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.0.0.Final...3.0.1.Final) Updates `quarkus-maven-plugin` from 3.0.0.Final to 3.0.1.Final Updates `quarkus-jackson-deployment` from 3.0.0.Final to 3.0.1.Final Updates `quarkus-extension-processor` from 3.0.0.Final to 3.0.1.Final Updates `quarkus-extension-maven-plugin` from 3.0.0.Final to 3.0.1.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.0.0.Final...3.0.1.Final) Updates `quarkus-resteasy-deployment` from 3.0.0.Final to 3.0.1.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-jackson-deployment dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-extension-processor dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-extension-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-resteasy-deployment dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dbe7991..ef0c77f 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 11 true false - 3.0.0.Final + 3.0.1.Final 0.8.9 quarkiverse_quarkus-logging-json From ed48da3c1d963df465575336f4654e669d96bbd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 15:52:19 +0000 Subject: [PATCH 32/48] Bump jacoco.version from 0.8.9 to 0.8.10 Bumps `jacoco.version` from 0.8.9 to 0.8.10. Updates `org.jacoco.agent` from 0.8.9 to 0.8.10 - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.9...v0.8.10) Updates `jacoco-maven-plugin` from 0.8.9 to 0.8.10 - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.9...v0.8.10) --- updated-dependencies: - dependency-name: org.jacoco:org.jacoco.agent:runtime dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef0c77f..dac8da8 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ true false 3.0.1.Final - 0.8.9 + 0.8.10 quarkiverse_quarkus-logging-json ${project.artifactId} From 6442a6412292e64edf2d8c6ec916233f1fa71613 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 09:56:49 +0000 Subject: [PATCH 33/48] Bump quarkus.version from 3.0.1.Final to 3.0.2.Final Bumps `quarkus.version` from 3.0.1.Final to 3.0.2.Final. Updates `quarkus-bom` from 3.0.1.Final to 3.0.2.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.0.1.Final...3.0.2.Final) Updates `quarkus-maven-plugin` from 3.0.1.Final to 3.0.2.Final Updates `quarkus-jackson-deployment` from 3.0.1.Final to 3.0.2.Final Updates `quarkus-extension-processor` from 3.0.1.Final to 3.0.2.Final Updates `quarkus-extension-maven-plugin` from 3.0.1.Final to 3.0.2.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.0.1.Final...3.0.2.Final) Updates `quarkus-resteasy-deployment` from 3.0.1.Final to 3.0.2.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-jackson-deployment dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-extension-processor dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-extension-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-resteasy-deployment dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dac8da8..fa3fdff 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 11 true false - 3.0.1.Final + 3.0.2.Final 0.8.10 quarkiverse_quarkus-logging-json From 15abd3ccaa133ffb7c2f64ce185f4d6a20bdd784 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 09:57:15 +0000 Subject: [PATCH 34/48] Bump quarkiverse-parent from 13 to 15 Bumps [quarkiverse-parent](https://github.com/quarkiverse/quarkiverse-parent) from 13 to 15. - [Release notes](https://github.com/quarkiverse/quarkiverse-parent/releases) - [Commits](https://github.com/quarkiverse/quarkiverse-parent/commits) --- updated-dependencies: - dependency-name: io.quarkiverse:quarkiverse-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa3fdff..548bc99 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse quarkiverse-parent - 13 + 15 io.quarkiverse.loggingjson From 3547cd4066d685bf50b88fd7f90db47886bde2b4 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Fri, 7 Jul 2023 11:59:00 -0300 Subject: [PATCH 35/48] Adjust doc title --- docs/antora.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/antora.yml b/docs/antora.yml index 573e1c1..5a02e04 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,5 +1,5 @@ name: quarkus-logging-json -title: Quarkus Logging JSON +title: Logging JSON version: dev nav: - modules/ROOT/nav.adoc From b9af397c62b1f893c10aca29d4d6e4d6c0a0ed7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 09:21:02 +0000 Subject: [PATCH 36/48] Bump quarkus.version from 3.0.2.Final to 3.2.1.Final Bumps `quarkus.version` from 3.0.2.Final to 3.2.1.Final. Updates `quarkus-bom` from 3.0.2.Final to 3.2.1.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.0.2.Final...3.2.1.Final) Updates `quarkus-maven-plugin` from 3.0.2.Final to 3.2.1.Final Updates `quarkus-jackson-deployment` from 3.0.2.Final to 3.2.1.Final Updates `quarkus-extension-processor` from 3.0.2.Final to 3.2.1.Final Updates `quarkus-extension-maven-plugin` from 3.0.2.Final to 3.2.1.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.0.2.Final...3.2.1.Final) Updates `quarkus-resteasy-deployment` from 3.0.2.Final to 3.2.1.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-jackson-deployment dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-extension-processor dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-extension-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-resteasy-deployment dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa3fdff..ee85511 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 11 true false - 3.0.2.Final + 3.2.1.Final 0.8.10 quarkiverse_quarkus-logging-json From cc20e6b11b9e10a866942d489c19bc311afcadc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:41:08 +0000 Subject: [PATCH 37/48] Bump quarkus.version from 3.2.1.Final to 3.4.1 Bumps `quarkus.version` from 3.2.1.Final to 3.4.1. Updates `io.quarkus:quarkus-bom` from 3.2.1.Final to 3.4.1 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.2.1.Final...3.4.1) Updates `io.quarkus:quarkus-maven-plugin` from 3.2.1.Final to 3.4.1 Updates `io.quarkus:quarkus-jackson-deployment` from 3.2.1.Final to 3.4.1 Updates `io.quarkus:quarkus-extension-processor` from 3.2.1.Final to 3.4.1 Updates `io.quarkus:quarkus-extension-maven-plugin` from 3.2.1.Final to 3.4.1 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.2.1.Final...3.4.1) Updates `io.quarkus:quarkus-resteasy-deployment` from 3.2.1.Final to 3.4.1 --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-jackson-deployment dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-extension-processor dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-extension-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-resteasy-deployment dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee85511..f75de68 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 11 true false - 3.2.1.Final + 3.4.1 0.8.10 quarkiverse_quarkus-logging-json From 1d08a6cd7e3515bc8721150783bea168d5c16752 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Fri, 1 Dec 2023 12:44:35 -0300 Subject: [PATCH 38/48] Bump build to JDK 17 (#280) --- .github/workflows/quarkus-snapshot.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/quarkus-snapshot.yaml b/.github/workflows/quarkus-snapshot.yaml index a065d94..6124638 100644 --- a/.github/workflows/quarkus-snapshot.yaml +++ b/.github/workflows/quarkus-snapshot.yaml @@ -10,7 +10,7 @@ on: env: ECOSYSTEM_CI_REPO: quarkusio/quarkus-ecosystem-ci ECOSYSTEM_CI_REPO_FILE: context.yaml - JAVA_VERSION: 11 + JAVA_VERSION: 17 ######################### # Repo specific setting # From 5a9823718b2e515a8166445e5bfaf9f6fa12ec21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:32:28 +0000 Subject: [PATCH 39/48] Bump quarkus.version from 3.4.1 to 3.6.4 Bumps `quarkus.version` from 3.4.1 to 3.6.4. Updates `io.quarkus:quarkus-bom` from 3.4.1 to 3.6.4 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.4.1...3.6.4) Updates `io.quarkus:quarkus-maven-plugin` from 3.4.1 to 3.6.4 Updates `io.quarkus:quarkus-jackson-deployment` from 3.4.1 to 3.6.4 Updates `io.quarkus:quarkus-extension-processor` from 3.4.1 to 3.6.4 Updates `io.quarkus:quarkus-extension-maven-plugin` from 3.4.1 to 3.6.4 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.4.1...3.6.4) Updates `io.quarkus:quarkus-resteasy-deployment` from 3.4.1 to 3.6.4 --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-jackson-deployment dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-extension-processor dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-extension-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-resteasy-deployment dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e958b0f..2ec2e10 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 11 true false - 3.4.1 + 3.6.4 0.8.10 quarkiverse_quarkus-logging-json From 283d20a48c7654e19d08c69bc8a5b9aceebc4a16 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Thu, 11 Jan 2024 13:30:21 -0300 Subject: [PATCH 40/48] Add SCM tag --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e958b0f..7caf0a0 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,11 @@ runtime docs - + + scm:git:git@github.com:quarkiverse/quarkus-logging-json.git + scm:git:git@github.com:quarkiverse/quarkus-logging-json.git + https://github.com/quarkiverse/quarkus-logging-json + From eb6a4c67e3225e99fb2b09570731c4b4ae47071a Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Thu, 25 Jan 2024 15:35:28 -0300 Subject: [PATCH 41/48] Update release workflow --- .github/workflows/release.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c55c17e..00576e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,17 +28,10 @@ jobs: github-token: ${{secrets.GITHUB_TOKEN}} metadata-file-path: '.github/project.yml' - - uses: actions/checkout@v3 - - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v5 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.GPG_PASSPHRASE }} + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 @@ -46,6 +39,8 @@ jobs: server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Configure Git author run: | @@ -67,6 +62,7 @@ jobs: env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Push changes to ${{github.base_ref}} branch run: | From c18fdf3cfd8dfadd61f70d85d5108cbc8e4af434 Mon Sep 17 00:00:00 2001 From: Valentin Day Date: Wed, 6 Dec 2023 11:51:13 +0100 Subject: [PATCH 42/48] Make quarkus-jsonb and quarkus-jackson optionals --- deployment/pom.xml | 19 ++++++++++------- .../deployment/LoggingJsonProcessor.java | 13 +++++++----- .../JsonDefaultFormatterJacksonTest.java | 2 +- .../JsonDefaultFormatterJsonbTest.java | 2 +- docs/pom.xml | 3 ++- runtime/pom.xml | 8 +++++-- .../loggingjson/LoggingJsonRecorder.java | 21 +++++-------------- 7 files changed, 35 insertions(+), 33 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index cd134bf..35ef863 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -18,13 +18,7 @@ io.quarkus - quarkus-jackson-deployment - compile - - - io.quarkus - quarkus-jsonb-deployment - compile + quarkus-arc-deployment io.quarkiverse.loggingjson @@ -42,6 +36,17 @@ quarkus-junit5-internal test + + io.quarkus + quarkus-jackson + test + + + io.quarkus + quarkus-jsonb + test + + diff --git a/deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java b/deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java index e1d5ac5..d34d424 100644 --- a/deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java +++ b/deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java @@ -4,8 +4,11 @@ import org.jboss.jandex.ClassInfo; +import io.quarkiverse.loggingjson.JsonFactory; import io.quarkiverse.loggingjson.LoggingJsonRecorder; import io.quarkiverse.loggingjson.config.Config; +import io.quarkiverse.loggingjson.jackson.JacksonJsonFactory; +import io.quarkiverse.loggingjson.jsonb.JsonbJsonFactory; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.deployment.Capabilities; import io.quarkus.deployment.Capability; @@ -31,21 +34,21 @@ FeatureBuildItem feature() { @Record(ExecutionTime.RUNTIME_INIT) LogConsoleFormatBuildItem setUpConsoleFormatter(Capabilities capabilities, LoggingJsonRecorder recorder, Config config) { - return new LogConsoleFormatBuildItem(recorder.initializeConsoleJsonLogging(config, useJackson(capabilities))); + return new LogConsoleFormatBuildItem(recorder.initializeConsoleJsonLogging(config, jsonFactory(capabilities))); } @BuildStep @Record(ExecutionTime.RUNTIME_INIT) LogFileFormatBuildItem setUpFileFormatter(Capabilities capabilities, LoggingJsonRecorder recorder, Config config) { - return new LogFileFormatBuildItem(recorder.initializeFileJsonLogging(config, useJackson(capabilities))); + return new LogFileFormatBuildItem(recorder.initializeFileJsonLogging(config, jsonFactory(capabilities))); } - private boolean useJackson(Capabilities capabilities) { + private JsonFactory jsonFactory(Capabilities capabilities) { if (capabilities.isPresent(Capability.JACKSON)) { - return true; + return new JacksonJsonFactory(); } else if (capabilities.isPresent(Capability.JSONB)) { - return false; + return new JsonbJsonFactory(); } else { throw new RuntimeException( "Missing json implementation to use for logging-json. Supported: [quarkus-jackson, quarkus-jsonb]"); diff --git a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonDefaultFormatterJacksonTest.java b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonDefaultFormatterJacksonTest.java index c745107..cf592e4 100644 --- a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonDefaultFormatterJacksonTest.java +++ b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonDefaultFormatterJacksonTest.java @@ -16,7 +16,7 @@ class JsonDefaultFormatterJacksonTest extends JsonDefaultFormatterBaseTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) .setForcedDependencies(Collections.singletonList( - new AppArtifact("io.quarkus", "quarkus-jackson-deployment", System.getProperty("test.quarkus.version")))) + new AppArtifact("io.quarkus", "quarkus-jackson", System.getProperty("test.quarkus.version")))) .withConfigurationResource("application-json.properties"); @Test diff --git a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonDefaultFormatterJsonbTest.java b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonDefaultFormatterJsonbTest.java index f4f5c18..51200fd 100644 --- a/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonDefaultFormatterJsonbTest.java +++ b/deployment/src/test/java/io/quarkiverse/loggingjson/deployment/JsonDefaultFormatterJsonbTest.java @@ -16,7 +16,7 @@ class JsonDefaultFormatterJsonbTest extends JsonDefaultFormatterBaseTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) .setForcedDependencies(Collections.singletonList( - new AppArtifact("io.quarkus", "quarkus-jsonb-deployment", System.getProperty("test.quarkus.version")))) + new AppArtifact("io.quarkus", "quarkus-jsonb", System.getProperty("test.quarkus.version")))) .withConfigurationResource("application-json.properties"); @Test diff --git a/docs/pom.xml b/docs/pom.xml index d7f3f23..4db5a64 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -15,8 +15,9 @@ io.quarkiverse.loggingjson - quarkus-logging-json-deployment + quarkus-logging-json-integration-tests ${project.version} + true diff --git a/runtime/pom.xml b/runtime/pom.xml index 21278c8..7eae1d5 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -16,15 +16,19 @@ io.quarkus quarkus-core + + io.quarkus + quarkus-arc + io.quarkus quarkus-jackson - compile + true io.quarkus quarkus-jsonb - compile + true diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java b/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java index 135e6df..9ea5873 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java @@ -11,8 +11,6 @@ import io.quarkiverse.loggingjson.config.Config; import io.quarkiverse.loggingjson.config.ConfigFormatter; -import io.quarkiverse.loggingjson.jackson.JacksonJsonFactory; -import io.quarkiverse.loggingjson.jsonb.JsonbJsonFactory; import io.quarkiverse.loggingjson.providers.*; import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableInstance; @@ -24,17 +22,17 @@ public class LoggingJsonRecorder { private static final Logger log = LoggerFactory.getLogger(LoggingJsonRecorder.class); public RuntimeValue> initializeConsoleJsonLogging(Config config, - boolean useJackson) { - return initializeJsonLogging(config.console, config, useJackson); + JsonFactory jsonFactory) { + return initializeJsonLogging(config.console, config, jsonFactory); } public RuntimeValue> initializeFileJsonLogging(Config config, - boolean useJackson) { - return initializeJsonLogging(config.file, config, useJackson); + JsonFactory jsonFactory) { + return initializeJsonLogging(config.file, config, jsonFactory); } public RuntimeValue> initializeJsonLogging(ConfigFormatter formatter, Config config, - boolean useJackson) { + JsonFactory jsonFactory) { if (formatter == null || !formatter.isEnabled()) { return new RuntimeValue<>(Optional.empty()); } @@ -64,15 +62,6 @@ public RuntimeValue> initializeJsonLogging(ConfigFormatter f log.debug("Installed json providers {}", installedProviders); } - JsonFactory jsonFactory; - if (useJackson) { - log.debug("Using Jackson as the json implementation"); - jsonFactory = new JacksonJsonFactory(); - } else { - log.debug("Using Jsonb as the json implementation"); - jsonFactory = new JsonbJsonFactory(); - } - return new RuntimeValue<>(Optional.of(new JsonFormatter(providers, jsonFactory, config))); } From d791cb74f084b75fa38ffaa745be063f4fe6f012 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 09:09:30 +0000 Subject: [PATCH 43/48] Bump io.quarkiverse:quarkiverse-parent from 15 to 16 Bumps [io.quarkiverse:quarkiverse-parent](https://github.com/quarkiverse/quarkiverse-parent) from 15 to 16. - [Release notes](https://github.com/quarkiverse/quarkiverse-parent/releases) - [Commits](https://github.com/quarkiverse/quarkiverse-parent/commits) --- updated-dependencies: - dependency-name: io.quarkiverse:quarkiverse-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e85a29b..26f9114 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse quarkiverse-parent - 15 + 16 io.quarkiverse.loggingjson From 33a60873a3b0d7f442d48442adbcd79fdac17436 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Fri, 5 Apr 2024 08:35:34 -0300 Subject: [PATCH 44/48] Update build.yml --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5da57b2..e1b75e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,16 +44,16 @@ jobs: run: git config --global core.autocrlf false if: startsWith(matrix.os, 'windows') - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 + java-version: 17 cache: 'maven' - name: Build with Maven run: mvn -B clean install -Dno-format - name: Build with Maven (Native) - run: mvn -B install -Dnative -Dquarkus.native.container-build -Dnative.surefire.skip \ No newline at end of file + run: mvn -B install -Dnative -Dquarkus.native.container-build -Dnative.surefire.skip From 66d948abb2b56162300a2c6acb1afcc323372a0e Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Tue, 14 May 2024 21:07:47 +0200 Subject: [PATCH 45/48] Release 3.1.0 --- .github/project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yml b/.github/project.yml index 5952845..4ff88fc 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,4 +1,4 @@ name: Quarkus Logging JSON release: - current-version: 3.0.0 - next-version: 3.0.1-SNAPSHOT + current-version: 3.1.0 + next-version: 3.1.1-SNAPSHOT From 4c146d6ab560e0692e201122ae80fadbe6473c54 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 14 May 2024 19:14:25 +0000 Subject: [PATCH 46/48] Update the latest release version 3.1.0 in documentation --- docs/modules/ROOT/pages/includes/attributes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc index 933165d..247d8b2 100644 --- a/docs/modules/ROOT/pages/includes/attributes.adoc +++ b/docs/modules/ROOT/pages/includes/attributes.adoc @@ -1,3 +1,3 @@ -:project-version: 3.0.0 +:project-version: 3.1.0 :examples-dir: ./../examples/ \ No newline at end of file From e770df15136f87834edb9ea46f3c935cb2b46365 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 14 May 2024 19:15:35 +0000 Subject: [PATCH 47/48] [maven-release-plugin] prepare release 3.1.0 --- deployment/pom.xml | 4 ++-- docs/pom.xml | 2 +- integration-tests/pom.xml | 2 +- pom.xml | 5 +++-- runtime/pom.xml | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index 35ef863..f20b30c 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 3.0.1-SNAPSHOT + 3.1.0 ../pom.xml @@ -23,7 +23,7 @@ io.quarkiverse.loggingjson quarkus-logging-json - 3.0.1-SNAPSHOT + 3.1.0 diff --git a/docs/pom.xml b/docs/pom.xml index 4db5a64..0356174 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 3.0.1-SNAPSHOT + 3.1.0 ../pom.xml diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 1907b15..3ff6450 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 3.0.1-SNAPSHOT + 3.1.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 26f9114..f1fd7b2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent Quarkus Logging JSON - Parent - 3.0.1-SNAPSHOT + 3.1.0 pom @@ -37,7 +37,8 @@ scm:git:git@github.com:quarkiverse/quarkus-logging-json.git scm:git:git@github.com:quarkiverse/quarkus-logging-json.git https://github.com/quarkiverse/quarkus-logging-json - + 3.1.0 + diff --git a/runtime/pom.xml b/runtime/pom.xml index 7eae1d5..8430259 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.loggingjson quarkus-logging-json-parent - 3.0.1-SNAPSHOT + 3.1.0 ../pom.xml From 99f8eaff71f6780536fa7f0bca903118665bea85 Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 7 May 2025 13:48:44 +0100 Subject: [PATCH 48/48] fix ecs format --- .../java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java b/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java index 395a88c..aa94fc3 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java @@ -41,8 +41,8 @@ public RuntimeValue> initializeJsonLogging(ConfigFormatter f if (config.logFormat == Config.LogFormat.ECS) { providers = ecsFormat(config); - } - if (config.logFormat == Config.LogFormat.GCP) { + } else if (config.logFormat == Config.LogFormat.GCP) { + new Exception("set to gcp format").printStackTrace(); providers = gcpFormat(config); } else { providers = defaultFormat(config);