Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.x: Archetype - fix SE zipkin configuration #8141

Merged
merged 3 commits into from
Dec 13, 2023
Merged

3.x: Archetype - fix SE zipkin configuration #8141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b399aa6
fix zipkin config
tvallin Dec 12, 2023
eac299a
fix zipkin documentation
tvallin Dec 12, 2023
948f1e2
copyright
tvallin Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 21 additions & 22 deletions archetypes/helidon/src/main/archetype/se/custom/observability.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[
Expand Down
35 changes: 17 additions & 18 deletions docs/includes/tracing/tracer-zipkin.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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:
Expand Down
Loading