Skip to content

Commit f2a3b63

Browse files
tvallintvallin
committed
latest review changes
Signed-off-by: tvallin <[email protected]>
1 parent 909ad29 commit f2a3b63

File tree

19 files changed

+219
-104
lines changed

19 files changed

+219
-104
lines changed

‎archetypes/archetypes/src/main/archetype/features/media/media-sources.xml‎ renamed to ‎archetypes/archetypes/src/main/archetype/features/media/includes/media-sources.xml‎

File renamed without changes.

‎archetypes/archetypes/src/main/archetype/features/observability/includes/inputs-health.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (c) 2024 Oracle and/or its affiliates.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
19+
<archetype-script xmlns="https://helidon.io/archetype/2.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
22+
23+
<inputs>
24+
<boolean id="health"
25+
name="Health Checks"
26+
description="Monitor your application’s health"
27+
default="false"
28+
optional="true">
29+
<inputs>
30+
<boolean id="builtin"
31+
name="Built-in Health Checks"
32+
description="Report common health check statuses"
33+
default="true"
34+
optional="true"/>
35+
</inputs>
36+
</boolean>
37+
</inputs>
38+
</archetype-script>

‎archetypes/archetypes/src/main/archetype/features/observability/includes/inputs-tracing.xml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (c) 2024 Oracle and/or its affiliates.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
19+
<archetype-script xmlns="https://helidon.io/archetype/2.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
22+
23+
<inputs>
24+
<boolean id="tracing"
25+
name="Tracing"
26+
description="Distributed tracing system"
27+
default="false"
28+
optional="true">
29+
<inputs>
30+
<enum id="provider"
31+
name="Select a Tracing Provider"
32+
default="jaeger"
33+
optional="true">
34+
<option value="jaeger"
35+
name="Jaeger"
36+
description="Send traces to a Jaeger backend"/>
37+
<option value="zipkin"
38+
name="Zipkin"
39+
description="Send traces to a Zipkin backend"/>
40+
</enum>
41+
</inputs>
42+
</boolean>
43+
</inputs>
44+
</archetype-script>

‎archetypes/archetypes/src/main/archetype/features/observability/inputs.xml‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎archetypes/archetypes/src/main/archetype/features/observability/output.xml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,26 @@
1919
<archetype-script xmlns="https://helidon.io/archetype/2.0"
2020
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2121
xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
22-
22+
<methods>
23+
<method name="jaeger">
24+
<output if="${tracing}">
25+
<model if="${tracing.provider} == 'jaeger'">
26+
<list key="readme-sections">
27+
<value file="files/README.jaeger.md"/>
28+
</list>
29+
</model>
30+
</output>
31+
</method>
32+
<method name="zipkin">
33+
<output if="${tracing}">
34+
<model if="${tracing.provider} == 'zipkin'">
35+
<list key="readme-sections">
36+
<value file="files/README.zipkin.md"/>
37+
</list>
38+
</model>
39+
</output>
40+
</method>
41+
</methods>
42+
<call method="jaeger"/>
43+
<call method="zipkin"/>
2344
</archetype-script>

‎archetypes/archetypes/src/main/archetype/features/output.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2121
xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
2222
<exec src="common/output.xml"/>
23-
<exec src="extra/output.xml"/>
24-
<exec src="media/output.xml"/>
2523
<exec src="observability/output.xml"/>
2624
<exec src="packaging/output.xml"/>
2725
<exec src="security/output.xml"/>

‎archetypes/archetypes/src/main/archetype/mp/custom/inputs.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<exec src="/features/security/inputs.xml"/>
2626
<exec src="../features/database/inputs.xml"/>
2727
<exec src="/features/extra/inputs.xml"/>
28-
<exec src="/features/observability/inputs.xml"/>
28+
<exec src="../features/observability/inputs.xml"/>
2929
<exec src="/features/packaging/inputs.xml"/>
3030
<exec src="/features/project-customization/inputs.xml"/>
3131

‎archetypes/archetypes/src/main/archetype/mp/features/media/output.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<call method="jsonb"/>
133133
<call method="jackson"/>
134134
<call method="multipart"/>
135-
<source src="/features/media/media-sources.xml"/>
135+
<source src="/features/media/includes/media-sources.xml"/>
136136
<output>
137137
<!-- TODO https://github.com/oracle/helidon-build-tools/issues/609 -->
138138
<model>

‎archetypes/archetypes/src/main/archetype/features/media/output.xml‎ renamed to ‎archetypes/archetypes/src/main/archetype/mp/features/observability/inputs.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,11 @@
2020
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2121
xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
2222

23+
<step name="Observability" optional="true">
24+
<inputs>
25+
<exec src="metrics/inputs.xml"/>
26+
<exec src="/features/observability/includes/inputs-health.xml"/>
27+
<exec src="/features/observability/includes/inputs-tracing.xml"/>
28+
</inputs>
29+
</step>
2330
</archetype-script>

‎archetypes/archetypes/src/main/archetype/mp/features/observability/metrics/micrometer/output.xml‎ renamed to ‎archetypes/archetypes/src/main/archetype/mp/features/observability/metrics/includes/output-micrometer.xml‎

File renamed without changes.

0 commit comments

Comments
 (0)