enabling instrumentation

Andrei Neagu · Andrei Neagu · commit 6d25e446ba74 · 2024-09-13T12:03:04.000+02:00
diff --git a/services/director-v2/tests/integration/02/test_dynamic_services_routes.py b/services/director-v2/tests/integration/02/test_dynamic_services_routes.py
@@ -187,6 +187,7 @@ async def director_v2_client(
             "REDIS_HOST": redis_settings.REDIS_HOST,
             "REDIS_PORT": f"{redis_settings.REDIS_PORT}",
             "REDIS_PASSWORD": f"{redis_settings.REDIS_PASSWORD.get_secret_value()}",
+            "DIRECTOR_V2_PROMETHEUS_INSTRUMENTATION_ENABLED": "1",
         },
     )
     monkeypatch.delenv("DYNAMIC_SIDECAR_MOUNT_PATH_DEV", raising=False)
diff --git a/services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py b/services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py
@@ -401,6 +401,7 @@ def mock_env(
             "COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED": "true",
             "COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_URL": dask_scheduler_service,
             "COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH": dask_scheduler_auth.json(),
+            "DIRECTOR_V2_PROMETHEUS_INSTRUMENTATION_ENABLED": "1",
         },
     )
     monkeypatch.delenv("DYNAMIC_SIDECAR_MOUNT_PATH_DEV", raising=False)
diff --git a/services/director-v2/tests/integration/02/test_mixed_dynamic_sidecar_and_legacy_project.py b/services/director-v2/tests/integration/02/test_mixed_dynamic_sidecar_and_legacy_project.py
@@ -80,6 +80,7 @@ def mock_env(
         "COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED": "false",
         "COMPUTATIONAL_BACKEND_ENABLED": "false",
         "R_CLONE_PROVIDER": "MINIO",
+        "DIRECTOR_V2_PROMETHEUS_INSTRUMENTATION_ENABLED": "1",
     }
     setenvs_from_dict(monkeypatch, env_vars)
     monkeypatch.delenv("DYNAMIC_SIDECAR_MOUNT_PATH_DEV", raising=False)

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,7 @@ async def director_v2_client(`
`187`	`187`	`"REDIS_HOST": redis_settings.REDIS_HOST,`
`188`	`188`	`"REDIS_PORT": f"{redis_settings.REDIS_PORT}",`
`189`	`189`	`"REDIS_PASSWORD": f"{redis_settings.REDIS_PASSWORD.get_secret_value()}",`
	`190`	`+ "DIRECTOR_V2_PROMETHEUS_INSTRUMENTATION_ENABLED": "1",`
`190`	`191`	`},`
`191`	`192`	`)`
`192`	`193`	`monkeypatch.delenv("DYNAMIC_SIDECAR_MOUNT_PATH_DEV", raising=False)`
Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,7 @@ def mock_env(`
`401`	`401`	`"COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED": "true",`
`402`	`402`	`"COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_URL": dask_scheduler_service,`
`403`	`403`	`"COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH": dask_scheduler_auth.json(),`
	`404`	`+ "DIRECTOR_V2_PROMETHEUS_INSTRUMENTATION_ENABLED": "1",`
`404`	`405`	`},`
`405`	`406`	`)`
`406`	`407`	`monkeypatch.delenv("DYNAMIC_SIDECAR_MOUNT_PATH_DEV", raising=False)`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ def mock_env(`
`80`	`80`	`"COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED": "false",`
`81`	`81`	`"COMPUTATIONAL_BACKEND_ENABLED": "false",`
`82`	`82`	`"R_CLONE_PROVIDER": "MINIO",`
	`83`	`+ "DIRECTOR_V2_PROMETHEUS_INSTRUMENTATION_ENABLED": "1",`
`83`	`84`	`}`
`84`	`85`	`setenvs_from_dict(monkeypatch, env_vars)`
`85`	`86`	`monkeypatch.delenv("DYNAMIC_SIDECAR_MOUNT_PATH_DEV", raising=False)`