From 1a51c4a3dd5ec70eb8ed6770344070331e18bfcf Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Thu, 26 Jun 2025 07:41:44 +1000
Subject: [PATCH] Fix for tracing init (#9860)

- Circular include means that settings.DB_ENGINE may not be available
---
 src/backend/InvenTree/InvenTree/settings.py |  2 +-
 src/backend/InvenTree/InvenTree/tracing.py  | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/backend/InvenTree/InvenTree/settings.py b/src/backend/InvenTree/InvenTree/settings.py
index e9e9dc99f7..548b0cb6a5 100644
--- a/src/backend/InvenTree/InvenTree/settings.py
+++ b/src/backend/InvenTree/InvenTree/settings.py
@@ -878,7 +878,7 @@ if TRACING_ENABLED:  # pragma: no cover
 
         # Run tracing/logging instrumentation
         setup_tracing(**TRACING_DETAILS)
-        setup_instruments()
+        setup_instruments(DB_ENGINE)
     else:
         logger.warning('OpenTelemetry tracing not enabled because endpoint is not set')
 
diff --git a/src/backend/InvenTree/InvenTree/tracing.py b/src/backend/InvenTree/InvenTree/tracing.py
index e9c66060e6..d0ba62dc5f 100644
--- a/src/backend/InvenTree/InvenTree/tracing.py
+++ b/src/backend/InvenTree/InvenTree/tracing.py
@@ -4,8 +4,6 @@ import base64
 import logging
 from typing import Optional
 
-from django.conf import settings
-
 from opentelemetry import metrics, trace
 from opentelemetry.instrumentation.django import DjangoInstrumentor
 from opentelemetry.instrumentation.redis import RedisInstrumentor
@@ -75,7 +73,7 @@ def setup_tracing(
     headers = {k: v for k, v in headers.items() if v is not None}
 
     # Initialize the OTLP Resource
-    service_name = 'Unkown'
+    service_name = 'Unknown'
     if InvenTree.ready.isInServerThread():
         service_name = 'BACKEND'
     elif InvenTree.ready.isInWorkerThread():
@@ -107,7 +105,7 @@ def setup_tracing(
             OTLPSpanExporter,
         )
 
-    # Spans / Tracs
+    # Spans / Traces
     span_exporter = OTLPSpanExporter(
         headers=headers,
         endpoint=endpoint if not (is_http and append_http) else f'{endpoint}/v1/traces',
@@ -121,7 +119,7 @@ def setup_tracing(
         trace_provider.add_span_processor(BatchSpanProcessor(ConsoleSpanExporter()))
 
     # Metrics
-    metric_perodic_reader = PeriodicExportingMetricReader(
+    metric_periodic_reader = PeriodicExportingMetricReader(
         OTLPMetricExporter(
             headers=headers,
             endpoint=endpoint
@@ -129,7 +127,7 @@ def setup_tracing(
             else f'{endpoint}/v1/metrics',
         )
     )
-    metric_readers = [metric_perodic_reader]
+    metric_readers = [metric_periodic_reader]
 
     # For debugging purposes, export the metrics to the console
     if console:
@@ -158,17 +156,17 @@ def setup_tracing(
     TRACE_PROV = trace_provider
 
 
-def setup_instruments():  # pragma: no cover
-    """Run auto-insturmentation for OpenTelemetry tracing."""
+def setup_instruments(db_engine: str):  # pragma: no cover
+    """Run auto-instrumentation for OpenTelemetry tracing."""
     DjangoInstrumentor().instrument()
     RedisInstrumentor().instrument()
     RequestsInstrumentor().instrument()
     SystemMetricsInstrumentor().instrument()
 
     # DBs
-    if settings.DB_ENGINE == 'sqlite':
+    if db_engine == 'sqlite':
         SQLite3Instrumentor().instrument()
-    elif settings.DB_ENGINE == 'postgresql':
+    elif db_engine == 'postgresql':
         try:
             from opentelemetry.instrumentation.psycopg import PsycopgInstrumentor
 
@@ -177,7 +175,7 @@ def setup_instruments():  # pragma: no cover
             )
         except ModuleNotFoundError:
             pass
-    elif settings.DB_ENGINE == 'mysql':
+    elif db_engine == 'mysql':
         try:
             from opentelemetry.instrumentation.pymysql import PyMySQLInstrumentor