From b31a1cb1f4c6f7603f8356da72075c7a4eaf26ea Mon Sep 17 00:00:00 2001
From: Thibault Vallin <thibault.vallin@oracle.com>
Date: Wed, 13 Dec 2023 09:19:52 +0100
Subject: [PATCH] 3.x: Archetype - fix SE zipkin configuration (#8141)

Signed-off-by: tvallin <thibault.vallin@oracle.com>
---
 .../archetype/se/custom/observability.xml     | 43 +++++++++----------
 docs/includes/tracing/tracer-zipkin.adoc      | 35 ++++++++-------
 2 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/archetypes/helidon/src/main/archetype/se/custom/observability.xml b/archetypes/helidon/src/main/archetype/se/custom/observability.xml
index 83fd5ebf7c2..c6eed034c42 100644
--- a/archetypes/helidon/src/main/archetype/se/custom/observability.xml
+++ b/archetypes/helidon/src/main/archetype/se/custom/observability.xml
@@ -30,31 +30,30 @@
             <list key="application-yaml-entries">
                 <value if="${tracing.provider} == 'jaeger'"><![CDATA[
 tracing:
-    service: "helidon-full-http"
-    host: "localhost"     # JAEGER_ENDPOINT
-    port: 14250           # JAEGER_ENDPOINT
-    sampler-type: "ratio" # JAEGER_SAMPLER_TYPE (https://www.jaegertracing.io/docs/latest/sampling/#client-sampling-configuration)
-    sampler-param: 0.5    # JAEGER_SAMPLER_PARAM (number)
+  service: "helidon-full-http"
+  host: "localhost"     # JAEGER_ENDPOINT
+  port: 14250           # JAEGER_ENDPOINT
+  sampler-type: "ratio" # JAEGER_SAMPLER_TYPE (https://www.jaegertracing.io/docs/latest/sampling/#client-sampling-configuration)
+  sampler-param: 0.5    # JAEGER_SAMPLER_PARAM (number)
 ]]></value>
                 <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>
+  service: "helidon-service"
+  protocol: "http"
+  host: "localhost"
+  port: 9411
+  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>
             <list key="config-test">
                 <value><![CDATA[
diff --git a/docs/includes/tracing/tracer-zipkin.adoc b/docs/includes/tracing/tracer-zipkin.adoc
index 7ddfd33e72c..dad8b7097aa 100644
--- a/docs/includes/tracing/tracer-zipkin.adoc
+++ b/docs/includes/tracing/tracer-zipkin.adoc
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2019, 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.
@@ -47,23 +47,22 @@ The following is an example of a Zipkin configuration, specified in the YAML for
 [source,yaml]
 ----
 tracing:
-  zipkin:
-    service: "helidon-service"
-    protocol: "https"
-    host: "zipkin"
-    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
+  service: "helidon-service"
+  protocol: "https"
+  host: "zipkin"
+  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
 ----
 
 Example of Zipkin trace: