mirror of
https://git.linux-kernel.at/oliver/ivatar.git
synced 2025-11-11 18:56:23 +00:00
Merge master into devel - resolve OpenTelemetry middleware conflict
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user