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

Archetype generates wrong Jaeger configuration (SE) #5920

Merged
merged 3 commits into from
Jan 30, 2023
Merged

Archetype generates wrong Jaeger configuration (SE) #5920

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eed8bae
Archetype Helidon SE - register tracer
tvallin Jan 20, 2023
5163744
review changes
tvallin Jan 20, 2023
2697a41
remove unnecessary config
tvallin Jan 30, 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
42 changes: 18 additions & 24 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
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2022 Oracle and/or its affiliates.
Copyright (c) 2022, 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 All @@ -21,34 +21,21 @@
xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
<output>
<model if="${tracing}">
<list key="Main-helidon-imports">
<value>io.helidon.tracing.TracerBuilder</value>
</list>
<list key="Main-serverBuilder">
<value> .tracer(TracerBuilder.create(config.get("tracing")).build())</value>
</list>
<list 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)
host: "localhost" # JAEGER_ENDPOINT
port: 14250 # JAEGER_ENDPOINT
sampler-type: "ratio" # JAEGER_SAMPLER_TYPE (https://www.jaegertracing.io/docs/latest/sampling/#client-sampling-configuration)
tvallin marked this conversation as resolved.
Show resolved Hide resolved
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>
]]></value>
<value if="${tracing.provider} == 'zipkin'"><![CDATA[
tracing:
zipkin:
Expand All @@ -69,6 +56,13 @@ tracing:
tag5: 145
tag6: 741]]></value>
</list>
<list key="config-test">
<value><![CDATA[
tracing:
service: "testing-service"
global: false
]]></value>
</list>
</model>
</output>
</archetype-script>