diff options
author | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2023-09-06 08:32:33 +0200 |
---|---|---|
committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2023-09-11 10:29:53 +0200 |
commit | c3c2eec967891108459c45786f8e98a85004e678 (patch) | |
tree | 2d79ce5e08658f05d054367693a905813dd80172 /development | |
parent | 1a23a1bcdf17ba4cf1cafb8e65babd1ad8666e59 (diff) |
Add Micrometer [bff]montreal
- add Micrometer dependencies
- uses Zipkin as trace protocol, typically for port 9411
- requires changing dependency injection of WebClient.Builder [1]
[1] Micrometer is injecting the trace context into the WebClient.Builder bean.
To add the ExchangeFilterFunctions for authentication, errorhandling and logging, the existing bean needs to be modified instead of statically creating a new one
Issue-ID: PORTALNG-57
Change-Id: I13dd18d297cd56fa2dfbb525723c79f4abb41f87
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'development')
-rw-r--r-- | development/.env | 4 | ||||
-rw-r--r-- | development/docker-compose.yml | 19 |
2 files changed, 22 insertions, 1 deletions
diff --git a/development/.env b/development/.env index 2a2a73d..6cf5579 100644 --- a/development/.env +++ b/development/.env @@ -20,6 +20,10 @@ POSTGRES_VERSION=15rc1 MONGO_IMAGE=mongo MONGO_VERSION=latest +# tracing +COLLECTOR_HOST=jaeger +COLLECTOR_PORT=9411 + # preferences PREFERENCES_IMAGE_NAME=preferences PREFERENCES_IMAGE_TAG=latest diff --git a/development/docker-compose.yml b/development/docker-compose.yml index 1e7d282..10946d4 100644 --- a/development/docker-compose.yml +++ b/development/docker-compose.yml @@ -52,6 +52,8 @@ services: MONGO_PORT: ${HISTORY_MONGO_PORT} KEYCLOAK_URL: ${KEYCLOAK_URL} KEYCLOAK_REALM: ${KEYCLOAK_REALM} + COLLECTOR_HOST: ${COLLECTOR_HOST} + COLLECTOR_PORT: ${COLLECTOR_PORT} depends_on: - mongo-history mongo-preferences: @@ -73,5 +75,20 @@ services: MONGO_PORT: ${PREFERENCES_MONGO_PORT} KEYCLOAK_URL: ${KEYCLOAK_URL} KEYCLOAK_REALM: ${KEYCLOAK_REALM} + COLLECTOR_HOST: ${COLLECTOR_HOST} + COLLECTOR_PORT: ${COLLECTOR_PORT} depends_on: - - mongo-preferences
\ No newline at end of file + - mongo-preferences + jaeger: + image: jaegertracing/all-in-one:latest + container_name: jaeger + ports: + - 5775:5775/udp + - 6831:6831/udp + - 6832:6832/udp + - 5778:5778 + - 16686:16686 + - 14268:14268 + - 9411:9411 + environment: + COLLECTOR_ZIPKIN_HOST_PORT: 9411
\ No newline at end of file |