Skip to content

Commit 0c27024

Browse files
author
Andrei Neagu
committed
added tracing to agent service
1 parent 72766b4 commit 0c27024

File tree

5 files changed

+15
-0
lines changed

5 files changed

+15
-0
lines changed

.env-devel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ AGENT_VOLUMES_CLEANUP_S3_ENDPOINT=http://172.17.0.1:9001
1717
AGENT_VOLUMES_CLEANUP_S3_PROVIDER=MINIO
1818
AGENT_VOLUMES_CLEANUP_S3_REGION=us-east-1
1919
AGENT_VOLUMES_CLEANUP_S3_SECRET_KEY=12345678
20+
AGENT_TRACING={}
2021

2122
API_SERVER_DEV_FEATURES_ENABLED=0
2223
API_SERVER_LOGLEVEL=INFO

services/agent/src/simcore_service_agent/core/application.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
get_common_oas_options,
66
override_fastapi_openapi_method,
77
)
8+
from servicelib.fastapi.tracing import setup_tracing
89
from servicelib.logging_utils import config_all_loggers
910

1011
from .._meta import (
@@ -59,6 +60,9 @@ def create_app() -> FastAPI:
5960
setup_rest_api(app)
6061
setup_rpc_api_routes(app)
6162

63+
if settings.AGENT_TRACING:
64+
setup_tracing(app, settings.AGENT_TRACING, APP_NAME)
65+
6266
async def _on_startup() -> None:
6367
print(APP_STARTED_BANNER_MSG, flush=True) # noqa: T201
6468

services/agent/src/simcore_service_agent/core/settings.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from settings_library.base import BaseCustomSettings
77
from settings_library.r_clone import S3Provider
88
from settings_library.rabbit import RabbitSettings
9+
from settings_library.tracing import TracingSettings
910
from settings_library.utils_logging import MixinLoggingSettings
1011

1112

@@ -77,6 +78,10 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
7778
auto_default_from_env=True, description="settings for service/rabbitmq"
7879
)
7980

81+
AGENT_TRACING: TracingSettings | None = Field(
82+
auto_default_from_env=True, description="settings for opentelemetry tracing"
83+
)
84+
8085
@validator("LOGLEVEL")
8186
@classmethod
8287
def valid_log_level(cls, value) -> LogLevel:

services/agent/tests/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ def mock_environment(
5858
"RABBIT_SECURE": "false",
5959
"RABBIT_USER": "test",
6060
"AGENT_DOCKER_NODE_ID": docker_node_id,
61+
"AGENT_TRACING": "null",
6162
},
6263
)
6364

services/docker-compose.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,6 +1053,10 @@ services:
10531053
RABBIT_USER: ${RABBIT_USER}
10541054
RABBIT_SECURE: ${RABBIT_SECURE}
10551055

1056+
AGENT_TRACING: ${AGENT_TRACING}
1057+
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
1058+
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
1059+
10561060
dask-sidecar:
10571061
image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG:-latest}
10581062
init: true

0 commit comments

Comments
 (0)