From 601209458172b30abf5ee969a0b8a8832487eaa0 Mon Sep 17 00:00:00 2001 From: Sravan Thotakura <83568543+SravanThotakura05@users.noreply.github.com> Date: Tue, 29 Oct 2024 11:36:49 +0530 Subject: [PATCH] Quarkus version upgrade to 3.8.6 (#77) * Quarkus version upgrade to 3.8.6 * solace messaging client upgrade * Changed maven compiler release version to java 17 * revert solace messaging client to 1.4.0 * testing solace java client upgrade to 1.6.0 * revert solace java client to 1.4.0 * added netty resolver and upgraded solace java version to 1.7.0 * reordered imports * revert solace java api version to 1.4.0 and discard netty fix * Code formatting * Remove Java 11 from build workflow * Documentation Update --- .github/workflows/build.yml | 2 +- .quarkus/cli/plugins/quarkus-cli-catalog.json | 5 +++++ README.md | 2 +- .../ROOT/pages/includes/quarkus-solace.adoc | 20 +++++++++---------- docs/modules/ROOT/pages/index.adoc | 6 ++++-- pom.xml | 4 ++-- .../tracing/SolaceAttributeExtractor.java | 8 ++++---- .../SolaceOpenTelemetryInstrumenter.java | 2 +- 8 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 .quarkus/cli/plugins/quarkus-cli-catalog.json 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 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/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/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/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 diff --git a/pom.xml b/pom.xml index bbf1a9f..47638d0 100644 --- a/pom.xml +++ b/pom.xml @@ -33,10 +33,10 @@ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion} 3.11.0 - 11 + 17 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();