Skip to content

Commit e15ccff

Browse files
#748 [Observability] Integrating the service map in distributed tracing (#767)
* #748 [Observability] Integrating the service map in distributed tracing --------- Co-authored-by: khanhtranduy <130121475+khanhtranduy@users.noreply.github.com>
1 parent 06c843b commit e15ccff

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ services:
3131
backoffice:
3232
build: ./backoffice-bff
3333
image: ghcr.io/nashtech-garage/yas-backoffice-bff:latest
34-
entrypoint: ["./wait-for-it.sh", "identity:80", "--timeout=300", "--", "java", "-jar", "/backoffice-bff-0.0.1-SNAPSHOT.jar"]
34+
entrypoint: ["./wait-for-it.sh", "identity:80", "--timeout=300", "--", "java", "-jar", "/app.jar"]
3535
environment:
3636
- SPRING_PROFILES_ACTIVE=prod
3737
#SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_KEYCLOAK_ISSUER_URI: http://identity:8080/realms/Yas
@@ -70,7 +70,7 @@ services:
7070
storefront:
7171
build: ./storefront-bff
7272
image: ghcr.io/nashtech-garage/yas-storefront-bff:latest
73-
entrypoint: ["./wait-for-it.sh", "identity:80", "--timeout=300", "--", "java", "-jar", "/storefront-bff-0.0.1-SNAPSHOT.jar"]
73+
entrypoint: ["./wait-for-it.sh", "identity:80", "--timeout=300", "--", "java", "-jar", "/app.jar"]
7474
environment:
7575
- SPRING_PROFILES_ACTIVE=prod
7676
#SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_KEYCLOAK_ISSUER_URI: http://identity:8080/realms/Yas

docker/grafana/provisioning/datasources/datasource.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ datasources:
77
access: proxy
88
url: http://prometheus:9090
99
editable: false
10+
jsonData:
11+
httpMethod: GET
12+
version: 1
1013
# jsonData:
1114
# httpMethod: POST
1215
# exemplarTraceIdDestinations:
@@ -30,6 +33,8 @@ datasources:
3033
httpMethod: GET
3134
tracesToLogs:
3235
datasourceUid: 'loki'
36+
serviceMap:
37+
datasourceUid: 'prometheus'
3338
- name: Loki
3439
type: loki
3540
uid: loki

docker/otel-collector/otelcol-config.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,17 @@ receivers:
99
allowed_origins:
1010
- "http://*"
1111
- "https://*"
12+
13+
connectors:
14+
servicegraph:
15+
latency_histogram_buckets: [100ms, 250ms, 1s, 5s, 10s]
16+
dimensions:
17+
- dimension-1
18+
- dimension-2
19+
store:
20+
ttl: 2s
21+
max_items: 20
22+
1223
exporters:
1324
debug:
1425
verbosity: detailed
@@ -72,9 +83,9 @@ service:
7283
traces:
7384
receivers: [otlp]
7485
processors: [batch]
75-
exporters: [otlp]
86+
exporters: [otlp, servicegraph]
7687
metrics:
77-
receivers: [otlp]
88+
receivers: [otlp, servicegraph]
7889
processors: [transform, batch]
7990
exporters: [prometheus]
8091
logs:

0 commit comments

Comments
 (0)