Merge branch 'master' into refactor-gh-workflow-file

Author: bisgaard-itis

services/web/server/tests/unit/isolated/test_tracing.py

@@ -17,14 +17,15 @@
 def mock_webserver_service_environment(
     monkeypatch: pytest.MonkeyPatch, mock_webserver_service_environment: EnvVarsDict
 ) -> EnvVarsDict:
-
-    return mock_webserver_service_environment | setenvs_from_dict(
+    monkeypatch.delenv("WEBSERVER_TRACING")
+    envs = mock_webserver_service_environment | setenvs_from_dict(
         monkeypatch,
         {
             "TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT": "http://opentelemetry-collector",
             "TRACING_OPENTELEMETRY_COLLECTOR_PORT": "4318",
         },
     )
+    return envs
 
 
 def test_middleware_restrictions_opentelemetry_is_second_middleware(