From 2cdbc06e72670f01345d0beea134959fa535b76a Mon Sep 17 00:00:00 2001
From: tvallin <thibault.vallin@oracle.com>
Date: Thu, 29 Sep 2022 17:22:17 +0200
Subject: [PATCH 1/2] tracing configuration update

Signed-off-by: tvallin <thibault.vallin@oracle.com>
---
 .../main/archetype/common/observability.xml   | 70 -----------------
 .../microprofile-config.properties.mustache   |  4 +-
 .../main/archetype/mp/custom/custom-mp.xml    |  5 +-
 .../archetype/mp/custom/observability.xml     | 50 ++++++++++++
 .../main/resources/application.yaml.mustache  |  4 +-
 .../main/archetype/se/custom/custom-se.xml    |  5 +-
 .../src/main/archetype/se/custom/database.xml |  8 +-
 .../archetype/se/custom/observability.xml     | 76 +++++++++++++++++++
 8 files changed, 140 insertions(+), 82 deletions(-)
 create mode 100644 archetypes/helidon/src/main/archetype/mp/custom/observability.xml
 create mode 100644 archetypes/helidon/src/main/archetype/se/custom/observability.xml

diff --git a/archetypes/helidon/src/main/archetype/common/observability.xml b/archetypes/helidon/src/main/archetype/common/observability.xml
index 894e58d41bc..17fe9827b94 100644
--- a/archetypes/helidon/src/main/archetype/common/observability.xml
+++ b/archetypes/helidon/src/main/archetype/common/observability.xml
@@ -484,55 +484,6 @@ curl -s -X GET http://localhost:8080/health
                                             <value key="artifactId">helidon-tracing-jaeger</value>
                                         </map>
                                     </list>
