diff --git a/archetypes/helidon/src/main/archetype/common/observability.xml b/archetypes/helidon/src/main/archetype/common/observability.xml index 2f87a8b3443..c51b9cc4fc3 100644 --- a/archetypes/helidon/src/main/archetype/common/observability.xml +++ b/archetypes/helidon/src/main/archetype/common/observability.xml @@ -28,295 +28,13 @@ default="false" optional="true"> - - - - - - - - - io.helidon.metrics - helidon-metrics - - - - io.helidon.metrics.MetricsSupport - - - - - - - - - - io.helidon.metrics - - - - - - - + optional="true" + if="${flavor} == 'se'"/> - - - - - io.helidon.dbclient - helidon-dbclient-metrics-jdbc - - - io.helidon.dbclient - helidon-dbclient-metrics - - - - true - ${metrics.provider} - ${metrics.builtin} + ${metrics.builtin} true ${health.builtin} true diff --git a/archetypes/helidon/src/main/archetype/common/presets.xml b/archetypes/helidon/src/main/archetype/common/presets.xml index 843bc278dbb..8a97ae3d2fe 100644 --- a/archetypes/helidon/src/main/archetype/common/presets.xml +++ b/archetypes/helidon/src/main/archetype/common/presets.xml @@ -25,7 +25,6 @@ json true - microprofile true true true diff --git a/archetypes/helidon/src/main/archetype/mp/custom/observability.xml b/archetypes/helidon/src/main/archetype/mp/custom/observability.xml index 963b063870d..1c35fb87101 100644 --- a/archetypes/helidon/src/main/archetype/mp/custom/observability.xml +++ b/archetypes/helidon/src/main/archetype/mp/custom/observability.xml @@ -19,6 +19,123 @@ + + + + + + + + + + + org.eclipse.microprofile.metrics + microprofile-metrics-api + + + io.helidon.microprofile.metrics + helidon-microprofile-metrics + + + + org.eclipse.microprofile.metrics.MetricUnits + org.eclipse.microprofile.metrics.annotation.Counted + org.eclipse.microprofile.metrics.annotation.Timed + jakarta.ws.rs.PathParam + + + + + + + + + + + org.eclipse.microprofile.metrics.Counter + org.eclipse.microprofile.metrics.MetricRegistry + + + static org.junit.jupiter.api.Assertions.assertEquals + + + + + + + + + + + io.helidon.microprofile.metrics + + + + + + diff --git a/archetypes/helidon/src/main/archetype/se/custom/observability.xml b/archetypes/helidon/src/main/archetype/se/custom/observability.xml index c6eed034c42..2d538f7d949 100644 --- a/archetypes/helidon/src/main/archetype/se/custom/observability.xml +++ b/archetypes/helidon/src/main/archetype/se/custom/observability.xml @@ -19,24 +19,98 @@ - - - - io.helidon.tracing.TracerBuilder - - - .tracer(TracerBuilder.create(config.get("tracing")).build()) - - - + + + + + + io.helidon.metrics + helidon-metrics-api + + + io.helidon.dbclient + helidon-dbclient-metrics-jdbc + + + io.helidon.dbclient + helidon-dbclient-metrics + + + + io.helidon.metrics.MetricsSupport + + + + + + + + + + + io.helidon.metrics + + + + + + + + + + + + + + io.helidon.metrics + helidon-metrics + + + + + + + + + + io.helidon.tracing.TracerBuilder + + + .tracer(TracerBuilder.create(config.get("tracing")).build()) + + + - + + - - - + + + + - - - + global: false]]> + + + + + + + + +