Skip to content

Commit 15e225d

Browse files
WIP tracing configuration
1 parent 95f4310 commit 15e225d

File tree

5 files changed

+29
-26
lines changed

5 files changed

+29
-26
lines changed

config/stage/dev/otel/otel-collector-config-tls.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ receivers:
1010
max_version: "1.3"
1111

1212
exporters:
13-
jaeger:
14-
endpoint: ops.acme.test:14250
13+
otlp:
14+
endpoint: ops.acme.test:4317
1515
tls:
1616
min_version: "1.2"
1717
max_version: "1.3"
1818
ca_file: /rootca.pem
1919
cert_file: /cert.pem
2020
key_file: /key.pem
21-
logging:
22-
loglevel: debug
21+
debug: {}
22+
2323
processors:
2424
batch:
2525

@@ -32,4 +32,4 @@ service:
3232
traces:
3333
receivers: [otlp]
3434
processors: [batch]
35-
exporters: [jaeger]
35+
exporters: [otlp]

config/stage/dev/otel/otel-collector-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ receivers:
55
endpoint: acme-otel-collector:4317
66

77
exporters:
8-
jaeger:
9-
endpoint: ops.acme.test:14250
8+
otlp:
9+
endpoint: ops.acme.test:4317
1010
tls:
1111
insecure: true
1212

@@ -22,4 +22,4 @@ service:
2222
traces:
2323
receivers: [otlp]
2424
processors: [batch]
25-
exporters: [jaeger]
25+
exporters: [otlp]

deployments/local/dev/docker-compose-tracing-tls.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ services:
88
- ../../../config/stage/dev/tls/acme.test+1.pem:/cert.pem:z
99
- ../../../config/stage/dev/tls/acme.test+1-key.pem:/key.pem:z
1010
- ${CA_ROOT_CERT:-}:/rootca.pem:z
11-
command:
12-
- "--query.http.tls.enabled"
13-
- "--query.http.tls.key=/key.pem"
14-
- "--query.http.tls.cert=/cert.pem"
15-
- "--query.http.tls.min-version=1.2"
16-
- "--query.http.tls.max-version=1.3"
17-
- "--collector.grpc.tls.enabled"
18-
- "--collector.grpc.tls.key=/key.pem"
19-
- "--collector.grpc.tls.cert=/cert.pem"
20-
- "--collector.grpc.tls.min-version=1.2"
21-
- "--collector.grpc.tls.max-version=1.3"
11+
# command:
12+
# - "--query.http.tls.enabled"
13+
# - "--query.http.tls.key=/key.pem"
14+
# - "--query.http.tls.cert=/cert.pem"
15+
# - "--query.http.tls.min-version=1.2"
16+
# - "--query.http.tls.max-version=1.3"
17+
# - "--collector.grpc.tls.enabled"
18+
# - "--collector.grpc.tls.key=/key.pem"
19+
# - "--collector.grpc.tls.cert=/cert.pem"
20+
# - "--collector.grpc.tls.min-version=1.2"
21+
# - "--collector.grpc.tls.max-version=1.3"
2222
# Jaeger sends traces to itself. If we only allow TLS inbound, we need to do this via the hostname
2323
# and validate the certificate
24-
- "--reporter.grpc.tls.enabled"
25-
- "--reporter.grpc.tls.ca=/rootca.pem"
26-
- "--reporter.grpc.host-port=ops.acme.test:14250"
24+
# - "--reporter.grpc.tls.enabled"
25+
# - "--reporter.grpc.tls.ca=/rootca.pem"
26+
# - "--reporter.grpc.host-port=ops.acme.test:14250"
2727
acme-keycloak:
2828
environment:
29-
OTEL_EXPORTER_OTLP_ENDPOINT: 'https://ops.acme.test:4317'
29+
OTEL_EXPORTER_OTLP_ENDPOINT: 'https://ops.acme.test:14317'

deployments/local/dev/docker-compose-tracing.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ services:
1515
- "ops.acme.test:${DOCKER_HOST_IP:-172.17.0.1}"
1616

1717
acme-jaeger:
18-
image: jaegertracing/all-in-one:1.43
18+
image: jaegertracing/jaeger:2.5.0
1919
ports:
2020
- "16686:16686"
21-
- "14250:14250"
21+
- "14317:14317"
22+
- "14318:14318"
2223
extra_hosts:
2324
- "ops.acme.test:${DOCKER_HOST_IP:-172.17.0.1}"
2425

@@ -28,5 +29,5 @@ services:
2829

2930
environment:
3031
# -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.password.file=/opt/keycloak/conf/jmxremote.password
31-
JAVA_TOOL_OPTIONS: '-javaagent:/opt/keycloak/opentelemetry-javaagent.jar -Dotel.javaagent.debug=false -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=8790 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -XX:FlightRecorderOptions=stackdepth=256'
32+
# JAVA_TOOL_OPTIONS: '-javaagent:/opt/keycloak/opentelemetry-javaagent.jar -Dotel.javaagent.debug=false -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=8790 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -XX:FlightRecorderOptions=stackdepth=256'
3233
OTEL_EXPORTER_OTLP_ENDPOINT: 'http://ops.acme.test:4317'

deployments/local/dev/keycloak-tracing.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ OTEL_PROPAGATORS=tracecontext,baggage,jaeger
77
OTEL_METRICS_EXPORTER=none
88
OTEL_TRACES_EXPORTER=otlp
99
#OTEL_EXPORTER_OTLP_ENDPOINT=http://ops.acme.test:4317
10+
# see: https://www.keycloak.org/observability/tracing
11+
KC_TRACING_ENABLED=true

0 commit comments

Comments
 (0)