fix otel docker

MaastrichtU-IDS · Dec 18, 2023 · c9ed074 · c9ed074
1 parent 14b1d61
commit c9ed074
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -15,10 +15,9 @@ services:
       LETSENCRYPT_HOST: openpredict.semanticscience.org
       VIRTUAL_PORT: 8808
 
-      JAEGER_ENABLED: true
+      OTEL_SERVICE_NAME: OPENPREDICT
       JAEGER_HOST: jaeger-otel-agent.sri
       JAEGER_PORT: 6831
-      OTEL_SERVICE_NAME: OPENPREDICT
 
       # OPENPREDICT_APIKEY: ${OPENPREDICT_APIKEY}
 

diff --git a/src/trapi/main.py b/src/trapi/main.py
@@ -112,11 +112,11 @@
 app.include_router(drkg_model_api)
 
 
-def configure_otel(service_name, app):
+def configure_otel(app):
     # open telemetry https://github.com/ranking-agent/aragorn/blob/main/src/otel_config.py#L4
     # https://ncatstranslator.github.io/TranslatorTechnicalDocumentation/deployment-guide/monitoring/
     # https://github.com/TranslatorSRI/Jaeger-demo
-    if os.environ.get('JAEGER_ENABLED') == "True":
+    if os.environ.get('OTEL_SERVICE_NAME'):
         logging.info("starting up jaeger telemetry")
         import warnings
         from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
@@ -132,6 +132,7 @@ def configure_otel(service_name, app):
         # these supresses such warnings.
         logging.captureWarnings(capture=True)
         warnings.filterwarnings("ignore",category=ResourceWarning)
+        service_name = os.environ.get('OTEL_SERVICE_NAME', 'OPENPREDICT')
         trace.set_tracer_provider(
             TracerProvider(
                 resource=Resource.create({telemetery_service_name_key: service_name})
@@ -151,5 +152,4 @@ def configure_otel(service_name, app):
         HTTPXClientInstrumentor().instrument()
 
 # Configure open telemetry if enabled
-service_name = os.environ.get('OTEL_SERVICE_NAME', 'OPENPREDICT')
-configure_otel(service_name, app)
+configure_otel(app)