From 396c28817c65b62ab1168994f6913b63d55af6c9 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Tue, 11 Mar 2025 18:55:30 +0000
Subject: [PATCH] refac

---
 backend/open_webui/env.py                                 | 2 +-
 backend/open_webui/main.py                                | 8 ++++----
 backend/open_webui/utils/{trace => telemetry}/__init__.py | 0
 .../open_webui/utils/{trace => telemetry}/constants.py    | 0
 .../open_webui/utils/{trace => telemetry}/exporters.py    | 0
 .../utils/{trace => telemetry}/instrumentors.py           | 2 +-
 backend/open_webui/utils/{trace => telemetry}/setup.py    | 4 ++--
 backend/requirements.txt                                  | 3 +--
 8 files changed, 9 insertions(+), 10 deletions(-)
 rename backend/open_webui/utils/{trace => telemetry}/__init__.py (100%)
 rename backend/open_webui/utils/{trace => telemetry}/constants.py (100%)
 rename backend/open_webui/utils/{trace => telemetry}/exporters.py (100%)
 rename backend/open_webui/utils/{trace => telemetry}/instrumentors.py (98%)
 rename backend/open_webui/utils/{trace => telemetry}/setup.py (85%)

diff --git a/backend/open_webui/env.py b/backend/open_webui/env.py
index c7a0d6a73..1515e4ae2 100644
--- a/backend/open_webui/env.py
+++ b/backend/open_webui/env.py
@@ -437,7 +437,7 @@ AUDIT_EXCLUDED_PATHS = [path.lstrip("/") for path in AUDIT_EXCLUDED_PATHS]
 # OPENTELEMETRY
 ####################################
 
-OTEL_SDK_DISABLED = os.environ.get("OTEL_SDK_DISABLED", "true").lower() == "true"
+ENABLE_OTEL = os.environ.get("ENABLE_OTEL", "False").lower() == "true"
 OTEL_EXPORTER_OTLP_ENDPOINT = os.environ.get(
     "OTEL_EXPORTER_OTLP_ENDPOINT", "http://localhost:4317"
 )
diff --git a/backend/open_webui/main.py b/backend/open_webui/main.py
index 8033481b4..09606cfdf 100644
--- a/backend/open_webui/main.py
+++ b/backend/open_webui/main.py
@@ -330,7 +330,7 @@ from open_webui.env import (
     BYPASS_MODEL_ACCESS_CONTROL,
     RESET_CONFIG_ON_START,
     OFFLINE_MODE,
-    OTEL_SDK_DISABLED,
+    ENABLE_OTEL,
 )
 
 
@@ -357,7 +357,7 @@ from open_webui.utils.oauth import OAuthManager
 from open_webui.utils.security_headers import SecurityHeadersMiddleware
 
 from open_webui.tasks import stop_task, list_tasks  # Import from tasks.py
-from open_webui.utils.trace.setup import setup
+from open_webui.utils.telemetry.setup import setup as setup_opentelemetry
 
 if SAFE_MODE:
     print("SAFE MODE ENABLED")
@@ -434,8 +434,8 @@ app.state.LICENSE_METADATA = None
 #
 ########################################
 
-if not OTEL_SDK_DISABLED:
-    setup(app=app, db_engine=engine)
+if not ENABLE_OTEL:
+    setup_opentelemetry(app=app, db_engine=engine)
 
 
 ########################################
diff --git a/backend/open_webui/utils/trace/__init__.py b/backend/open_webui/utils/telemetry/__init__.py
similarity index 100%
rename from backend/open_webui/utils/trace/__init__.py
rename to backend/open_webui/utils/telemetry/__init__.py
diff --git a/backend/open_webui/utils/trace/constants.py b/backend/open_webui/utils/telemetry/constants.py
similarity index 100%
rename from backend/open_webui/utils/trace/constants.py
rename to backend/open_webui/utils/telemetry/constants.py
diff --git a/backend/open_webui/utils/trace/exporters.py b/backend/open_webui/utils/telemetry/exporters.py
similarity index 100%
rename from backend/open_webui/utils/trace/exporters.py
rename to backend/open_webui/utils/telemetry/exporters.py
diff --git a/backend/open_webui/utils/trace/instrumentors.py b/backend/open_webui/utils/telemetry/instrumentors.py
similarity index 98%
rename from backend/open_webui/utils/trace/instrumentors.py
rename to backend/open_webui/utils/telemetry/instrumentors.py
index d629aa4ca..0ba42efd4 100644
--- a/backend/open_webui/utils/trace/instrumentors.py
+++ b/backend/open_webui/utils/telemetry/instrumentors.py
@@ -26,7 +26,7 @@ from requests import PreparedRequest, Response
 from sqlalchemy import Engine
 from fastapi import status
 
-from open_webui.utils.trace.constants import SPAN_REDIS_TYPE, SpanAttributes
+from open_webui.utils.telemetry.constants import SPAN_REDIS_TYPE, SpanAttributes
 
 from open_webui.env import SRC_LOG_LEVELS
 
diff --git a/backend/open_webui/utils/trace/setup.py b/backend/open_webui/utils/telemetry/setup.py
similarity index 85%
rename from backend/open_webui/utils/trace/setup.py
rename to backend/open_webui/utils/telemetry/setup.py
index aaab1df69..eb6a238c8 100644
--- a/backend/open_webui/utils/trace/setup.py
+++ b/backend/open_webui/utils/telemetry/setup.py
@@ -5,8 +5,8 @@ from opentelemetry.sdk.resources import SERVICE_NAME, Resource
 from opentelemetry.sdk.trace import TracerProvider
 from sqlalchemy import Engine
 
-from open_webui.utils.trace.exporters import LazyBatchSpanProcessor
-from open_webui.utils.trace.instrumentors import Instrumentor
+from open_webui.utils.telemetry.exporters import LazyBatchSpanProcessor
+from open_webui.utils.telemetry.instrumentors import Instrumentor
 from open_webui.env import OTEL_SERVICE_NAME, OTEL_EXPORTER_OTLP_ENDPOINT
 
 
diff --git a/backend/requirements.txt b/backend/requirements.txt
index 2f1728336..0a6eba262 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -130,5 +130,4 @@ opentelemetry-instrumentation-redis==0.51b0
 opentelemetry-instrumentation-requests==0.51b0
 opentelemetry-instrumentation-logging==0.51b0
 opentelemetry-instrumentation-httpx==0.51b0
-opentelemetry-instrumentation-aiohttp-client==0.51b0
-opentelemetry-instrumentation-loguru==0.51b0
+opentelemetry-instrumentation-aiohttp-client==0.51b0
\ No newline at end of file