Revert "#2378 Explicitly setting Trace Provider globally"

This reverts commit c4cc099.
RTXteam · Sep 24, 2024 · 4ec56ac · 4ec56ac
1 parent c4cc099
commit 4ec56ac
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/code/UI/OpenAPI/python-flask-server/KG2/openapi_server/__main__.py b/code/UI/OpenAPI/python-flask-server/KG2/openapi_server/__main__.py
@@ -41,12 +41,12 @@ def eprint(*args, **kwargs): print(*args, file=sys.stderr, **kwargs)
 def instrument(app, host, port):
 
     service_name = "RTX-KG2"
-    tracer_provider = TracerProvider(
+
+    trace.set_tracer_provider(TracerProvider(
         resource=Resource.create({
             ResourceAttributes.SERVICE_NAME: service_name
         })
-    )
-    trace.set_tracer_provider(tracer_provider)
+    ))
     trace.get_tracer_provider().add_span_processor(
         BatchSpanProcessor(
             JaegerExporter(
@@ -56,10 +56,10 @@ def instrument(app, host, port):
         )
     )
     # trace.get_tracer_provider().get_tracer(__name__)
-    tracer = trace.get_tracer(__name__)
-    FlaskInstrumentor().instrument_app(app=app.app, tracer_provider=tracer_provider)
-    RequestsInstrumentor().instrument(tracer_provider=tracer_provider)
-    AioHttpClientInstrumentor().instrument(tracer_provider=tracer_provider)
+    tracer_provider = trace.get_tracer(__name__)
+    FlaskInstrumentor().instrument_app(app=app.app, tracer_provider=trace)
+    RequestsInstrumentor().instrument(tracer_provider=trace)
+    AioHttpClientInstrumentor().instrument(tracer_provider=trace)
 
 def main():
 

diff --git a/code/UI/OpenAPI/python-flask-server/openapi_server/__main__.py b/code/UI/OpenAPI/python-flask-server/openapi_server/__main__.py
@@ -42,12 +42,11 @@ def instrument(app, host, port):
 
     service_name = "ARAX"
 
-    tracer_provider = TracerProvider(
+    trace.set_tracer_provider(TracerProvider(
         resource=Resource.create({
             ResourceAttributes.SERVICE_NAME: service_name
         })
-    )
-    trace.set_tracer_provider(tracer_provider)
+    ))
     trace.get_tracer_provider().add_span_processor(
         BatchSpanProcessor(
             JaegerExporter(
@@ -56,11 +55,13 @@ def instrument(app, host, port):
         )
         )
     )
-    # trace.get_tracer_provider().get_tracer(__name__)
-    tracer = trace.get_tracer(__name__)
-    FlaskInstrumentor().instrument_app(app=app.app, tracer_provider=tracer_provider)
-    RequestsInstrumentor().instrument(tracer_provider=tracer_provider)
-    AioHttpClientInstrumentor().instrument(tracer_provider=tracer_provider)
+    # tracer_provider = trace.get_tracer_provider()
+    # tracer_provider.get_tracer(__name__)
+    tracer_provider = trace.get_tracer(__name__)
+
+    FlaskInstrumentor().instrument_app(app=app.app, tracer_provider=trace)
+    RequestsInstrumentor().instrument(tracer_provider=trace)
+    AioHttpClientInstrumentor().instrument(tracer_provider=trace)