From 6afc73d47e6f1fc519ff4d50e1887ddaa4953c5f Mon Sep 17 00:00:00 2001
From: Thibault Vallin <thibault.vallin@oracle.com>
Date: Thu, 13 Jul 2023 00:59:02 +0200
Subject: [PATCH 1/2] fix archetype build (#7177)

Signed-off-by: tvallin <thibault.vallin@oracle.com>
(cherry picked from commit 48511c3af3b134e1b0599d941c70d78fe50ed837)
---
 archetypes/helidon/pom.xml                    | 10 ++++++---
 .../src/main/cli/versions.xml.mustache        | 22 +++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 archetypes/helidon/src/main/cli/versions.xml.mustache

diff --git a/archetypes/helidon/pom.xml b/archetypes/helidon/pom.xml
index 4689c3bc4e6..8628a397b89 100644
--- a/archetypes/helidon/pom.xml
+++ b/archetypes/helidon/pom.xml
@@ -100,9 +100,13 @@
                                             </templates>
                                         </archive>
                                     </archives>
-                                    <files>
-                                        <file target="cli-data/latest">${project.version}</file>
-                                    </files>
+                                    <templates>
+                                        <template source="src/main/cli/versions.xml.mustache" target="cli-data/versions.xml">
+                                            <variables>
+                                                <variable name="version" value="${project.version}"/>
+                                            </variables>
+                                        </template>
+                                    </templates>
                                 </directory>
                             </directories>
                         </configuration>
diff --git a/archetypes/helidon/src/main/cli/versions.xml.mustache b/archetypes/helidon/src/main/cli/versions.xml.mustache
new file mode 100644
index 00000000000..fb38b3e1b95
--- /dev/null
+++ b/archetypes/helidon/src/main/cli/versions.xml.mustache
@@ -0,0 +1,22 @@
+<!--
+
+    Copyright (c) 2023 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<data>
+    <archetypes>
+        <version>{{version}}</version>
+    </archetypes>
+</data>
\ No newline at end of file

From eeff142d42dec7ff8f216e64c08bc0b7e09db998 Mon Sep 17 00:00:00 2001
From: tvallin <thibault.vallin@oracle.com>
Date: Wed, 20 Sep 2023 15:12:10 +0200
Subject: [PATCH 2/2] remove metrics provider for SE

Signed-off-by: tvallin <thibault.vallin@oracle.com>
---
 archetypes/helidon/filters.properties         |   3 -
 archetypes/helidon/pom.xml                    |   3 +
 .../main/archetype/common/observability.xml   | 152 +++++-------------
 3 files changed, 41 insertions(+), 117 deletions(-)

diff --git a/archetypes/helidon/filters.properties b/archetypes/helidon/filters.properties
index 83296807e99..1dd1875c718 100644
--- a/archetypes/helidon/filters.properties
+++ b/archetypes/helidon/filters.properties
@@ -36,9 +36,6 @@ health=!${health} || (${health.builtin})
 # force metrics.builtin=true
 metrics=!${metrics} || (${metrics.builtin})
 
-# force metrics.provider='microprofile' when tracing=true
-tracing=!${tracing} || (${tracing} && ${metrics.provider} == 'microprofile')
-
 # group extra options
 extra=${extra} == [] || \
   (${flavor} == 'se' && ${extra} == ['cors', 'webclient', 'fault-tolerance']) || \
diff --git a/archetypes/helidon/pom.xml b/archetypes/helidon/pom.xml
index 8628a397b89..413c5dca419 100644
--- a/archetypes/helidon/pom.xml
+++ b/archetypes/helidon/pom.xml
@@ -100,6 +100,9 @@
                                             </templates>
                                         </archive>
                                     </archives>
+                                    <files>
+                                        <file target="cli-data/latest">${project.version}</file>
+                                    </files>
                                     <templates>
                                         <template source="src/main/cli/versions.xml.mustache" target="cli-data/versions.xml">
                                             <variables>
diff --git a/archetypes/helidon/src/main/archetype/common/observability.xml b/archetypes/helidon/src/main/archetype/common/observability.xml
index 01c086d1b7a..f92b61bb9c3 100644
--- a/archetypes/helidon/src/main/archetype/common/observability.xml
+++ b/archetypes/helidon/src/main/archetype/common/observability.xml
@@ -31,7 +31,8 @@
                     <enum id="provider"
                           name="Select a Metrics Provider"
                           default="microprofile"
-                          optional="true">
+                          optional="true"
+                          if="${flavor} == 'mp'">
                         <option value="microprofile"
                                 name="MicroProfile"
                                 description="Expose metrics using the MicroProfile API">
@@ -56,18 +57,14 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
 ]]></value>
                                     </list>
                                     <list key="dependencies">
