You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2021/04/12 12:23:16 UTC
[camel-quarkus] branch main updated: Make Quarkus Micrometer
optional for Reactor Netty extension
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new a9d36d4 Make Quarkus Micrometer optional for Reactor Netty extension
a9d36d4 is described below
commit a9d36d48f6348aec033688f8453b1975a4d9a2b5
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Apr 12 11:07:18 2021 +0100
Make Quarkus Micrometer optional for Reactor Netty extension
Fixes #2442
---
.../ROOT/pages/reference/extensions/azure-eventhubs.adoc | 16 ++++++++++++++++
.../pages/reference/extensions/azure-storage-blob.adoc | 16 ++++++++++++++++
.../reference/extensions/azure-storage-datalake.adoc | 16 ++++++++++++++++
.../pages/reference/extensions/azure-storage-queue.adoc | 16 ++++++++++++++++
.../runtime/src/main/doc/usage.adoc | 12 ++++++++++++
extensions-support/reactor-netty/deployment/pom.xml | 4 ----
extensions-support/reactor-netty/runtime/pom.xml | 13 ++++---------
.../azure-eventhubs/runtime/src/main/doc/usage.adoc | 12 ++++++++++++
.../azure-storage-blob/runtime/src/main/doc/usage.adoc | 12 ++++++++++++
.../azure-storage-queue/runtime/src/main/doc/usage.adoc | 12 ++++++++++++
10 files changed, 116 insertions(+), 13 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/azure-eventhubs.adoc b/docs/modules/ROOT/pages/reference/extensions/azure-eventhubs.adoc
index 380d7cab..ad77838 100644
--- a/docs/modules/ROOT/pages/reference/extensions/azure-eventhubs.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/azure-eventhubs.adoc
@@ -38,6 +38,22 @@ Or add the coordinates to your existing project:
Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications.
+== Usage
+
+=== Micrometer metrics support
+
+If you wish to enable the collection of Micrometer metrics for the Reactor Netty transports, then you should declare a dependency on `quarkus-micrometer` to ensure
+that they are available via the Quarkus metrics HTTP endpoint.
+
+[source,xml]
+----
+<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-micrometer</artifactId>
+</dependency>
+----
+
+
== SSL in native mode
This extension auto-enables SSL support in native mode. Hence you do not need to add
diff --git a/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc b/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc
index 83d7cb5..97d9880 100644
--- a/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc
@@ -38,6 +38,22 @@ Or add the coordinates to your existing project:
Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications.
+== Usage
+
+=== Micrometer metrics support
+
+If you wish to enable the collection of Micrometer metrics for the Reactor Netty transports, then you should declare a dependency on `quarkus-micrometer` to ensure
+that they are available via the Quarkus metrics HTTP endpoint.
+
+[source,xml]
+----
+<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-micrometer</artifactId>
+</dependency>
+----
+
+
== SSL in native mode
This extension auto-enables SSL support in native mode. Hence you do not need to add
diff --git a/docs/modules/ROOT/pages/reference/extensions/azure-storage-datalake.adoc b/docs/modules/ROOT/pages/reference/extensions/azure-storage-datalake.adoc
index e170557..0e60803 100644
--- a/docs/modules/ROOT/pages/reference/extensions/azure-storage-datalake.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/azure-storage-datalake.adoc
@@ -33,3 +33,19 @@ Please refer to the above link for usage and configuration details.
----
Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications.
+
+== Usage
+
+=== Micrometer metrics support
+
+If you wish to enable the collection of Micrometer metrics for the Reactor Netty transports, then you should declare a dependency on `quarkus-micrometer` to ensure
+that they are available via the Quarkus metrics HTTP endpoint.
+
+[source,xml]
+----
+<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-micrometer</artifactId>
+</dependency>
+----
+
diff --git a/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc b/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc
index 0cb67be..bb69b2a 100644
--- a/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc
@@ -38,6 +38,22 @@ Or add the coordinates to your existing project:
Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications.
+== Usage
+
+=== Micrometer metrics support
+
+If you wish to enable the collection of Micrometer metrics for the Reactor Netty transports, then you should declare a dependency on `quarkus-micrometer` to ensure
+that they are available via the Quarkus metrics HTTP endpoint.
+
+[source,xml]
+----
+<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-micrometer</artifactId>
+</dependency>
+----
+
+
== SSL in native mode
This extension auto-enables SSL support in native mode. Hence you do not need to add
diff --git a/extensions-jvm/azure-storage-datalake/runtime/src/main/doc/usage.adoc b/extensions-jvm/azure-storage-datalake/runtime/src/main/doc/usage.adoc
new file mode 100644
index 0000000..d36b6eb
--- /dev/null
+++ b/extensions-jvm/azure-storage-datalake/runtime/src/main/doc/usage.adoc
@@ -0,0 +1,12 @@
+=== Micrometer metrics support
+
+If you wish to enable the collection of Micrometer metrics for the Reactor Netty transports, then you should declare a dependency on `quarkus-micrometer` to ensure
+that they are available via the Quarkus metrics HTTP endpoint.
+
+[source,xml]
+----
+<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-micrometer</artifactId>
+</dependency>
+----
diff --git a/extensions-support/reactor-netty/deployment/pom.xml b/extensions-support/reactor-netty/deployment/pom.xml
index aad1f1d..3d15ea1 100644
--- a/extensions-support/reactor-netty/deployment/pom.xml
+++ b/extensions-support/reactor-netty/deployment/pom.xml
@@ -39,10 +39,6 @@
<artifactId>quarkus-netty-deployment</artifactId>
</dependency>
<dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-micrometer-deployment</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-reactor-netty</artifactId>
</dependency>
diff --git a/extensions-support/reactor-netty/runtime/pom.xml b/extensions-support/reactor-netty/runtime/pom.xml
index 780343d..be1c2a5 100644
--- a/extensions-support/reactor-netty/runtime/pom.xml
+++ b/extensions-support/reactor-netty/runtime/pom.xml
@@ -56,17 +56,12 @@
<artifactId>quarkus-netty</artifactId>
</dependency>
<dependency>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty</artifactId>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-core</artifactId>
</dependency>
<dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-micrometer</artifactId>
- </dependency>
- <dependency>
- <groupId>org.graalvm.nativeimage</groupId>
- <artifactId>svm</artifactId>
- <scope>provided</scope>
+ <groupId>io.projectreactor.netty</groupId>
+ <artifactId>reactor-netty</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/azure-eventhubs/runtime/src/main/doc/usage.adoc b/extensions/azure-eventhubs/runtime/src/main/doc/usage.adoc
new file mode 100644
index 0000000..d36b6eb
--- /dev/null
+++ b/extensions/azure-eventhubs/runtime/src/main/doc/usage.adoc
@@ -0,0 +1,12 @@
+=== Micrometer metrics support
+
+If you wish to enable the collection of Micrometer metrics for the Reactor Netty transports, then you should declare a dependency on `quarkus-micrometer` to ensure
+that they are available via the Quarkus metrics HTTP endpoint.
+
+[source,xml]
+----
+<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-micrometer</artifactId>
+</dependency>
+----
diff --git a/extensions/azure-storage-blob/runtime/src/main/doc/usage.adoc b/extensions/azure-storage-blob/runtime/src/main/doc/usage.adoc
new file mode 100644
index 0000000..d36b6eb
--- /dev/null
+++ b/extensions/azure-storage-blob/runtime/src/main/doc/usage.adoc
@@ -0,0 +1,12 @@
+=== Micrometer metrics support
+
+If you wish to enable the collection of Micrometer metrics for the Reactor Netty transports, then you should declare a dependency on `quarkus-micrometer` to ensure
+that they are available via the Quarkus metrics HTTP endpoint.
+
+[source,xml]
+----
+<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-micrometer</artifactId>
+</dependency>
+----
diff --git a/extensions/azure-storage-queue/runtime/src/main/doc/usage.adoc b/extensions/azure-storage-queue/runtime/src/main/doc/usage.adoc
new file mode 100644
index 0000000..d36b6eb
--- /dev/null
+++ b/extensions/azure-storage-queue/runtime/src/main/doc/usage.adoc
@@ -0,0 +1,12 @@
+=== Micrometer metrics support
+
+If you wish to enable the collection of Micrometer metrics for the Reactor Netty transports, then you should declare a dependency on `quarkus-micrometer` to ensure
+that they are available via the Quarkus metrics HTTP endpoint.
+
+[source,xml]
+----
+<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-micrometer</artifactId>
+</dependency>
+----