From 10634715fbdaf6e095d6ccf321ed80635837b7e1 Mon Sep 17 00:00:00 2001
From: Jean-Francois Denise <jdenise@redhat.com>
Date: Thu, 25 Jan 2024 15:14:56 +0100
Subject: [PATCH] Add micrometer and opentelemetry with Glow support

---
 micrometer/pom.xml            | 80 ++++++++++++++++-------------------
 opentelemetry-tracing/pom.xml | 70 ++++++++++++------------------
 2 files changed, 63 insertions(+), 87 deletions(-)

diff --git a/micrometer/pom.xml b/micrometer/pom.xml
index 6d81bc16e0..5c0618f64c 100644
--- a/micrometer/pom.xml
+++ b/micrometer/pom.xml
@@ -25,9 +25,7 @@
         <version.server>31.0.0.Final</version.server>
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
-        <version.plugin.wildfly-jar>10.0.0.Final</version.plugin.wildfly-jar>
-        <version.pack.cloud>6.0.0.Final</version.pack.cloud>
+        <version.plugin.wildfly>5.0.0.Beta2</version.plugin.wildfly>
     </properties>
 
     <repositories>
@@ -184,17 +182,13 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <feature-packs>
-                                <feature-pack>
-                                    <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
-                                </feature-pack>
-                            </feature-packs>
-                            <layers>
-                                <!-- layers may be used to customize the server to provision-->
-                                <layer>cdi</layer>
-                                <layer>jaxrs-server</layer>
-                                <layer>micrometer</layer>
-                            </layers>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                                <!-- A workaround for WFLY-18955 -->
+                                <add-ons>
+                                    <add-on>micrometer</add-on>
+                                </add-ons>
+                            </discover-provisioning-info>
                             <!-- use cli script(s) to configure the server -->
                             <packaging-scripts>
                                 <packaging-script>
@@ -226,24 +220,25 @@
                 <plugins>
                     <plugin>
                         <groupId>org.wildfly.plugins</groupId>
-                        <artifactId>wildfly-jar-maven-plugin</artifactId>
+                        <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.server}</feature-pack-location>
-                            <layers>
-                                <layer>cdi</layer>
-                                <layer>jaxrs-server</layer>
-                                <layer>micrometer</layer>
-                            </layers>
-                            <plugin-options>
-                                <jboss-fork-embedded>true</jboss-fork-embedded>
-                            </plugin-options>
-                            <cli-sessions>
-                                <cli-session>
-                                    <script-files>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                                <!-- A workaround for WFLY-18955 -->
+                                <add-ons>
+                                    <add-on>micrometer</add-on>
+                                </add-ons>
+                            </discover-provisioning-info>
+                            <bootable-jar>true</bootable-jar>
+                            <!-- deploys the quickstart on root web context -->
+                            <name>ROOT.war</name>
+                            <packaging-scripts>
+                                <packaging-script>
+                                    <scripts>
                                         <script>${basedir}/configure-micrometer.cli</script>
-                                    </script-files>
-                                </cli-session>
-                            </cli-sessions>
+                                    </scripts>
+                                </packaging-script>
+                            </packaging-scripts>
                         </configuration>
                         <executions>
                             <execution>
@@ -265,19 +260,18 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <feature-packs>
-                                <feature-pack>
-                                    <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
-                                </feature-pack>
-                                <feature-pack>
-                                    <location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud}</location>
-                                </feature-pack>
-                            </feature-packs>
-                            <layers>
-                                <layer>cdi</layer>
-                                <layer>jaxrs-server</layer>
-                                <layer>micrometer</layer>
-                            </layers>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                                <context>cloud</context>
+                                <!-- A workaround for WFLY-18955 -->
+                                <add-ons>
+                                    <add-on>micrometer</add-on>
+                                </add-ons>
+                            </discover-provisioning-info>
+                            <!--
+                                The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
+                                application is deployed in the root web context. Add ROOT.war to the server.
+                            -->
                             <filename>ROOT.war</filename>
                             <packaging-scripts>
                                 <packaging-script>
diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml
index bf27fafbfc..45d82228ca 100644
--- a/opentelemetry-tracing/pom.xml
+++ b/opentelemetry-tracing/pom.xml
@@ -23,9 +23,7 @@
         <version.server>31.0.0.Final</version.server>
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
-        <version.plugin.wildfly-jar>10.0.0.Final</version.plugin.wildfly-jar>
-        <version.pack.cloud>6.0.0.Final</version.pack.cloud>
+        <version.plugin.wildfly>5.0.0.Beta2</version.plugin.wildfly>
     </properties>
 
     <repositories>
@@ -173,17 +171,9 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <feature-packs>
-                                <feature-pack>
-                                    <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
-                                </feature-pack>
-                            </feature-packs>
-                            <layers>
-                                <!-- layers may be used to customize the server to provision-->
-                                <layer>cdi</layer>
-                                <layer>jaxrs-server</layer>
-                                <layer>opentelemetry</layer>
-                            </layers>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                            </discover-provisioning-info>
                             <packaging-scripts>
                                 <packaging-script>
                                     <scripts>
@@ -212,24 +202,21 @@
                 <plugins>
                     <plugin>
                         <groupId>org.wildfly.plugins</groupId>
-                        <artifactId>wildfly-jar-maven-plugin</artifactId>
+                        <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.server}</feature-pack-location>
-                            <layers>
-                                <layer>cdi</layer>
-                                <layer>jaxrs-server</layer>
-                                <layer>opentelemetry</layer>
-                            </layers>
-                            <cli-sessions>
-                                <cli-session>
-                                    <script-files>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                            </discover-provisioning-info>
+                            <bootable-jar>true</bootable-jar>
+                            <!-- deploys the quickstart on root web context -->
+                            <name>ROOT.war</name>
+                            <packaging-scripts>
+                                <packaging-script>
+                                    <scripts>
                                         <script>${basedir}/configure-opentelemetry.cli</script>
-                                    </script-files>
-                                </cli-session>
-                            </cli-sessions>
-                            <plugin-options>
-                                <jboss-fork-embedded>true</jboss-fork-embedded>
-                            </plugin-options>
+                                    </scripts>
+                                </packaging-script>
+                            </packaging-scripts>
                         </configuration>
                         <executions>
                             <execution>
@@ -251,19 +238,10 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <feature-packs>
-                                <feature-pack>
-                                    <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
-                                </feature-pack>
-                                <feature-pack>
-                                    <location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud}</location>
-                                </feature-pack>
-                            </feature-packs>
-                            <layers>
-                                <layer>cdi</layer>
-                                <layer>jaxrs-server</layer>
-                                <layer>opentelemetry</layer>
-                            </layers>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                                <context>cloud</context>
+                            </discover-provisioning-info>
                             <packaging-scripts>
                                 <packaging-script>
                                     <scripts>
@@ -271,7 +249,11 @@
                                     </scripts>
                                 </packaging-script>
                             </packaging-scripts>
-                            <name>ROOT.war</name>
+                            <!--
+                                The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
+                                application is deployed in the root web context. Add ROOT.war to the server.
+                            -->
+                            <filename>ROOT.war</filename>
                         </configuration>
                         <executions>
                             <execution>