-                                    <list key="app-yaml-content">
-                                        <value><![CDATA[
-tracing:
-    service: "helidon-full-http"
-    protocol: "https"     # JAEGER_ENDPOINT (if not udp, http is expected and endpoint is filled)
-    host: "192.168.1.3"   # JAEGER_ENDPOINT
-    port: 14240           # JAEGER_ENDPOINT
-    path: "/api/traces/mine"   # JAEGER_ENDPOINT
-    token: "token"        # JAEGER_AUTH_TOKEN
-    # Either token or username/password
-    #username:  "user"     # JAEGER_USER
-    #password: "pass"      # JAEGER_PASSWORD
-    propagation: "jaeger" # JAEGER_PROPAGATION either "jaeger" or "b3"
-    log-spans: false      # JAEGER_REPORTER_LOG_SPANS
-    max-queue-size: 42    # JAEGER_REPORTER_MAX_QUEUE_SIZE
-    flush-interval-ms: 10001 # JAEGER_REPORTER_FLUSH_INTERVAL
-    sampler-type: "remote"# JAEGER_SAMPLER_TYPE (https://www.jaegertracing.io/docs/latest/sampling/#client-sampling-configuration)
-    sampler-param: 0.5    # JAEGER_SAMPLER_PARAM (number)
-    sampler-manager: "localhost:47877" # JAEGER_SAMPLER_MANAGER_HOST_PORT
-    tags:
-      tag1: "tag1-value"  # JAEGER_TAGS
-      tag2: "tag2-value"  # JAEGER_TAGS
-    boolean-tags:
-      tag3: true          # JAEGER_TAGS
-      tag4: false         # JAEGER_TAGS
-    int-tags:
-      tag5: 145           # JAEGER_TAGS
-      tag6: 741           # JAEGER_TAGS]]></value>
-                                    </list>
-                                    <list key="MainTest-methods">
-                                        <value if="${flavor} == 'mp'"><![CDATA[
-    @Test
-    void testMetricJaeger() {
-        Response response = target
-                .path("metrics/vendor")
-                .request()
-                .get();
-        assertThat(response.getStatus(), is(200));
-    }]]></value>
-                                        <value if="${flavor} == 'se'"><![CDATA[
-    @Test
-    void testMetricJaeger() {
-        WebClientResponse response = webClient.get()
-                .path("metrics/vendor")
-                .request()
-                .await();
-        assertThat(response.status().code(), is(200));
-    }]]></value>
-                                    </list>
                                 </model>
                             </output>
                         </option>
@@ -547,27 +498,6 @@ tracing:
                                             <value key="artifactId">helidon-tracing-zipkin</value>
                                         </map>
                                     </list>
-                                    <list key="app-yaml-content">
-                                        <value><![CDATA[
-tracing:
-  zipkin:
-    service: "helidon-service"
-    protocol: "https"
-    host: "192.168.1.1"
-    port: 9987
-    api-version: 1
-    # this is the default path for API version 2
-    path: "/api/v2/spans"
-    tags:
-      tag1: "tag1-value"
-      tag2: "tag2-value"
-    boolean-tags:
-      tag3: true
-      tag4: false
-    int-tags:
-      tag5: 145
-      tag6: 741]]></value>
-                                    </list>
                                 </model>
                             </output>
                         </option>
diff --git a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache b/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache
index a9abb5ceba8..0fd8455a02a 100644
--- a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache
+++ b/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache
@@ -5,9 +5,9 @@ server.host=0.0.0.0
 # Change the following to true to enable the optional MicroProfile Metrics REST.request metrics
 metrics.rest-request.enabled=false
 
-{{#config-entries}}
+{{#microprofile-config-entries}}
 {{.}}
-{{/config-entries}}
+{{/microprofile-config-entries}}
 
 {{#database-hikari}}
 # Datasource properties
diff --git a/archetypes/helidon/src/main/archetype/mp/custom/custom-mp.xml b/archetypes/helidon/src/main/archetype/mp/custom/custom-mp.xml
index c8ec4650d04..d80a7bb0b4c 100644
--- a/archetypes/helidon/src/main/archetype/mp/custom/custom-mp.xml
+++ b/archetypes/helidon/src/main/archetype/mp/custom/custom-mp.xml
@@ -23,12 +23,13 @@
 
     <exec src="/common/media.xml"/>
     <source src="/common/media-sources.xml"/>
-    <source src="/common/observability.xml"/>
     <exec src="/common/security.xml"/>
     <source src="/common/extra.xml"/>
     <exec src="/common/packaging.xml"/>
+    <source src="/common/observability.xml"/>
     <exec src="/mp/custom/database.xml"/>
     <exec src="/mp/common/common-mp.xml"/>
+    <source src="/mp/custom/observability.xml"/>
     <output>
         <files if="${security}">
             <directory>files</directory>
@@ -47,7 +48,7 @@
                        if="${docker.native-image} &amp;&amp; !(${db})"
                        template="mustache"/>
             </list>
-            <list key="config-entries">
+            <list key="microprofile-config-entries">
                 <value file="files/microprofile-config.properties"/>
             </list>
             <list key="MainTest-java-imports" if="${media.json-lib} == 'jsonp'">
diff --git a/archetypes/helidon/src/main/archetype/mp/custom/observability.xml b/archetypes/helidon/src/main/archetype/mp/custom/observability.xml
new file mode 100644
index 00000000000..f5ebaa28b5d
--- /dev/null
+++ b/archetypes/helidon/src/main/archetype/mp/custom/observability.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022 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.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <output>
+        <model>
+            <list if="${tracing}" key="dependencies">
+                <map order="800">
+                    <value key="groupId">io.helidon.microprofile.tracing</value>
+                    <value key="artifactId">helidon-microprofile-tracing</value>
+                </map>
+            </list>
+            <list if="${tracing}" key="microprofile-config-entries">
+                <value>tracing.service=helidon-service</value>
+                <value>tracing.protocol=https</value>
+                <value>tracing.components.web-server.spans.0.name="HTTP Request"</value>
+            </list>
+            <list if="${tracing}" key="microprofile-config-entries">
+                <value if="${tracing.provider} == 'jaeger'">tracing.host=192.168.1.3</value>
+                <value if="${tracing.provider} == 'jaeger'">tracing.port=14240</value>
+                <value if="${tracing.provider} == 'jaeger'">tracing.path=/api/traces/mine</value>
+                <value if="${tracing.provider} == 'jaeger'">tracing.token=token</value>
+                <value if="${tracing.provider} == 'jaeger'">tracing.propagation=jaeger</value>
+            </list>
+            <list if="${tracing}" key="microprofile-config-entries">
+                <value if="${tracing.provider} == 'zipkin'">tracing.host=192.168.1.1</value>
+                <value if="${tracing.provider} == 'zipkin'">tracing.port=9987</value>
+                <value if="${tracing.provider} == 'zipkin'">tracing.path=/api/v2/spans</value>
+                <value if="${tracing.provider} == 'zipkin'">tracing.api-version=1</value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/helidon/src/main/archetype/se/common/files/src/main/resources/application.yaml.mustache b/archetypes/helidon/src/main/archetype/se/common/files/src/main/resources/application.yaml.mustache
index ce88438f213..a405eec903d 100644
--- a/archetypes/helidon/src/main/archetype/se/common/files/src/main/resources/application.yaml.mustache
+++ b/archetypes/helidon/src/main/archetype/se/common/files/src/main/resources/application.yaml.mustache
@@ -2,9 +2,9 @@ server:
   port: 8080
   host: 0.0.0.0
 
-{{#config-entries}}
+{{#application-yaml-entries}}
 {{.}}
-{{/config-entries}}
+{{/application-yaml-entries}}
 
 {{#security}}
 security:
diff --git a/archetypes/helidon/src/main/archetype/se/custom/custom-se.xml b/archetypes/helidon/src/main/archetype/se/custom/custom-se.xml
index 02ba5e240ba..211a2bb3ee3 100644
--- a/archetypes/helidon/src/main/archetype/se/custom/custom-se.xml
+++ b/archetypes/helidon/src/main/archetype/se/custom/custom-se.xml
@@ -22,12 +22,13 @@
 
     <source src="/common/media.xml"/>
     <source src="/common/media-sources.xml"/>
-    <exec src="/common/observability.xml"/>
     <exec src="/common/security.xml"/>
     <source src="/common/extra.xml"/>
     <exec src="/common/packaging.xml"/>
+    <exec src="/common/observability.xml"/>
     <exec src="/se/custom/database.xml"/>
     <exec src="/se/custom/custom-tests.xml"/>
+    <source src="/se/custom/observability.xml"/>
     <exec src="/se/common/common-se.xml"/>
     <output>
         <model>
@@ -47,7 +48,7 @@
                 <value><![CDATA[                .register("/simple-greet", simpleGreetService)]]></value>
             </list>
             <value key="Main-readyMessage" if="${app-type} != 'quickstart'">System.out.println("WEB server is up! http://localhost:" + ws.port() + "/simple-greet");</value>
-            <list key="config-entries">
+            <list key="application-yaml-entries">
                 <value file="files/src/main/resources/application.config.yaml"/>
             </list>
         </model>
diff --git a/archetypes/helidon/src/main/archetype/se/custom/database.xml b/archetypes/helidon/src/main/archetype/se/custom/database.xml
index 548ae352f14..0a92c19ee08 100644
--- a/archetypes/helidon/src/main/archetype/se/custom/database.xml
+++ b/archetypes/helidon/src/main/archetype/se/custom/database.xml
@@ -43,7 +43,7 @@ This example requires a database.
 Instructions for H2 can be found here: https://www.h2database.com/html/cheatSheet.html
 ]]></value>
                                     </list>
-                                    <list key="config-entries">
+                                    <list key="application-yaml-entries">
                                         <value file="files/application.h2.yaml"/>
                                     </list>
                                     <list key="config-test">
@@ -171,7 +171,7 @@ docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_D
 ```
 ]]></value>
                                     </list>
-                                    <list key="config-entries">
+                                    <list key="application-yaml-entries">
                                         <value file="files/application.mysql.yaml"/>
                                     </list>
                                     <list key="config-test">
@@ -214,7 +214,7 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
 ```
 ]]></value>
                                     </list>
-                                    <list key="config-entries">
+                                    <list key="application-yaml-entries">
                                         <value file="files/application.oracledb.yaml"/>
                                     </list>
                                     <list key="config-test">
@@ -255,7 +255,7 @@ docker run --rm --name mongo -p 27017:27017 mongo
 ```
 ]]></value>
                                     </list>
-                                    <list key="config-entries">
+                                    <list key="application-yaml-entries">
                                         <value file="files/application.mongo.yaml"/>
                                     </list>
                                     <list key="config-test">
diff --git a/archetypes/helidon/src/main/archetype/se/custom/observability.xml b/archetypes/helidon/src/main/archetype/se/custom/observability.xml
new file mode 100644
index 00000000000..c2ff92f3a90
--- /dev/null
+++ b/archetypes/helidon/src/main/archetype/se/custom/observability.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022 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.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <output>
+        <model>
+            <list if="${tracing}" key="application-yaml-entries">
+                <value if="${tracing.provider} == 'jaeger'"><![CDATA[
+tracing:
+    service: "helidon-full-http"
+    protocol: "https"     # JAEGER_ENDPOINT (if not udp, http is expected and endpoint is filled)
+    host: "192.168.1.3"   # JAEGER_ENDPOINT
+    port: 14240           # JAEGER_ENDPOINT
+    path: "/api/traces/mine"   # JAEGER_ENDPOINT
+    token: "token"        # JAEGER_AUTH_TOKEN
+    # Either token or username/password
+    #username:  "user"     # JAEGER_USER
+    #password: "pass"      # JAEGER_PASSWORD
+    propagation: "jaeger" # JAEGER_PROPAGATION either "jaeger" or "b3"
+    log-spans: false      # JAEGER_REPORTER_LOG_SPANS
+    max-queue-size: 42    # JAEGER_REPORTER_MAX_QUEUE_SIZE
+    flush-interval-ms: 10001 # JAEGER_REPORTER_FLUSH_INTERVAL
+    sampler-type: "remote"# JAEGER_SAMPLER_TYPE (https://www.jaegertracing.io/docs/latest/sampling/#client-sampling-configuration)
+    sampler-param: 0.5    # JAEGER_SAMPLER_PARAM (number)
+    sampler-manager: "localhost:47877" # JAEGER_SAMPLER_MANAGER_HOST_PORT
+    tags:
+      tag1: "tag1-value"  # JAEGER_TAGS
+      tag2: "tag2-value"  # JAEGER_TAGS
+    boolean-tags:
+      tag3: true          # JAEGER_TAGS
+      tag4: false         # JAEGER_TAGS
+    int-tags:
+      tag5: 145           # JAEGER_TAGS
+      tag6: 741           # JAEGER_TAGS]]></value>
+            </list>
+            <list if="${tracing}" key="application-yaml-entries">
+                <value if="${tracing.provider} == 'zipkin'"><![CDATA[
+tracing:
+  zipkin:
+    service: "helidon-service"
+    protocol: "https"
+    host: "192.168.1.1"
+    port: 9987
+    api-version: 1
+    # this is the default path for API version 2
+    path: "/api/v2/spans"
+    tags:
+      tag1: "tag1-value"
+      tag2: "tag2-value"
+    boolean-tags:
+      tag3: true
+      tag4: false
+    int-tags:
+      tag5: 145
+      tag6: 741]]></value>
+            </list>
+        </model>
+    </output>
+</archetype-script>

From 2266b5838a31b54ffb26801de86890397175e0be Mon Sep 17 00:00:00 2001
From: tvallin <thibault.vallin@oracle.com>
Date: Thu, 6 Oct 2022 11:07:55 +0200
Subject: [PATCH 2/2] Add documentation

Signed-off-by: tvallin <thibault.vallin@oracle.com>
---
 .../archetype/common/files/README.jaeger.md   | 28 +++++++++++
 .../archetype/common/files/README.zipkin.md   | 47 +++++++++++++++++++
 .../main/archetype/common/observability.xml   |  6 +++
 .../archetype/mp/custom/observability.xml     | 31 ++++++------
 .../archetype/se/custom/observability.xml     |  6 +--
 5 files changed, 99 insertions(+), 19 deletions(-)
 create mode 100644 archetypes/helidon/src/main/archetype/common/files/README.jaeger.md
 create mode 100644 archetypes/helidon/src/main/archetype/common/files/README.zipkin.md

diff --git a/archetypes/helidon/src/main/archetype/common/files/README.jaeger.md b/archetypes/helidon/src/main/archetype/common/files/README.jaeger.md
new file mode 100644
index 00000000000..241f0593419
--- /dev/null
+++ b/archetypes/helidon/src/main/archetype/common/files/README.jaeger.md
@@ -0,0 +1,28 @@
+## Tracing
+
+### Set up Jaeger
+
+First, you need to run the Jaeger tracer. Helidon will communicate with this tracer at runtime.
+
+Run Jaeger within a docker container:
+```
+docker run -d --name jaeger\
+   -e COLLECTOR_ZIPKIN_HOST_PORT=:9411\
+   -e COLLECTOR_OTLP_ENABLED=true\
+   -p 6831:6831/udp\
+   -p 6832:6832/udp\
+   -p 5778:5778\
+   -p 16686:16686\
+   -p 4317:4317\   
+   -p 4318:4318\
+   -p 14250:14250\
+   -p 14268:14268\
+   -p 14269:14269\
+   -p 9411:9411\
+   jaegertracing/all-in-one:1.38
+```
+
+### View Tracing Using Jaeger UI
+
+Jaeger provides a web-based UI at http://localhost:16686, where you can see a visual representation of
+the same data and the relationship between spans within a trace.
diff --git a/archetypes/helidon/src/main/archetype/common/files/README.zipkin.md b/archetypes/helidon/src/main/archetype/common/files/README.zipkin.md
new file mode 100644
index 00000000000..d1ae33b0aea
--- /dev/null
+++ b/archetypes/helidon/src/main/archetype/common/files/README.zipkin.md
@@ -0,0 +1,47 @@
+## Tracing
+
+### Set up Zipkin
+
+First, you need to run the Zipkin tracer. Helidon will communicate with this tracer at runtime.
+
+Run Zipkin within a docker container, then check the Zipkin server health:
+```
+docker run -d --name zipkin -p 9411:9411 openzipkin/zipkin
+```
+Run the Zipkin docker image named openzipkin/zipkin.
+Check the Zipkin server health:
+```
+curl http://localhost:9411/health
+```
+Invoke the Zipkin REST API to check the Zipkin server health.
+```
+Response body
+{
+  "status": "UP",
+  "zipkin": {
+    "status": "UP",
+    "details": {
+      "InMemoryStorage{}": {
+        "status": "UP"
+      }
+    }
+  }
+}
+```
+All status fields should be UP.
+
+### View Tracing Using Zipkin REST API
+
+Run the curl command and check the response:
+```
+curl http://localhost:9411/api/v2/services
+```
+Response body
+```
+["helidon-mp-1"]
+```
+
+### View Tracing Using Zipkin UI
+
+Zipkin provides a web-based UI at http://localhost:9411/zipkin, where you can see a visual representation of 
+the same data and the relationship between spans within a trace.
diff --git a/archetypes/helidon/src/main/archetype/common/observability.xml b/archetypes/helidon/src/main/archetype/common/observability.xml
index 17fe9827b94..0139b94a644 100644
--- a/archetypes/helidon/src/main/archetype/common/observability.xml
+++ b/archetypes/helidon/src/main/archetype/common/observability.xml
@@ -484,6 +484,9 @@ curl -s -X GET http://localhost:8080/health
                                             <value key="artifactId">helidon-tracing-jaeger</value>
                                         </map>
                                     </list>
+                                    <list key="readme-sections">
+                                        <value file="/common/files/README.jaeger.md"/>
+                                    </list>
                                 </model>
                             </output>
                         </option>
@@ -498,6 +501,9 @@ curl -s -X GET http://localhost:8080/health
                                             <value key="artifactId">helidon-tracing-zipkin</value>
                                         </map>
                                     </list>
+                                    <list key="readme-sections">
+                                        <value file="/common/files/README.zipkin.md"/>
+                                    </list>
                                 </model>
                             </output>
                         </option>
diff --git a/archetypes/helidon/src/main/archetype/mp/custom/observability.xml b/archetypes/helidon/src/main/archetype/mp/custom/observability.xml
index f5ebaa28b5d..963b063870d 100644
--- a/archetypes/helidon/src/main/archetype/mp/custom/observability.xml
+++ b/archetypes/helidon/src/main/archetype/mp/custom/observability.xml
@@ -20,30 +20,31 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
     <output>
-        <model>
-            <list if="${tracing}" key="dependencies">
+        <model if="${tracing}">
+            <list key="dependencies">
                 <map order="800">
                     <value key="groupId">io.helidon.microprofile.tracing</value>
                     <value key="artifactId">helidon-microprofile-tracing</value>
                 </map>
             </list>
-            <list if="${tracing}" key="microprofile-config-entries">
+            <list key="microprofile-config-entries">
                 <value>tracing.service=helidon-service</value>
-                <value>tracing.protocol=https</value>
                 <value>tracing.components.web-server.spans.0.name="HTTP Request"</value>
             </list>
-            <list if="${tracing}" key="microprofile-config-entries">
-                <value if="${tracing.provider} == 'jaeger'">tracing.host=192.168.1.3</value>
-                <value if="${tracing.provider} == 'jaeger'">tracing.port=14240</value>
-                <value if="${tracing.provider} == 'jaeger'">tracing.path=/api/traces/mine</value>
-                <value if="${tracing.provider} == 'jaeger'">tracing.token=token</value>
-                <value if="${tracing.provider} == 'jaeger'">tracing.propagation=jaeger</value>
+            <list if="${tracing.provider} == 'jaeger'" key="microprofile-config-entries">
+                <value>tracing.protocol=http</value>
+                <value>tracing.host=localhost</value>
+                <value>tracing.port=14250</value>
+                <value>tracing.path=/api/traces/mine</value>
+                <value>tracing.token=token</value>
+                <value>tracing.propagation=jaeger</value>
             </list>
-            <list if="${tracing}" key="microprofile-config-entries">
-                <value if="${tracing.provider} == 'zipkin'">tracing.host=192.168.1.1</value>
-                <value if="${tracing.provider} == 'zipkin'">tracing.port=9987</value>
-                <value if="${tracing.provider} == 'zipkin'">tracing.path=/api/v2/spans</value>
-                <value if="${tracing.provider} == 'zipkin'">tracing.api-version=1</value>
+            <list if="${tracing.provider} == 'zipkin'" key="microprofile-config-entries">
+                <value>tracing.protocol=https</value>
+                <value>tracing.host=192.168.1.1</value>
+                <value>tracing.port=9987</value>
+                <value>tracing.path=/api/v2/spans</value>
+                <value>tracing.api-version=1</value>
             </list>
         </model>
     </output>
diff --git a/archetypes/helidon/src/main/archetype/se/custom/observability.xml b/archetypes/helidon/src/main/archetype/se/custom/observability.xml
index c2ff92f3a90..62b88e68c9a 100644
--- a/archetypes/helidon/src/main/archetype/se/custom/observability.xml
+++ b/archetypes/helidon/src/main/archetype/se/custom/observability.xml
@@ -20,8 +20,8 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
     <output>
-        <model>
-            <list if="${tracing}" key="application-yaml-entries">
+        <model if="${tracing}">
+            <list key="application-yaml-entries">
                 <value if="${tracing.provider} == 'jaeger'"><![CDATA[
 tracing:
     service: "helidon-full-http"
@@ -49,8 +49,6 @@ tracing:
     int-tags:
       tag5: 145           # JAEGER_TAGS
       tag6: 741           # JAEGER_TAGS]]></value>
-            </list>
-            <list if="${tracing}" key="application-yaml-entries">
                 <value if="${tracing.provider} == 'zipkin'"><![CDATA[
 tracing:
   zipkin: