Merge pull request #189 from WengLab-InformaticsResearch/jaeger

Jaeger

Author: CaseyTa

cohd/app.py

@@ -11,6 +11,7 @@
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from opentelemetry.exporter.jaeger.thrift import JaegerExporter
 from opentelemetry.instrumentation.requests import RequestsInstrumentor
+from opentelemetry.instrumentation.pymysql import PyMySQLInstrumentor
 
 #########
 # INITS #
@@ -50,17 +51,17 @@
 logging.info('About to instrument app for OTEL')
 # set the service name for our trace provider 
 # this will tag every trace with the service name given
+otel_service_name = app.config.get('OTEL_SERVICE_NAME', 'COHD')
 tp = TracerProvider(
-        resource=Resource.create({telemetery_service_name_key: 'COHD'})
+        resource=Resource.create({telemetery_service_name_key: otel_service_name})
     )
 # create an exporter to jaeger     
-jaeger_host = 'jaeger'
+jaeger_host = app.config.get('JAEGER_HOST', 'jaeger-otel-agent.sri')
+jaeger_port = app.config.get('JAEGER_PORT', 6831)
 deployment_env = app.config.get('DEPLOYMENT_ENV', 'dev')
-if deployment_env[:4] == 'ITRB':
-    jaeger_host = 'jaeger-otel-agent.sri'
 jaeger_exporter = JaegerExporter(
             agent_host_name=jaeger_host,
-            agent_port=6831,
+            agent_port=jaeger_port,
         )
 # here we use the exporter to export each span in a trace
 tp.add_span_processor(
@@ -74,4 +75,5 @@
 FlaskInstrumentor().instrument_app(app,
                                    excluded_urls=otel_excluded_urls)
 RequestsInstrumentor().instrument()
+PyMySQLInstrumentor().instrument()
 logging.info('Finished instrumenting app for OTEL')

cohd/cohd_flask.conf

@@ -7,5 +7,10 @@ CACHE_THRESHOLD = 100000
 DEV_KEY = 'CHANGE_ME'
 DATABASES = ['cohd']
 
+# OpenTelemetry Settings
+OTEL_SERVICE_NAME = 'COHD'
+JAEGER_HOST = 'jaeger-otel-agent.sri'
+JAEGER_PORT = 6831
+
 # Google Analytics: uncomment and set tracking ID to use Google Analytics
 # GA_TID = 'UA-XXXXX-Y'

requirements.txt

@@ -14,4 +14,5 @@ linkml-runtime<1.6.0
 opentelemetry-sdk
 opentelemetry-instrumentation-flask
 opentelemetry-exporter-jaeger
-opentelemetry-instrumentation-requests
+opentelemetry-instrumentation-requests
+opentelemetry-instrumentation-pymysql