From 7756987f17e366fd716ee3a4f30fe8a0bdd93040 Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Tue, 8 Oct 2024 17:44:49 +0530 Subject: [PATCH 01/12] Quarkus version upgrade to 3.8.6 --- .quarkus/cli/plugins/quarkus-cli-catalog.json | 5 +++++ .../ROOT/pages/includes/quarkus-solace.adoc | 20 +++++++++---------- pom.xml | 2 +- .../tracing/SolaceAttributeExtractor.java | 8 ++++---- .../SolaceOpenTelemetryInstrumenter.java | 2 +- 5 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 .quarkus/cli/plugins/quarkus-cli-catalog.json diff --git a/.quarkus/cli/plugins/quarkus-cli-catalog.json b/.quarkus/cli/plugins/quarkus-cli-catalog.json new file mode 100644 index 0000000..c86258b --- /dev/null +++ b/.quarkus/cli/plugins/quarkus-cli-catalog.json @@ -0,0 +1,5 @@ +{ + "version" : "v1", + "lastUpdate" : "08/10/2024 17:28:52", + "plugins" : { } +} \ No newline at end of file diff --git a/docs/modules/ROOT/pages/includes/quarkus-solace.adoc b/docs/modules/ROOT/pages/includes/quarkus-solace.adoc index b5eedf9..b141586 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-solace.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-solace.adoc @@ -10,7 +10,7 @@ h|[[quarkus-solace_configuration]]link:#quarkus-solace_configuration[Configurati h|Type h|Default -a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.metrics.enabled]]`link:#quarkus-solace_quarkus.solace.metrics.enabled[quarkus.solace.metrics.enabled]` +a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-metrics-enabled]]`link:#quarkus-solace_quarkus-solace-metrics-enabled[quarkus.solace.metrics.enabled]` [.description] @@ -27,7 +27,7 @@ endif::add-copy-button-to-env-var[] |`true` -a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.health.enabled]]`link:#quarkus-solace_quarkus.solace.health.enabled[quarkus.solace.health.enabled]` +a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-health-enabled]]`link:#quarkus-solace_quarkus-solace-health-enabled[quarkus.solace.health.enabled]` [.description] @@ -44,7 +44,7 @@ endif::add-copy-button-to-env-var[] |`true` -a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.devservices.enabled]]`link:#quarkus-solace_quarkus.solace.devservices.enabled[quarkus.solace.devservices.enabled]` +a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-devservices-enabled]]`link:#quarkus-solace_quarkus-solace-devservices-enabled[quarkus.solace.devservices.enabled]` [.description] @@ -63,7 +63,7 @@ endif::add-copy-button-to-env-var[] |`true` -a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.devservices.image-name]]`link:#quarkus-solace_quarkus.solace.devservices.image-name[quarkus.solace.devservices.image-name]` +a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-devservices-image-name]]`link:#quarkus-solace_quarkus-solace-devservices-image-name[quarkus.solace.devservices.image-name]` [.description] @@ -80,7 +80,7 @@ endif::add-copy-button-to-env-var[] | -a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.devservices.shared]]`link:#quarkus-solace_quarkus.solace.devservices.shared[quarkus.solace.devservices.shared]` +a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-devservices-shared]]`link:#quarkus-solace_quarkus-solace-devservices-shared[quarkus.solace.devservices.shared]` [.description] @@ -101,7 +101,7 @@ endif::add-copy-button-to-env-var[] |`true` -a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.devservices.service-name]]`link:#quarkus-solace_quarkus.solace.devservices.service-name[quarkus.solace.devservices.service-name]` +a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-devservices-service-name]]`link:#quarkus-solace_quarkus-solace-devservices-service-name[quarkus.solace.devservices.service-name]` [.description] @@ -120,7 +120,7 @@ endif::add-copy-button-to-env-var[] |`solace` -a| [[quarkus-solace_quarkus.solace.host]]`link:#quarkus-solace_quarkus.solace.host[quarkus.solace.host]` +a| [[quarkus-solace_quarkus-solace-host]]`link:#quarkus-solace_quarkus-solace-host[quarkus.solace.host]` [.description] @@ -137,7 +137,7 @@ endif::add-copy-button-to-env-var[] |required icon:exclamation-circle[title=Configuration property is required] -a| [[quarkus-solace_quarkus.solace.vpn]]`link:#quarkus-solace_quarkus.solace.vpn[quarkus.solace.vpn]` +a| [[quarkus-solace_quarkus-solace-vpn]]`link:#quarkus-solace_quarkus-solace-vpn[quarkus.solace.vpn]` [.description] @@ -154,7 +154,7 @@ endif::add-copy-button-to-env-var[] |required icon:exclamation-circle[title=Configuration property is required] -a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.devservices.container-env-container-env]]`link:#quarkus-solace_quarkus.solace.devservices.container-env-container-env[quarkus.solace.devservices.container-env]` +a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-devservices-container-env-container-env]]`link:#quarkus-solace_quarkus-solace-devservices-container-env-container-env[quarkus.solace.devservices.container-env]` [.description] @@ -171,7 +171,7 @@ endif::add-copy-button-to-env-var[] | -a| [[quarkus-solace_quarkus.solace-extra]]`link:#quarkus-solace_quarkus.solace-extra[quarkus.solace]` +a| [[quarkus-solace_quarkus-solace-extra]]`link:#quarkus-solace_quarkus-solace-extra[quarkus.solace]` [.description] diff --git a/pom.xml b/pom.xml index bbf1a9f..17024d6 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 11 UTF-8 UTF-8 - 3.2.8.Final + 3.8.6 1.4.0 diff --git a/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/tracing/SolaceAttributeExtractor.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/tracing/SolaceAttributeExtractor.java index 0b4428c..6ac78bd 100644 --- a/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/tracing/SolaceAttributeExtractor.java +++ b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/tracing/SolaceAttributeExtractor.java @@ -33,10 +33,10 @@ public String getSystem(final SolaceTrace solaceTrace) { return "SolacePubSub+"; } - @Override - public String getDestinationKind(SolaceTrace solaceTrace) { - return solaceTrace.getDestinationKind(); - } + // @Override + // public String getDestinationKind(SolaceTrace solaceTrace) { + // return solaceTrace.getDestinationKind(); + // } @Override public String getDestination(final SolaceTrace solaceTrace) { diff --git a/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/tracing/SolaceOpenTelemetryInstrumenter.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/tracing/SolaceOpenTelemetryInstrumenter.java index 4c16fcf..2e11d19 100644 --- a/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/tracing/SolaceOpenTelemetryInstrumenter.java +++ b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/tracing/SolaceOpenTelemetryInstrumenter.java @@ -28,7 +28,7 @@ public static SolaceOpenTelemetryInstrumenter createForOutgoing() { } private static SolaceOpenTelemetryInstrumenter createInstrumenter(boolean incoming) { - MessageOperation messageOperation = incoming ? MessageOperation.RECEIVE : MessageOperation.SEND; + MessageOperation messageOperation = incoming ? MessageOperation.RECEIVE : MessageOperation.PUBLISH; SolaceAttributeExtractor myExtractor = new SolaceAttributeExtractor(); MessagingAttributesGetter attributesGetter = myExtractor.getMessagingAttributesGetter(); From e05e8641d7ce0b2d57a1d60639d148eab002d9cd Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Tue, 8 Oct 2024 19:12:56 +0530 Subject: [PATCH 02/12] solace messaging client upgrade --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 17024d6..23d7ec5 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 3.8.6 - 1.4.0 + 1.7.0 3.24.2 5.1.2.Final From 79593c42d5dd151ddf2da322a7018bc232800265 Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:28:47 +0530 Subject: [PATCH 03/12] Changed maven compiler release version to java 17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23d7ec5..e40b965 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion} 3.11.0 - 11 + 17 UTF-8 UTF-8 3.8.6 From 0efe16a482f962fb0db76d5c55fd18d70fcda35a Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:05:01 +0530 Subject: [PATCH 04/12] revert solace messaging client to 1.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e40b965..47638d0 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 3.8.6 - 1.7.0 + 1.4.0 3.24.2 5.1.2.Final From 5c7ef9531baea2622c91addf1c4acd3a778e30d8 Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Thu, 10 Oct 2024 15:52:40 +0530 Subject: [PATCH 05/12] testing solace java client upgrade to 1.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47638d0..c75e12d 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 3.8.6 - 1.4.0 + 1.6.0 3.24.2 5.1.2.Final From dedb3b1ece5e3b6387e393545109da10bf0f871f Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Thu, 10 Oct 2024 16:31:47 +0530 Subject: [PATCH 06/12] revert solace java client to 1.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c75e12d..47638d0 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 3.8.6 - 1.6.0 + 1.4.0 3.24.2 5.1.2.Final From 76d521af4a3d6f3672c62da5ecdaa3bee88ca30d Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Thu, 10 Oct 2024 22:45:54 +0530 Subject: [PATCH 07/12] added netty resolver and upgraded solace java version to 1.7.0 --- pom.xml | 2 +- .../com/solace/quarkus/deployment/SolaceProcessor.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47638d0..e40b965 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 3.8.6 - 1.4.0 + 1.7.0 3.24.2 5.1.2.Final diff --git a/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java index d95bcc9..3cdf090 100644 --- a/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java +++ b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java @@ -3,6 +3,7 @@ import java.util.Optional; import java.util.function.Function; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Instance; @@ -104,4 +105,12 @@ HealthBuildItem addHealthCheck(SolaceBuildTimeConfig buildTimeConfig) { buildTimeConfig.health().enabled()); } + /** + * `Version.identify()` in netty-common uses the resource to determine the version of netty. + */ + @BuildStep + NativeImageResourceBuildItem nettyVersions() { + return new NativeImageResourceBuildItem("META-INF/io.netty.versions.properties"); + } + } From 071ecfc7202b15f07c1ad9633dce389b1a5e2133 Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Thu, 10 Oct 2024 22:48:06 +0530 Subject: [PATCH 08/12] reordered imports --- .../java/com/solace/quarkus/deployment/SolaceProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java index 3cdf090..3b47242 100644 --- a/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java +++ b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java @@ -3,7 +3,6 @@ import java.util.Optional; import java.util.function.Function; -import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Instance; @@ -25,6 +24,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.ServiceStartBuildItem; import io.quarkus.deployment.builditem.ShutdownContextBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem; import io.quarkus.runtime.metrics.MetricsFactory; From d618412409e2f4646ab91b9b5772a4e99aa2590e Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Wed, 23 Oct 2024 19:16:23 +0530 Subject: [PATCH 09/12] revert solace java api version to 1.4.0 and discard netty fix --- pom.xml | 2 +- .../com/solace/quarkus/deployment/SolaceProcessor.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index e40b965..47638d0 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 3.8.6 - 1.7.0 + 1.4.0 3.24.2 5.1.2.Final diff --git a/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java index 3b47242..0688a31 100644 --- a/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java +++ b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java @@ -105,12 +105,4 @@ HealthBuildItem addHealthCheck(SolaceBuildTimeConfig buildTimeConfig) { buildTimeConfig.health().enabled()); } - /** - * `Version.identify()` in netty-common uses the resource to determine the version of netty. - */ - @BuildStep - NativeImageResourceBuildItem nettyVersions() { - return new NativeImageResourceBuildItem("META-INF/io.netty.versions.properties"); - } - } From b038a4a6449ca5727bdaa493fcac2888762c21bf Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Wed, 23 Oct 2024 19:20:18 +0530 Subject: [PATCH 10/12] Code formatting --- .../main/java/com/solace/quarkus/deployment/SolaceProcessor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java index 0688a31..d95bcc9 100644 --- a/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java +++ b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java @@ -24,7 +24,6 @@ import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.ServiceStartBuildItem; import io.quarkus.deployment.builditem.ShutdownContextBuildItem; -import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem; import io.quarkus.runtime.metrics.MetricsFactory; From 1a619623f087578f1fdd22b5ac789e1d73d83353 Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Wed, 23 Oct 2024 19:23:13 +0530 Subject: [PATCH 11/12] Remove Java 11 from build workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e4d2f93..28f323f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - java: [11, 17, 21] + java: [17, 21] runs-on: ${{ matrix.os }} steps: - name: Prepare git From e9c1eba2da0b78959aad9dc81345b169c712b244 Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Tue, 29 Oct 2024 11:06:18 +0530 Subject: [PATCH 12/12] Documentation Update --- README.md | 2 +- docs/modules/ROOT/pages/index.adoc | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7721542..2dec7d4 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ Samples folder has examples on how to use the connector - [solace-connector-samp ## Documentation -The documentation for this extension should be maintained as part of this repository and it is stored in the `docs/` directory. +The documentation for this extension should be maintained as part of this repository, and it is stored in the `docs/` directory. Documentation is hosted in GitHub pages. Link to [Solace Quarkus Documentation](https://solacelabs.github.io/solace-quarkus/). ## Running the extension ```quarkus build``` to build the extension. Please note that docker should be up & running to run the tests during build process diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 7c07791..02c09de 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -25,7 +25,7 @@ For instance, with Maven, add the following dependency to your POM file: com.solace.quarkus quarkus-solace-client - {project-version} + 3.0.0 ---- @@ -42,10 +42,12 @@ For instance, with Maven, add the following dependency to your POM file: com.solace.quarkus quarkus-solace-messaging-connector - {project-version} + 3.0.0 ---- +NOTE: Solace Quarkus Extension 3.0.0 is based on Quarkus 3.8.6 and support for Java 11 is deprecated in Quarkus 3.8.6. Solace Quarkus Extension uses Java 17 as baseline. + [[extension-configuration-reference]] == Extension Configuration Reference