Rebase 2

Signed-off-by: tvallin <thibault.vallin@oracle.com>
tvallin · Jul 11, 2023 · 2c0e442 · 2c0e442
1 parent 140e7b0
commit 2c0e442
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/...elidon/src/main/archetype/nima/custom/files/src/main/java/__pkg__/FtService.java.mustache b/...elidon/src/main/archetype/nima/custom/files/src/main/java/__pkg__/FtService.java.mustache
@@ -9,6 +9,7 @@ import io.helidon.nima.faulttolerance.Async;
 import io.helidon.nima.faulttolerance.Bulkhead;
 import io.helidon.nima.faulttolerance.CircuitBreaker;
 import io.helidon.nima.faulttolerance.Fallback;
+import io.helidon.nima.faulttolerance.FallbackConfig;
 import io.helidon.nima.faulttolerance.Retry;
 import io.helidon.nima.faulttolerance.Timeout;
 import io.helidon.nima.webserver.http.HttpRules;
@@ -27,7 +28,7 @@ public class FtService implements HttpService {
 
     FtService() {
         this.async = Async.create();
-        this.fallback = Fallback.create(this::fallback);
+        this.fallback = Fallback.create(FallbackConfig.<String>builder().fallback(this::fallback).build());
         this.bulkhead = Bulkhead.builder()
                 .queueLength(1)
                 .limit(1)

diff --git a/archetypes/helidon/src/main/archetype/nima/custom/observability.xml b/archetypes/helidon/src/main/archetype/nima/custom/observability.xml
@@ -27,7 +27,7 @@
             <list key="Main-routing">
                 <value template="mustache"><![CDATA[
         ObserveFeature observe = ObserveFeature.builder()
-                                               .useSystemServices(false)
+                                               .useSystemServices(true)
                                                {{#Observe-feature-builder}}
                                                {{.}}
                                                {{/Observe-feature-builder}}
@@ -50,6 +50,10 @@
                     <value key="groupId">io.helidon.nima.observe</value>
                     <value key="artifactId">helidon-nima-observe-metrics</value>
                 </map>
+                <map if="${metrics}">
+                    <value key="groupId">io.helidon.metrics</value>
+                    <value key="artifactId">helidon-metrics</value>
+                </map>
                 <map if="${tracing}">
                     <value key="groupId">io.helidon.nima.webserver</value>
                     <value key="artifactId">helidon-nima-webserver-tracing</value>
@@ -87,13 +91,10 @@
             </list>
             <list key="Observe-feature-builder">
                 <value if="${health}"><![CDATA[                                               .addProvider(HealthObserveProvider.create(HealthFeature.builder()
-                                               .useSystemServices(false)
                                                .addCheck(HeapMemoryHealthCheck.create())
                                                .addCheck(DiskSpaceHealthCheck.create())
                                                .addCheck(DeadlockHealthCheck.create())
                                                .build()))
-]]></value>
-                <value if="${metrics}"><![CDATA[               .addProvider(MetricsObserveProvider.create(MetricsFeature.create()))
 ]]></value>
             </list>
             <list key="Main-routing-builder" if="${tracing}">
@@ -140,6 +141,14 @@ private static class TracedHandler implements Handler {
             assertThat(response.status(), is(Http.Status.NO_CONTENT_204));
         }
     }
+]]></value>
+                <value if="${metrics}"><![CDATA[
+    @Test
+    void testMetricsObserver() {
+        try (Http1ClientResponse response = client.get("/observe/metrics").request()) {
+            assertThat(response.status(), is(Http.Status.OK_200));
+        }
+    }
 ]]></value>
             </list>
         </model>