-                                        <map order="800" if="${flavor} == 'mp'">
+                                        <map order="800">
                                             <value key="groupId">org.eclipse.microprofile.metrics</value>
                                             <value key="artifactId">microprofile-metrics-api</value>
                                         </map>
-                                        <map order="800" if="${flavor} == 'mp'">
+                                        <map order="800">
                                             <value key="groupId">io.helidon.microprofile.metrics</value>
                                             <value key="artifactId">helidon-microprofile-metrics</value>
                                         </map>
-                                        <map order="800" if="${flavor} == 'se'">
-                                            <value key="groupId">io.helidon.metrics</value>
-                                            <value key="artifactId">helidon-metrics</value>
-                                        </map>
                                     </list>
                                     <list key="Main-helidon-imports">
                                         <value>io.helidon.metrics.MetricsSupport</value>
@@ -76,28 +73,20 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
                                         <value><![CDATA[                .register(MetricsSupport.create()) // Metrics at "/metrics"]]></value>
                                     </list>
                                     <list key="SimpleGreetService-imports">
-                                        <value if="${flavor} == 'mp'">org.eclipse.microprofile.metrics.MetricUnits</value>
-                                        <value if="${flavor} == 'mp'">org.eclipse.microprofile.metrics.annotation.Counted</value>
-                                        <value if="${flavor} == 'mp'">org.eclipse.microprofile.metrics.annotation.Timed</value>
-                                        <value if="${flavor} == 'mp'">jakarta.ws.rs.PathParam</value>
-
-                                        <value if="${flavor} == 'se'">org.eclipse.microprofile.metrics.MetricRegistry</value>
-                                        <value if="${flavor} == 'se'">org.eclipse.microprofile.metrics.Counter</value>
-                                        <value if="${flavor} == 'se'">io.helidon.metrics.api.RegistryFactory</value>
+                                        <value>org.eclipse.microprofile.metrics.MetricUnits</value>
+                                        <value>org.eclipse.microprofile.metrics.annotation.Counted</value>
+                                        <value>org.eclipse.microprofile.metrics.annotation.Timed</value>
+                                        <value>jakarta.ws.rs.PathParam</value>
                                     </list>
                                     <list key="SimpleGreetResource-static-fields">
-                                        <value if="${flavor} == 'mp'"><![CDATA[
+                                        <value><![CDATA[
     private static final String PERSONALIZED_GETS_COUNTER_NAME = "personalizedGets";
     private static final String PERSONALIZED_GETS_COUNTER_DESCRIPTION = "Counts personalized GET operations";
     private static final String GETS_TIMER_NAME = "allGets";
     private static final String GETS_TIMER_DESCRIPTION = "Tracks all GET operations";]]></value>
-                                        <value if="${flavor} == 'se'"><![CDATA[
-    private final MetricRegistry registry = RegistryFactory.getInstance()
-            .getRegistry(MetricRegistry.Type.APPLICATION);
-    private final Counter accessCtr = registry.counter("accessctr");]]></value>
                                     </list>
                                     <list key="SimpleGreetService-methods">
-                                        <value if="${flavor} == 'mp'"><![CDATA[
+                                        <value><![CDATA[
     @Path("/{name}")
     @GET
     @Produces(MediaType.APPLICATION_JSON)
@@ -111,24 +100,16 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
     public String getMessage(@PathParam("name") String name) {
         return String.format("Hello %s", name);
     }]]></value>
-                                        <value if="${flavor} == 'se'"><![CDATA[
-    private void countAccess(ServerRequest request, ServerResponse response) {
-        accessCtr.inc();
-        request.next();
-    }]]></value>
-                                    </list>
-                                    <list key="SimpleGreetResource-update" if="${flavor} == 'se'">
-                                        <value><![CDATA[        rules.get("/greet-count", this::countAccess, this::getDefaultMessageHandler);]]></value>
                                     </list>
                                     <list key="MainTest-java-imports">
-                                        <value if="${flavor} == 'mp'">org.eclipse.microprofile.metrics.Counter</value>
-                                        <value if="${flavor} == 'mp'">org.eclipse.microprofile.metrics.MetricRegistry</value>
+                                        <value>org.eclipse.microprofile.metrics.Counter</value>
+                                        <value>org.eclipse.microprofile.metrics.MetricRegistry</value>
                                     </list>
                                     <list key="MainTest-static-imports">
-                                        <value if="${flavor} == 'mp'">static org.junit.jupiter.api.Assertions.assertEquals</value>
+                                        <value>static org.junit.jupiter.api.Assertions.assertEquals</value>
                                     </list>
                                     <list key="MainTest-methods">
-                                        <value if="${flavor} == 'mp'"><![CDATA[
+                                        <value><![CDATA[
     @Test
     void testMicroprofileMetrics() {
         String message = target.path("simple-greet/Joe")
@@ -146,36 +127,15 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
         assertThat(message, is("Hello Eric"));
         double after = counter.getCount();
         assertEquals(1d, after - before, "Difference in personalized greeting counter between successive calls");
-    }]]></value>
-                                        <value if="${flavor} == 'se'"><![CDATA[
-    @Test
-    void testMicroprofileMetrics() {
-        String get = webClient.get()
-                .path("/simple-greet/greet-count")
-                .request(String.class)
-                .await(Duration.ofSeconds(5));
-
-        assertThat(get, containsString("Hello World!"));
-
-        String openMetricsOutput = webClient.get()
-                .path("/metrics")
-                .request(String.class)
-                .await(Duration.ofSeconds(5));
-
-        assertThat("Metrics output", openMetricsOutput, containsString("application_accessctr_total"));
     }]]></value>
                                     </list>
                                     <list key="MainTest-static-fields">
-                                        <value if="${flavor} == 'mp'"><![CDATA[
+                                        <value><![CDATA[
     @Inject
     private MetricRegistry registry;]]></value>
                                     </list>
                                     <list key="modules">
-                                        <value if="${flavor} == 'mp'">io.helidon.microprofile.metrics</value>
-                                        <value if="${flavor} == 'se'">io.helidon.metrics</value>
-                                    </list>
-                                    <list key="MainTest-static-imports">
-                                        <value if="${flavor} == 'se'">static org.hamcrest.Matchers.containsString</value>
+                                        <value>io.helidon.microprofile.metrics</value>
                                     </list>
                                 </model>
                             </output>
@@ -186,41 +146,25 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
                             <output>
                                 <model>
                                     <list key="dependencies">
-                                        <map if="${flavor} == 'mp'">
+                                        <map>
                                             <value key="groupId">io.helidon.integrations.micrometer</value>
                                             <value key="artifactId">helidon-integrations-micrometer-cdi</value>
                                         </map>
-                                        <map if="${flavor} == 'se'">
-                                            <value key="groupId">io.helidon.integrations.micrometer</value>
-                                            <value key="artifactId">helidon-integrations-micrometer</value>
-                                        </map>
                                     </list>
                                     <list key="SimpleGreetService-imports">
-                                        <value if="${flavor} == 'mp'">io.micrometer.core.annotation.Counted</value>
-                                        <value if="${flavor} == 'mp'">io.micrometer.core.annotation.Timed</value>
-                                        <value if="${flavor} == 'mp'">jakarta.ws.rs.PathParam</value>
-
-                                        <value if="${flavor} == 'se'">io.micrometer.core.instrument.Counter</value>
-                                        <value if="${flavor} == 'se'">io.micrometer.core.instrument.MeterRegistry</value>
+                                        <value>io.micrometer.core.annotation.Counted</value>
+                                        <value>io.micrometer.core.annotation.Timed</value>
+                                        <value>jakarta.ws.rs.PathParam</value>
                                     </list>
                                     <list key="SimpleGreetResource-static-fields">
-                                        <value if="${flavor} == 'mp'"><![CDATA[
+                                        <value><![CDATA[
     private static final String PERSONALIZED_GETS_COUNTER_NAME = "personalizedGets";
     private static final String PERSONALIZED_GETS_COUNTER_DESCRIPTION = "Counts personalized GET operations";
     private static final String GETS_TIMER_NAME = "allGets";
     private static final String GETS_TIMER_DESCRIPTION = "Tracks all GET operations";]]></value>
-                                        <value if="${flavor} == 'se'"><![CDATA[
-    private Counter requestCounter;]]></value>
-                                    </list>
-                                    <list key="SimpleGreetResource-constructor">
-                                        <value if="${flavor} == 'se'"><![CDATA[
-    SimpleGreetService(Config config, MeterRegistry registry) {
-        this(config);
-        this.requestCounter = registry.counter("allRequests");
-    }]]></value>
                                     </list>
                                     <list key="SimpleGreetService-methods">
-                                        <value if="${flavor} == 'mp'"><![CDATA[
+                                        <value><![CDATA[
     @Path("/{name}")
     @GET
     @Produces(MediaType.APPLICATION_JSON)
@@ -229,14 +173,6 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
     public String getMessage(@PathParam("name") String name) {
         return String.format("Hello %s", name);
     }]]></value>
-                                        <value if="${flavor} == 'se'"><![CDATA[
-    private void countAccess(ServerRequest request, ServerResponse response) {
-        requestCounter.increment();
-        request.next();
-    }]]></value>
-                                    </list>
-                                    <list key="SimpleGreetResource-update" if="${flavor} == 'se'">
-                                        <value><![CDATA[        rules.get("/greet-count", this::countAccess, this::getDefaultMessageHandler);]]></value>
                                     </list>
                                     <list key="Main-helidon-imports">
                                         <value>io.helidon.integrations.micrometer.MicrometerSupport</value>
@@ -249,7 +185,7 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
                 .register("/micrometer-greet", new SimpleGreetService(config, micrometerSupport.registry()))]]></value>
                                     </list>
                                     <list key="MainTest-methods">
-                                        <value if="${flavor} == 'mp'"><![CDATA[
+                                        <value><![CDATA[
     @Test
     void testMicrometerMetrics() {
         String message = target.path("simple-greet/Joe")
@@ -267,37 +203,22 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
         assertThat(message, is("Hello Eric"));
         double after = counter.count();
         assertEquals(1d, after - before, "Difference in personalized greeting counter between successive calls");
-    }]]></value>
-                                        <value if="${flavor} == 'se'"><![CDATA[
-    @Test
-    void testMicrometerMetrics() {
-        String get = webClient.get()
-                .path("/micrometer-greet/greet-count")
-                .request(String.class)
-                .await(Duration.ofSeconds(5));
-
-        assertThat(get, containsString("Hello World!"));
-
-        String openMetricsOutput = webClient.get()
-                .path("/micrometer")
-                .request(String.class)
-                .await(Duration.ofSeconds(5));
-
-        assertThat("Metrics output", openMetricsOutput, containsString("allRequests_total 1"));
     }]]></value>
                                     </list>
                                     <list key="MainTest-static-fields">
-                                        <value if="${flavor} == 'mp'"><![CDATA[
+                                        <value><![CDATA[
     @Inject
     private MeterRegistry registry;]]></value>
                                     </list>
                                     <list key="MainTest-java-imports">
-                                        <value if="${flavor} == 'mp'">io.micrometer.core.instrument.Counter</value>
-                                        <value if="${flavor} == 'mp'">io.micrometer.core.instrument.MeterRegistry</value>
+                                        <value>io.micrometer.core.instrument.Counter</value>
+                                        <value>io.micrometer.core.instrument.MeterRegistry</value>
                                     </list>
                                     <list key="MainTest-static-imports">
-                                        <value if="${flavor} == 'mp'">static org.junit.jupiter.api.Assertions.assertEquals</value>
-                                        <value if="${flavor} == 'se'">static org.hamcrest.Matchers.containsString</value>
+                                        <value>static org.junit.jupiter.api.Assertions.assertEquals</value>
+                                    </list>
+                                    <list key="modules">
+                                        <value>io.helidon.integrations.micrometer</value>
                                     </list>
                                     <list key="readme-sections">
                                         <value><![CDATA[
@@ -332,15 +253,15 @@ allRequests_total 0.0
                         <output>
                             <model>
                                 <list key="dependencies">
-                                    <map order="800" if="${flavor} == 'se' &amp;&amp; !(${metrics.provider} == 'microprofile')">
+                                    <map order="800" if="${flavor} == 'se'">
                                         <value key="groupId">io.helidon.metrics</value>
                                         <value key="artifactId">helidon-metrics</value>
                                     </map>
                                 </list>
-                                <list key="Main-helidon-imports" if="!(${metrics.provider} == 'microprofile')">
+                                <list key="Main-helidon-imports" if="${flavor} == 'se'">
                                     <value>io.helidon.metrics.MetricsSupport</value>
                                 </list>
-                                <list key="Main-routingBuilder" if="!(${metrics.provider} == 'microprofile')">
+                                <list key="Main-routingBuilder" if="${flavor} == 'se'">
                                     <value><![CDATA[                .register(MetricsSupport.create()) // Metrics at "/metrics"]]></value>
                                 </list>
                                 <list key="MainTest-methods">
@@ -363,7 +284,10 @@ allRequests_total 0.0
         assertThat(response.status().code(), is(200));
     }]]></value>
                                 </list>
-                                <list key="readme-sections" if="!(${metrics.provider} == 'microprofile')">
+                                <list key="modules" if="${flavor} == 'se'">
+                                    <value>io.helidon.metrics</value>
+                                </list>
+                                <list key="readme-sections" if="${flavor} == 'se'">
                                     <value><![CDATA[
 ## Try metrics
 
@@ -566,7 +490,7 @@ curl -s -X GET http://localhost:8080/health
             <!-- TODO https://github.com/oracle/helidon-build-tools/issues/609 -->
             <model>
                 <value key="metrics" if="${metrics}">true</value>
-                <value key="metrics.provider" if="${metrics}">${metrics.provider}</value>
+                <value key="metrics.provider" if="${metrics} &amp;&amp; ${flavor} == 'mp'">${metrics.provider}</value>
                 <value key="metrics.builtin" if="${metrics}">${metrics.builtin}</value>
                 <value key="health" if="${health}">true</value>
                 <value key="health.builtin" if="${health}">${health.builtin}</value>