Merge master into devel - resolve OpenTelemetry middleware conflict

This commit is contained in:
Oliver Falk
2025-10-18 11:31:26 +02:00

View File

@@ -317,7 +317,9 @@ try:
setup_opentelemetry() setup_opentelemetry()
MIDDLEWARE.append("ivatar.opentelemetry_middleware.OpenTelemetryMiddleware") # Add OpenTelemetry middleware (always enabled)
# TODO: Need to reenable this again!
# MIDDLEWARE.append("ivatar.opentelemetry_middleware.OpenTelemetryMiddleware")
except (ImportError, NameError): except (ImportError, NameError):
# OpenTelemetry packages not installed or configuration failed # OpenTelemetry packages not installed or configuration failed
pass pass