From cd1fd82fbfa952cf1b018b9af4e4ea1c0f050a32 Mon Sep 17 00:00:00 2001 From: Nicolas Duvivier Date: Wed, 18 Sep 2024 11:14:24 +0200 Subject: [PATCH 01/18] feat(TimeOut): Enable the TimeOut Settings from HttpEventCollectorSender #284 --- .../includes/quarkus-log-handler-splunk.adoc | 89 +++++++++++++++++++ .../logging/splunk/SplunkHandlerConfig.java | 31 +++++++ .../splunk/SplunkLogHandlerRecorder.java | 12 ++- 3 files changed, 131 insertions(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/includes/quarkus-log-handler-splunk.adoc b/docs/modules/ROOT/pages/includes/quarkus-log-handler-splunk.adoc index f837fa1..bfbbe25 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-log-handler-splunk.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-log-handler-splunk.adoc @@ -927,6 +927,95 @@ endif::add-copy-button-to-env-var[] `block`, `discard` |`block` + +a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-connectTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-connectTimeout[quarkus.log.handler.splunk.connectTimeout]` + + +[.description] +-- +Sets the default connect timeout for new connections in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_CONNECTTIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_CONNECTTIMEOUT+++` +endif::add-copy-button-to-env-var[] +-- a| +long +|`3000` + + +a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-callTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-callTimeout[quarkus.log.handler.splunk.callTimeout]` + + +[.description] +-- +Sets the default timeout for complete calls in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_CALLTIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_CALLTIMEOUT+++` +endif::add-copy-button-to-env-var[] +-- a| +long +|`0` + + +a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-readTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-readTimeout[quarkus.log.handler.splunk.readTimeout]` + + +[.description] +-- +Sets the default read timeout for new connections in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_READTIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_READTIMEOUT+++` +endif::add-copy-button-to-env-var[] +-- a| +long +|`10000` + +a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-writeTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-writeTimeout[quarkus.log.handler.splunk.writeTimeout]` + + +[.description] +-- +Sets the default write timeout for new connections in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_WRITETIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_WRITETIMEOUT+++` +endif::add-copy-button-to-env-var[] +-- a| +long +|`10000` + + +a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-terminationTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-terminationTimeout[quarkus.log.handler.splunk.terminationTimeout]` + + +[.description] +-- +Sets the default termination timeout during a flush in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_TERMINATIONTIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_TERMINATIONTIMEOUT+++` +endif::add-copy-button-to-env-var[] +-- a| +long +|`0` + |=== ifndef::no-duration-note[] [NOTE] diff --git a/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkHandlerConfig.java b/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkHandlerConfig.java index edeb3aa..a3c41f9 100644 --- a/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkHandlerConfig.java +++ b/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkHandlerConfig.java @@ -10,6 +10,8 @@ import java.util.Optional; import java.util.logging.Level; +import com.splunk.logging.HttpEventCollectorSender; + import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigItem; @@ -230,4 +232,33 @@ public enum SerializationFormat { FLAT } + /** + * Sets the default connect timeout for new connections in milliseconds. + */ + @ConfigItem(defaultValue = "3000") + public long connectTimeout = HttpEventCollectorSender.TimeoutSettings.DEFAULT_CONNECT_TIMEOUT; + + /** + * Sets the default timeout for complete calls in milliseconds. + */ + @ConfigItem(defaultValue = "0") + public long callTimeout = HttpEventCollectorSender.TimeoutSettings.DEFAULT_CALL_TIMEOUT; + + /** + * Sets the default read timeout for new connections in milliseconds. + */ + @ConfigItem(defaultValue = "10000") + public long readTimeout = HttpEventCollectorSender.TimeoutSettings.DEFAULT_READ_TIMEOUT; + + /** + * Sets the default write timeout for new connections in milliseconds. + */ + @ConfigItem(defaultValue = "10000") + public long writeTimeout = HttpEventCollectorSender.TimeoutSettings.DEFAULT_WRITE_TIMEOUT; + + /** + * Sets the default termination timeout during a flush in milliseconds. + */ + @ConfigItem(defaultValue = "0") + public long terminationTimeout = HttpEventCollectorSender.TimeoutSettings.DEFAULT_TERMINATION_TIMEOUT; } diff --git a/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkLogHandlerRecorder.java b/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkLogHandlerRecorder.java index 30cbfd3..bc14eef 100644 --- a/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkLogHandlerRecorder.java +++ b/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkLogHandlerRecorder.java @@ -76,6 +76,16 @@ static HttpEventCollectorSender createSender(SplunkHandlerConfig config) { if (config.raw || config.serialization == SplunkHandlerConfig.SerializationFormat.RAW) { type = "Raw"; } + + HttpEventCollectorSender.TimeoutSettings rto = null; + if ((config.connectTimeout != HttpEventCollectorSender.TimeoutSettings.DEFAULT_CONNECT_TIMEOUT) + || (config.callTimeout != HttpEventCollectorSender.TimeoutSettings.DEFAULT_CALL_TIMEOUT) || + (config.readTimeout != HttpEventCollectorSender.TimeoutSettings.DEFAULT_READ_TIMEOUT) + || (config.writeTimeout != HttpEventCollectorSender.TimeoutSettings.DEFAULT_WRITE_TIMEOUT) || + (config.terminationTimeout != HttpEventCollectorSender.TimeoutSettings.DEFAULT_TERMINATION_TIMEOUT)) { + rto = new HttpEventCollectorSender.TimeoutSettings(config.connectTimeout, config.callTimeout, + config.readTimeout, config.writeTimeout, config.terminationTimeout); + } // Timeout settings is not used and passing a null is correct regarding the code HttpEventCollectorSender sender = new HttpEventCollectorSender( config.url, @@ -86,7 +96,7 @@ static HttpEventCollectorSender createSender(SplunkHandlerConfig config) { config.batchSizeCount, config.batchSizeBytes, config.sendMode.name().toLowerCase(), - buildMetadata(config), null); + buildMetadata(config), rto); if (config.serialization == SplunkHandlerConfig.SerializationFormat.FLAT) { SplunkFlatEventSerializer serializer = new SplunkFlatEventSerializer(config.metadataSeverityFieldName); sender.setEventHeaderSerializer(serializer); From 7d968477b3c5f5cb755484c62831e716108fa5c5 Mon Sep 17 00:00:00 2001 From: Nicolas Duvivier Date: Wed, 18 Sep 2024 11:14:24 +0200 Subject: [PATCH 02/18] feat(TimeOut): Enable the TimeOut Settings from HttpEventCollectorSender #284 --- .../includes/quarkus-log-handler-splunk.adoc | 92 ++++++++++++++++++- .../logging/splunk/SplunkHandlerConfig.java | 31 +++++++ .../splunk/SplunkLogHandlerRecorder.java | 12 ++- 3 files changed, 132 insertions(+), 3 deletions(-) diff --git a/docs/modules/ROOT/pages/includes/quarkus-log-handler-splunk.adoc b/docs/modules/ROOT/pages/includes/quarkus-log-handler-splunk.adoc index 6b0ddfc..ae08dac 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-log-handler-splunk.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-log-handler-splunk.adoc @@ -1065,6 +1065,95 @@ endif::add-copy-button-to-env-var[] `block`, `discard` |`block` + +a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-connectTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-connectTimeout[quarkus.log.handler.splunk.connectTimeout]` + + +[.description] +-- +Sets the default connect timeout for new connections in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_CONNECTTIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_CONNECTTIMEOUT+++` +endif::add-copy-button-to-env-var[] +-- a| +long +|`3000` + + +a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-callTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-callTimeout[quarkus.log.handler.splunk.callTimeout]` + + +[.description] +-- +Sets the default timeout for complete calls in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_CALLTIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_CALLTIMEOUT+++` +endif::add-copy-button-to-env-var[] +-- a| +long +|`0` + + +a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-readTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-readTimeout[quarkus.log.handler.splunk.readTimeout]` + + +[.description] +-- +Sets the default read timeout for new connections in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_READTIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_READTIMEOUT+++` +endif::add-copy-button-to-env-var[] +-- a| +long +|`10000` + +a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-writeTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-writeTimeout[quarkus.log.handler.splunk.writeTimeout]` + + +[.description] +-- +Sets the default write timeout for new connections in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_WRITETIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_WRITETIMEOUT+++` +endif::add-copy-button-to-env-var[] +-- a| +long +|`10000` + + +a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-terminationTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-terminationTimeout[quarkus.log.handler.splunk.terminationTimeout]` + + +[.description] +-- +Sets the default termination timeout during a flush in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_TERMINATIONTIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_TERMINATIONTIMEOUT+++` +endif::add-copy-button-to-env-var[] +-- a| +long +|`0` + |=== ifndef::no-duration-note[] [NOTE] @@ -1083,5 +1172,4 @@ In other cases, the simplified format is translated to the `java.time.Duration` * If the value is a number followed by `h`, `m`, or `s`, it is prefixed with `PT`. * If the value is a number followed by `d`, it is prefixed with `P`. -==== -endif::no-duration-note[] + diff --git a/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkHandlerConfig.java b/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkHandlerConfig.java index 0df1232..8b4d12f 100644 --- a/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkHandlerConfig.java +++ b/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkHandlerConfig.java @@ -11,6 +11,8 @@ import java.util.function.BooleanSupplier; import java.util.logging.Level; +import com.splunk.logging.HttpEventCollectorSender; + import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigItem; @@ -251,4 +253,33 @@ public enum SerializationFormat { FLAT } + /** + * Sets the default connect timeout for new connections in milliseconds. + */ + @ConfigItem(defaultValue = "3000") + public long connectTimeout = HttpEventCollectorSender.TimeoutSettings.DEFAULT_CONNECT_TIMEOUT; + + /** + * Sets the default timeout for complete calls in milliseconds. + */ + @ConfigItem(defaultValue = "0") + public long callTimeout = HttpEventCollectorSender.TimeoutSettings.DEFAULT_CALL_TIMEOUT; + + /** + * Sets the default read timeout for new connections in milliseconds. + */ + @ConfigItem(defaultValue = "10000") + public long readTimeout = HttpEventCollectorSender.TimeoutSettings.DEFAULT_READ_TIMEOUT; + + /** + * Sets the default write timeout for new connections in milliseconds. + */ + @ConfigItem(defaultValue = "10000") + public long writeTimeout = HttpEventCollectorSender.TimeoutSettings.DEFAULT_WRITE_TIMEOUT; + + /** + * Sets the default termination timeout during a flush in milliseconds. + */ + @ConfigItem(defaultValue = "0") + public long terminationTimeout = HttpEventCollectorSender.TimeoutSettings.DEFAULT_TERMINATION_TIMEOUT; } diff --git a/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkLogHandlerRecorder.java b/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkLogHandlerRecorder.java index dd5d556..9d7d591 100644 --- a/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkLogHandlerRecorder.java +++ b/runtime/src/main/java/io/quarkiverse/logging/splunk/SplunkLogHandlerRecorder.java @@ -83,6 +83,16 @@ static HttpEventCollectorSender createSender(SplunkHandlerConfig config) { if (config.raw || config.serialization == SplunkHandlerConfig.SerializationFormat.RAW) { type = "Raw"; } + + HttpEventCollectorSender.TimeoutSettings rto = null; + if ((config.connectTimeout != HttpEventCollectorSender.TimeoutSettings.DEFAULT_CONNECT_TIMEOUT) + || (config.callTimeout != HttpEventCollectorSender.TimeoutSettings.DEFAULT_CALL_TIMEOUT) || + (config.readTimeout != HttpEventCollectorSender.TimeoutSettings.DEFAULT_READ_TIMEOUT) + || (config.writeTimeout != HttpEventCollectorSender.TimeoutSettings.DEFAULT_WRITE_TIMEOUT) || + (config.terminationTimeout != HttpEventCollectorSender.TimeoutSettings.DEFAULT_TERMINATION_TIMEOUT)) { + rto = new HttpEventCollectorSender.TimeoutSettings(config.connectTimeout, config.callTimeout, + config.readTimeout, config.writeTimeout, config.terminationTimeout); + } // Timeout settings is not used and passing a null is correct regarding the code HttpEventCollectorSender sender = new HttpEventCollectorSender( config.url, @@ -93,7 +103,7 @@ static HttpEventCollectorSender createSender(SplunkHandlerConfig config) { config.batchSizeCount, config.batchSizeBytes, config.sendMode.name().toLowerCase(), - buildMetadata(config), null); + buildMetadata(config), rto); if (config.serialization == SplunkHandlerConfig.SerializationFormat.FLAT) { SplunkFlatEventSerializer serializer = new SplunkFlatEventSerializer(config.metadataSeverityFieldName); sender.setEventHeaderSerializer(serializer); From 7e206f53c498d7afda5dd1ae14799148be1d88bd Mon Sep 17 00:00:00 2001 From: edeweerd1A Date: Wed, 30 Oct 2024 14:20:47 +0100 Subject: [PATCH 03/18] chore(release): Release 3.3.1 --- .github/project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yml b/.github/project.yml index b1d6b07..6ac38aa 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,4 +1,4 @@ name: Quarkiverse Extension release: - current-version: 3.3.0 - next-version: 3.4.0-SNAPSHOT \ No newline at end of file + current-version: 3.3.1 + next-version: 3.4.0-SNAPSHOT From 50318c5c3d418b52aa3854da2c0309d37f990776 Mon Sep 17 00:00:00 2001 From: edeweerd1A Date: Wed, 30 Oct 2024 14:32:19 +0100 Subject: [PATCH 04/18] chore(release): release 3.2.1 --- .github/project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/project.yml b/.github/project.yml index e164e8d..24899ce 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,5 +1,5 @@ name: Quarkiverse Extension release: - current-version: 3.2.0 + current-version: 3.2.1 next-version: 3.3.0-SNAPSHOT From 39e874baf0920c2bc49c9a3c1035ff6d224aa7f9 Mon Sep 17 00:00:00 2001 From: edeweerd1A Date: Wed, 30 Oct 2024 17:56:55 +0100 Subject: [PATCH 05/18] chore(release): release 3.2.2 --- .github/project.yml | 4 ++-- deployment/pom.xml | 2 +- docs/pom.xml | 2 +- integration-test/pom.xml | 2 +- pom.xml | 2 +- runtime/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/project.yml b/.github/project.yml index 24899ce..23ab6bc 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,5 +1,5 @@ name: Quarkiverse Extension release: - current-version: 3.2.1 - next-version: 3.3.0-SNAPSHOT + current-version: 3.2.2 + next-version: 3.2.0-SNAPSHOT diff --git a/deployment/pom.xml b/deployment/pom.xml index 57811a3..e8e7ed2 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docs/pom.xml b/docs/pom.xml index 0a95b52..ec8c15d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 4c63db8..8a9a629 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -3,7 +3,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0 + 3.2.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 7b2a0c5..ccc57cc 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0 + 3.2.0-SNAPSHOT Splunk logging extension - Parent Send logs to a Splunk HTTP Event Collector (HEC) pom diff --git a/runtime/pom.xml b/runtime/pom.xml index 197e903..1365ce4 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0 + 3.2.0-SNAPSHOT ../pom.xml From 5e67a5ea5684057fdadfc1b7452e64bf1f12b6e1 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Tue, 15 Oct 2024 23:33:23 -0300 Subject: [PATCH 06/18] Split and Reuse the Release workflow --- .github/workflows/pre-release.yml | 25 +++------- .github/workflows/release-perform.yml | 18 +++++++ .github/workflows/release-prepare.yml | 28 +++++++++++ .github/workflows/release.yml | 70 --------------------------- 4 files changed, 54 insertions(+), 87 deletions(-) create mode 100644 .github/workflows/release-perform.yml create mode 100644 .github/workflows/release-prepare.yml delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 63d9d0f..afe17b3 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -5,21 +5,12 @@ on: paths: - '.github/project.yml' -jobs: - release: - runs-on: ubuntu-latest - name: pre release - - steps: - - uses: radcortez/project-metadata-action@master - name: retrieve project metadata - id: metadata - with: - github-token: ${{secrets.GITHUB_TOKEN}} - metadata-file-path: '.github/project.yml' +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true - - name: Validate version - if: contains(steps.metadata.outputs.current-version, 'SNAPSHOT') - run: | - echo '::error::Cannot release a SNAPSHOT version.' - exit 1 \ No newline at end of file +jobs: + pre-release: + name: Pre-Release + uses: quarkiverse/.github/.github/workflows/pre-release.yml@main + secrets: inherit diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml new file mode 100644 index 0000000..aedad93 --- /dev/null +++ b/.github/workflows/release-perform.yml @@ -0,0 +1,18 @@ +name: Quarkiverse Prepare Release + +on: + pull_request: + types: [ closed ] + paths: + - '.github/project.yml' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + prepare-release: + name: Prepare Release + if: ${{ github.event.pull_request.merged == true}} + uses: quarkiverse/.github/.github/workflows/prepare-release.yml@main + secrets: inherit diff --git a/.github/workflows/release-prepare.yml b/.github/workflows/release-prepare.yml new file mode 100644 index 0000000..88f9437 --- /dev/null +++ b/.github/workflows/release-prepare.yml @@ -0,0 +1,28 @@ +name: Quarkiverse Perform Release +run-name: Perform ${{github.event.inputs.tag || github.ref_name}} Release +on: + push: + tags: + - '*' + workflow_dispatch: + inputs: + tag: + description: 'Tag to release' + required: true + +permissions: + attestations: write + id-token: write + contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + perform-release: + name: Perform Release + uses: quarkiverse/.github/.github/workflows/perform-release.yml@main + secrets: inherit + with: + version: ${{github.event.inputs.tag || github.ref_name}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 6cf892d..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,70 +0,0 @@ -name: Quarkiverse Release - -on: - pull_request: - types: [closed] - paths: - - '.github/project.yml' - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -defaults: - run: - shell: bash - -jobs: - release: - runs-on: ubuntu-latest - name: release - if: ${{github.event.pull_request.merged == true}} - - steps: - - 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@v4 - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 17 - cache: 'maven' - 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: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - - - name: Update latest release version in docs - run: | - 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 the latest release version ${{steps.metadata.outputs.current-version}} in documentation" - fi - - - name: Maven release ${{steps.metadata.outputs.current-version}} - run: | - 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 }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - - - name: Push changes to ${{github.base_ref}} branch - run: | - git push - git push origin ${{steps.metadata.outputs.current-version}} From 8ff601a0f081fa95011202fdde0e61e8b7849dfe Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Wed, 16 Oct 2024 10:52:10 -0300 Subject: [PATCH 07/18] Update file names --- .github/workflows/release-perform.yml | 30 ++++++++++++++++++--------- .github/workflows/release-prepare.yml | 30 +++++++++------------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml index aedad93..88f9437 100644 --- a/.github/workflows/release-perform.yml +++ b/.github/workflows/release-perform.yml @@ -1,18 +1,28 @@ -name: Quarkiverse Prepare Release - +name: Quarkiverse Perform Release +run-name: Perform ${{github.event.inputs.tag || github.ref_name}} Release on: - pull_request: - types: [ closed ] - paths: - - '.github/project.yml' + push: + tags: + - '*' + workflow_dispatch: + inputs: + tag: + description: 'Tag to release' + required: true + +permissions: + attestations: write + id-token: write + contents: read concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: - prepare-release: - name: Prepare Release - if: ${{ github.event.pull_request.merged == true}} - uses: quarkiverse/.github/.github/workflows/prepare-release.yml@main + perform-release: + name: Perform Release + uses: quarkiverse/.github/.github/workflows/perform-release.yml@main secrets: inherit + with: + version: ${{github.event.inputs.tag || github.ref_name}} diff --git a/.github/workflows/release-prepare.yml b/.github/workflows/release-prepare.yml index 88f9437..aedad93 100644 --- a/.github/workflows/release-prepare.yml +++ b/.github/workflows/release-prepare.yml @@ -1,28 +1,18 @@ -name: Quarkiverse Perform Release -run-name: Perform ${{github.event.inputs.tag || github.ref_name}} Release -on: - push: - tags: - - '*' - workflow_dispatch: - inputs: - tag: - description: 'Tag to release' - required: true +name: Quarkiverse Prepare Release -permissions: - attestations: write - id-token: write - contents: read +on: + pull_request: + types: [ closed ] + paths: + - '.github/project.yml' concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: - perform-release: - name: Perform Release - uses: quarkiverse/.github/.github/workflows/perform-release.yml@main + prepare-release: + name: Prepare Release + if: ${{ github.event.pull_request.merged == true}} + uses: quarkiverse/.github/.github/workflows/prepare-release.yml@main secrets: inherit - with: - version: ${{github.event.inputs.tag || github.ref_name}} From e68c6de903dbd22f4263a5fe2e5bfc1931d091c1 Mon Sep 17 00:00:00 2001 From: "quarkiverse-ci[bot]" <181291436+quarkiverse-ci[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:15:01 +0000 Subject: [PATCH 08/18] Update the latest release version 3.2.2 in documentation --- .../ROOT/pages/includes/attributes.adoc | 2 +- .../includes/quarkus-log-handler-splunk.adoc | 131 ++++++++++++++---- 2 files changed, 107 insertions(+), 26 deletions(-) diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc index b43ea06..54664ff 100644 --- a/docs/modules/ROOT/pages/includes/attributes.adoc +++ b/docs/modules/ROOT/pages/includes/attributes.adoc @@ -1,3 +1,3 @@ -:project-version: 3.2.0 +:project-version: 3.2.2 :examples-dir: ./../examples/ \ No newline at end of file diff --git a/docs/modules/ROOT/pages/includes/quarkus-log-handler-splunk.adoc b/docs/modules/ROOT/pages/includes/quarkus-log-handler-splunk.adoc index bfbbe25..62bd08b 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-log-handler-splunk.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-log-handler-splunk.adoc @@ -452,6 +452,91 @@ endif::add-copy-button-to-env-var[] |`block` +a| [[quarkus-log-handler-splunk_quarkus.log.handler.splunk.connect-timeout]]`link:#quarkus-log-handler-splunk_quarkus.log.handler.splunk.connect-timeout[quarkus.log.handler.splunk.connect-timeout]` + + +[.description] +-- +Sets the default connect timeout for new connections in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_CONNECT_TIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_CONNECT_TIMEOUT+++` +endif::add-copy-button-to-env-var[] +--|long +|`3000` + + +a| [[quarkus-log-handler-splunk_quarkus.log.handler.splunk.call-timeout]]`link:#quarkus-log-handler-splunk_quarkus.log.handler.splunk.call-timeout[quarkus.log.handler.splunk.call-timeout]` + + +[.description] +-- +Sets the default timeout for complete calls in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_CALL_TIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_CALL_TIMEOUT+++` +endif::add-copy-button-to-env-var[] +--|long +|`0` + + +a| [[quarkus-log-handler-splunk_quarkus.log.handler.splunk.read-timeout]]`link:#quarkus-log-handler-splunk_quarkus.log.handler.splunk.read-timeout[quarkus.log.handler.splunk.read-timeout]` + + +[.description] +-- +Sets the default read timeout for new connections in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_READ_TIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_READ_TIMEOUT+++` +endif::add-copy-button-to-env-var[] +--|long +|`10000` + + +a| [[quarkus-log-handler-splunk_quarkus.log.handler.splunk.write-timeout]]`link:#quarkus-log-handler-splunk_quarkus.log.handler.splunk.write-timeout[quarkus.log.handler.splunk.write-timeout]` + + +[.description] +-- +Sets the default write timeout for new connections in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_WRITE_TIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_WRITE_TIMEOUT+++` +endif::add-copy-button-to-env-var[] +--|long +|`10000` + + +a| [[quarkus-log-handler-splunk_quarkus.log.handler.splunk.termination-timeout]]`link:#quarkus-log-handler-splunk_quarkus.log.handler.splunk.termination-timeout[quarkus.log.handler.splunk.termination-timeout]` + + +[.description] +-- +Sets the default termination timeout during a flush in milliseconds. + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_TERMINATION_TIMEOUT+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_TERMINATION_TIMEOUT+++` +endif::add-copy-button-to-env-var[] +--|long +|`0` + + a| [[quarkus-log-handler-splunk_quarkus.log.handler.splunk.metadata-fields-metadata-fields]]`link:#quarkus-log-handler-splunk_quarkus.log.handler.splunk.metadata-fields-metadata-fields[quarkus.log.handler.splunk.metadata-fields]` @@ -928,7 +1013,7 @@ endif::add-copy-button-to-env-var[] |`block` -a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-connectTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-connectTimeout[quarkus.log.handler.splunk.connectTimeout]` +a| [[quarkus-log-handler-splunk_quarkus.log.handler.splunk.-named-handlers-.connect-timeout]]`link:#quarkus-log-handler-splunk_quarkus.log.handler.splunk.-named-handlers-.connect-timeout[quarkus.log.handler.splunk."named-handlers".connect-timeout]` [.description] @@ -936,17 +1021,16 @@ a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-connectTimeout]]`link Sets the default connect timeout for new connections in milliseconds. ifdef::add-copy-button-to-env-var[] -Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_CONNECTTIMEOUT+++[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK__NAMED_HANDLERS__CONNECT_TIMEOUT+++[] endif::add-copy-button-to-env-var[] ifndef::add-copy-button-to-env-var[] -Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_CONNECTTIMEOUT+++` +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK__NAMED_HANDLERS__CONNECT_TIMEOUT+++` endif::add-copy-button-to-env-var[] --- a| -long +--|long |`3000` -a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-callTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-callTimeout[quarkus.log.handler.splunk.callTimeout]` +a| [[quarkus-log-handler-splunk_quarkus.log.handler.splunk.-named-handlers-.call-timeout]]`link:#quarkus-log-handler-splunk_quarkus.log.handler.splunk.-named-handlers-.call-timeout[quarkus.log.handler.splunk."named-handlers".call-timeout]` [.description] @@ -954,17 +1038,16 @@ a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-callTimeout]]`link:#q Sets the default timeout for complete calls in milliseconds. ifdef::add-copy-button-to-env-var[] -Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_CALLTIMEOUT+++[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK__NAMED_HANDLERS__CALL_TIMEOUT+++[] endif::add-copy-button-to-env-var[] ifndef::add-copy-button-to-env-var[] -Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_CALLTIMEOUT+++` +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK__NAMED_HANDLERS__CALL_TIMEOUT+++` endif::add-copy-button-to-env-var[] --- a| -long +--|long |`0` -a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-readTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-readTimeout[quarkus.log.handler.splunk.readTimeout]` +a| [[quarkus-log-handler-splunk_quarkus.log.handler.splunk.-named-handlers-.read-timeout]]`link:#quarkus-log-handler-splunk_quarkus.log.handler.splunk.-named-handlers-.read-timeout[quarkus.log.handler.splunk."named-handlers".read-timeout]` [.description] @@ -972,16 +1055,16 @@ a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-readTimeout]]`link:#q Sets the default read timeout for new connections in milliseconds. ifdef::add-copy-button-to-env-var[] -Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_READTIMEOUT+++[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK__NAMED_HANDLERS__READ_TIMEOUT+++[] endif::add-copy-button-to-env-var[] ifndef::add-copy-button-to-env-var[] -Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_READTIMEOUT+++` +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK__NAMED_HANDLERS__READ_TIMEOUT+++` endif::add-copy-button-to-env-var[] --- a| -long +--|long |`10000` -a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-writeTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-writeTimeout[quarkus.log.handler.splunk.writeTimeout]` + +a| [[quarkus-log-handler-splunk_quarkus.log.handler.splunk.-named-handlers-.write-timeout]]`link:#quarkus-log-handler-splunk_quarkus.log.handler.splunk.-named-handlers-.write-timeout[quarkus.log.handler.splunk."named-handlers".write-timeout]` [.description] @@ -989,17 +1072,16 @@ a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-writeTimeout]]`link:# Sets the default write timeout for new connections in milliseconds. ifdef::add-copy-button-to-env-var[] -Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_WRITETIMEOUT+++[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK__NAMED_HANDLERS__WRITE_TIMEOUT+++[] endif::add-copy-button-to-env-var[] ifndef::add-copy-button-to-env-var[] -Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_WRITETIMEOUT+++` +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK__NAMED_HANDLERS__WRITE_TIMEOUT+++` endif::add-copy-button-to-env-var[] --- a| -long +--|long |`10000` -a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-terminationTimeout]]`link:#quarkus-log-handler-splunk_quarkus-log-handler-splunk-terminationTimeout[quarkus.log.handler.splunk.terminationTimeout]` +a| [[quarkus-log-handler-splunk_quarkus.log.handler.splunk.-named-handlers-.termination-timeout]]`link:#quarkus-log-handler-splunk_quarkus.log.handler.splunk.-named-handlers-.termination-timeout[quarkus.log.handler.splunk."named-handlers".termination-timeout]` [.description] @@ -1007,13 +1089,12 @@ a| [[quarkus-log-handler-splunk_quarkus-log-handler-splunk-terminationTimeout]]` Sets the default termination timeout during a flush in milliseconds. ifdef::add-copy-button-to-env-var[] -Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK_TERMINATIONTIMEOUT+++[] +Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_HANDLER_SPLUNK__NAMED_HANDLERS__TERMINATION_TIMEOUT+++[] endif::add-copy-button-to-env-var[] ifndef::add-copy-button-to-env-var[] -Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK_TERMINATIONTIMEOUT+++` +Environment variable: `+++QUARKUS_LOG_HANDLER_SPLUNK__NAMED_HANDLERS__TERMINATION_TIMEOUT+++` endif::add-copy-button-to-env-var[] --- a| -long +--|long |`0` |=== From cebeca4caaa0b6dbd9b648f04ce03b09cc2c37cf Mon Sep 17 00:00:00 2001 From: "quarkiverse-ci[bot]" <181291436+quarkiverse-ci[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:17:28 +0000 Subject: [PATCH 09/18] [maven-release-plugin] prepare release 3.2.2 --- deployment/pom.xml | 2 +- docs/pom.xml | 2 +- integration-test/pom.xml | 2 +- pom.xml | 4 ++-- runtime/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index e8e7ed2..a2253ec 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0-SNAPSHOT + 3.2.2 ../pom.xml diff --git a/docs/pom.xml b/docs/pom.xml index ec8c15d..5b08d2f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0-SNAPSHOT + 3.2.2 ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 8a9a629..3a18a16 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -3,7 +3,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0-SNAPSHOT + 3.2.2 4.0.0 diff --git a/pom.xml b/pom.xml index ccc57cc..f6b8e91 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0-SNAPSHOT + 3.2.2 Splunk logging extension - Parent Send logs to a Splunk HTTP Event Collector (HEC) pom @@ -47,7 +47,7 @@ scm:git:git@github.com:quarkiverse/quarkus-logging-splunk.git scm:git:git@github.com:quarkiverse/quarkus-logging-splunk.git https://github.com/quarkiverse/quarkus-logging-splunk - 3.2.0 + 3.2.2 runtime diff --git a/runtime/pom.xml b/runtime/pom.xml index 1365ce4..0f32f44 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0-SNAPSHOT + 3.2.2 ../pom.xml From 2724a87369a2d751085569282507f5465f6c7b0b Mon Sep 17 00:00:00 2001 From: "quarkiverse-ci[bot]" <181291436+quarkiverse-ci[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:17:28 +0000 Subject: [PATCH 10/18] [maven-release-plugin] prepare for next development iteration --- deployment/pom.xml | 2 +- docs/pom.xml | 2 +- integration-test/pom.xml | 2 +- pom.xml | 4 ++-- runtime/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index a2253ec..e8e7ed2 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.2 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docs/pom.xml b/docs/pom.xml index 5b08d2f..ec8c15d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.2 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 3a18a16..8a9a629 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -3,7 +3,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.2 + 3.2.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index f6b8e91..ccc57cc 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.2 + 3.2.0-SNAPSHOT Splunk logging extension - Parent Send logs to a Splunk HTTP Event Collector (HEC) pom @@ -47,7 +47,7 @@ scm:git:git@github.com:quarkiverse/quarkus-logging-splunk.git scm:git:git@github.com:quarkiverse/quarkus-logging-splunk.git https://github.com/quarkiverse/quarkus-logging-splunk - 3.2.2 + 3.2.0 runtime diff --git a/runtime/pom.xml b/runtime/pom.xml index 0f32f44..1365ce4 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.2 + 3.2.0-SNAPSHOT ../pom.xml From 8b264b50f1cc2dcf7ea43905483938f209cf2a87 Mon Sep 17 00:00:00 2001 From: edeweerd1A Date: Wed, 30 Oct 2024 18:38:15 +0100 Subject: [PATCH 11/18] chore(release): release 3.2.3 --- .github/project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/project.yml b/.github/project.yml index 23ab6bc..bdf25d3 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,5 +1,5 @@ name: Quarkiverse Extension release: - current-version: 3.2.2 + current-version: 3.2.3 next-version: 3.2.0-SNAPSHOT From dfee5189576c54cfe661654ecf0fb3f844e9837b Mon Sep 17 00:00:00 2001 From: edeweerd1A Date: Wed, 30 Oct 2024 18:46:57 +0100 Subject: [PATCH 12/18] chore(pom): Update to quarkiverse-parent 18 --- pom.xml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ccc57cc..5d33d9e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse quarkiverse-parent - 16 + 18 io.quarkiverse.logging.splunk quarkus-logging-splunk-parent @@ -52,8 +52,6 @@ runtime deployment - integration-test - docs @@ -151,4 +149,19 @@ + + + docs + + + performRelease + !true + + + + docs + integration-test + + + From f815e8a02876801c60949655359cf5bd9155576d Mon Sep 17 00:00:00 2001 From: edeweerd1A Date: Thu, 31 Oct 2024 11:01:16 +0100 Subject: [PATCH 13/18] fix(pom): Fix exclusion condition of not-to-release profile --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 5d33d9e..c16b3e4 100644 --- a/pom.xml +++ b/pom.xml @@ -151,11 +151,10 @@ - docs + not-to-release - performRelease - !true + !performRelease From 7134d7b4dbf78f1500db91a84d6ac02f0a9c2b55 Mon Sep 17 00:00:00 2001 From: "quarkiverse-ci[bot]" <181291436+quarkiverse-ci[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:17:00 +0000 Subject: [PATCH 14/18] Update the latest release version 3.2.3 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 54664ff..b584516 100644 --- a/docs/modules/ROOT/pages/includes/attributes.adoc +++ b/docs/modules/ROOT/pages/includes/attributes.adoc @@ -1,3 +1,3 @@ -:project-version: 3.2.2 +:project-version: 3.2.3 :examples-dir: ./../examples/ \ No newline at end of file From 075716e945fcfd6cc3c84233b82c1d6107364090 Mon Sep 17 00:00:00 2001 From: "quarkiverse-ci[bot]" <181291436+quarkiverse-ci[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:19:26 +0000 Subject: [PATCH 15/18] [maven-release-plugin] prepare release 3.2.3 --- deployment/pom.xml | 2 +- docs/pom.xml | 2 +- integration-test/pom.xml | 2 +- pom.xml | 4 ++-- runtime/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index e8e7ed2..14eb804 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0-SNAPSHOT + 3.2.3 ../pom.xml diff --git a/docs/pom.xml b/docs/pom.xml index ec8c15d..7ccac2b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0-SNAPSHOT + 3.2.3 ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 8a9a629..0fdf3c1 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -3,7 +3,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0-SNAPSHOT + 3.2.3 4.0.0 diff --git a/pom.xml b/pom.xml index c16b3e4..25746e1 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0-SNAPSHOT + 3.2.3 Splunk logging extension - Parent Send logs to a Splunk HTTP Event Collector (HEC) pom @@ -47,7 +47,7 @@ scm:git:git@github.com:quarkiverse/quarkus-logging-splunk.git scm:git:git@github.com:quarkiverse/quarkus-logging-splunk.git https://github.com/quarkiverse/quarkus-logging-splunk - 3.2.0 + 3.2.3 runtime diff --git a/runtime/pom.xml b/runtime/pom.xml index 1365ce4..94476c7 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.0-SNAPSHOT + 3.2.3 ../pom.xml From 964f3e2d80d61807a16bfaa95bf2caafc17c827b Mon Sep 17 00:00:00 2001 From: "quarkiverse-ci[bot]" <181291436+quarkiverse-ci[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:19:26 +0000 Subject: [PATCH 16/18] [maven-release-plugin] prepare for next development iteration --- deployment/pom.xml | 2 +- docs/pom.xml | 2 +- integration-test/pom.xml | 2 +- pom.xml | 4 ++-- runtime/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index 14eb804..e8e7ed2 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.3 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docs/pom.xml b/docs/pom.xml index 7ccac2b..ec8c15d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.3 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 0fdf3c1..8a9a629 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -3,7 +3,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.3 + 3.2.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 25746e1..c16b3e4 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.3 + 3.2.0-SNAPSHOT Splunk logging extension - Parent Send logs to a Splunk HTTP Event Collector (HEC) pom @@ -47,7 +47,7 @@ scm:git:git@github.com:quarkiverse/quarkus-logging-splunk.git scm:git:git@github.com:quarkiverse/quarkus-logging-splunk.git https://github.com/quarkiverse/quarkus-logging-splunk - 3.2.3 + 3.2.0 runtime diff --git a/runtime/pom.xml b/runtime/pom.xml index 94476c7..1365ce4 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.2.3 + 3.2.0-SNAPSHOT ../pom.xml From 45f04a505e1ecc3f4db4060a8dbcc512aeab82ec Mon Sep 17 00:00:00 2001 From: edeweerd1A Date: Thu, 31 Oct 2024 11:44:13 +0100 Subject: [PATCH 17/18] chore(release): release 3.3.2 Also merge rhbq/3.2 for cascading. And set version everywhere from 3.4.0-SNAPSHOT to 3.3.0-SNAPSHOT for coherence. --- .github/project.yml | 4 ++-- deployment/pom.xml | 2 +- docs/pom.xml | 2 +- integration-test/pom.xml | 2 +- pom.xml | 2 +- runtime/pom.xml | 2 +- test-utils/pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/project.yml b/.github/project.yml index 6ac38aa..d7a49f0 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,4 +1,4 @@ name: Quarkiverse Extension release: - current-version: 3.3.1 - next-version: 3.4.0-SNAPSHOT + current-version: 3.3.2 + next-version: 3.3.0-SNAPSHOT diff --git a/deployment/pom.xml b/deployment/pom.xml index a05eed7..3c4fc12 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.4.0-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml diff --git a/docs/pom.xml b/docs/pom.xml index 2f3e69e..e569261 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.4.0-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index f1c84b0..486a113 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -3,7 +3,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.4.0-SNAPSHOT + 3.3.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 047a979..4f6f52c 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.4.0-SNAPSHOT + 3.3.0-SNAPSHOT Splunk logging extension - Parent Send logs to a Splunk HTTP Event Collector (HEC) pom diff --git a/runtime/pom.xml b/runtime/pom.xml index 7c22ef2..d534cbf 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.4.0-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml diff --git a/test-utils/pom.xml b/test-utils/pom.xml index 471a21d..375feb2 100644 --- a/test-utils/pom.xml +++ b/test-utils/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.logging.splunk quarkus-logging-splunk-parent - 3.4.0-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml From f269531201ca65b895cbd735b0fe25d699fb73a6 Mon Sep 17 00:00:00 2001 From: edeweerd1A Date: Thu, 31 Oct 2024 11:47:18 +0100 Subject: [PATCH 18/18] fix(test-utils): Fix formatting of LoggingSplunkInjectingTestResourceTest --- ...oggingSplunkInjectingTestResourceTest.java | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/test-utils/src/test/java/io/quarkiverse/logging/splunk/test/LoggingSplunkInjectingTestResourceTest.java b/test-utils/src/test/java/io/quarkiverse/logging/splunk/test/LoggingSplunkInjectingTestResourceTest.java index e3b0e3b..5664146 100644 --- a/test-utils/src/test/java/io/quarkiverse/logging/splunk/test/LoggingSplunkInjectingTestResourceTest.java +++ b/test-utils/src/test/java/io/quarkiverse/logging/splunk/test/LoggingSplunkInjectingTestResourceTest.java @@ -22,10 +22,10 @@ class LoggingSplunkInjectingTestResourceTest { LoggingSplunkInjectingTestResource resource = new LoggingSplunkInjectingTestResource(); - @BeforeEach - void setUp() { - when(context.devServicesProperties()).thenReturn(Map.of()); - } + @BeforeEach + void setUp() { + when(context.devServicesProperties()).thenReturn(Map.of()); + } @Test void disabled() { @@ -38,31 +38,31 @@ void disabled() { assertThat(testInstance.splunkHandlerUrl, nullValue()); } - @Test - void enabled() { - when(context.devServicesProperties()).thenReturn(Map.of("quarkus.log.handler.splunk.url", - "http://localhost:8088", "quarkus.log.handler.splunk.devservices.api-url", "http://localhost:8089")); - FieldWithAnnotation testInstance = new FieldWithAnnotation(); + @Test + void enabled() { + when(context.devServicesProperties()).thenReturn(Map.of("quarkus.log.handler.splunk.url", + "http://localhost:8088", "quarkus.log.handler.splunk.devservices.api-url", "http://localhost:8089")); + FieldWithAnnotation testInstance = new FieldWithAnnotation(); - resource.setIntegrationTestContext(context); - resource.inject(testInstance); + resource.setIntegrationTestContext(context); + resource.inject(testInstance); - assertThat(testInstance.splunkApiUrl, equalTo("http://localhost:8089")); - assertThat(testInstance.splunkHandlerUrl, equalTo("http://localhost:8088")); - } + assertThat(testInstance.splunkApiUrl, equalTo("http://localhost:8089")); + assertThat(testInstance.splunkHandlerUrl, equalTo("http://localhost:8088")); + } - @Test - void noAnnotationORWrongType() { - when(context.devServicesProperties()).thenReturn(Map.of("quarkus.log.handler.splunk.url", - "http://localhost:8088", "quarkus.log.handler.splunk.devservices.api-url", "http://localhost:8089")); - FieldWithNoAnnotation testInstance = new FieldWithNoAnnotation(); + @Test + void noAnnotationORWrongType() { + when(context.devServicesProperties()).thenReturn(Map.of("quarkus.log.handler.splunk.url", + "http://localhost:8088", "quarkus.log.handler.splunk.devservices.api-url", "http://localhost:8089")); + FieldWithNoAnnotation testInstance = new FieldWithNoAnnotation(); - resource.setIntegrationTestContext(context); - resource.inject(testInstance); + resource.setIntegrationTestContext(context); + resource.inject(testInstance); - assertThat(testInstance.splunkApiUrl, nullValue()); - assertThat(testInstance.splunkHandlerUrl, nullValue()); - } + assertThat(testInstance.splunkApiUrl, nullValue()); + assertThat(testInstance.splunkHandlerUrl, nullValue()); + } public static class NoFields {