fix broken things

dagster-io · Sep 10, 2024 · 1e6b92b · 1e6b92b
1 parent ded9934
commit 1e6b92b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/python_modules/dagster/dagster/_core/execution/run_metrics_thread.py b/python_modules/dagster/dagster/_core/execution/run_metrics_thread.py
@@ -13,7 +13,7 @@
 from dagster._utils.container import retrieve_containerized_utilization_metrics
 
 DEFAULT_RUN_METRICS_POLL_INTERVAL_SECONDS = 30.0
-DEFAULT_RUN_METRICS_SHUTDOWN_SECONDS = 15.0
+DEFAULT_RUN_METRICS_SHUTDOWN_SECONDS = 15
 
 
 def _get_platform_name() -> str:

diff --git a/python_modules/dagster/dagster_tests/core_tests/execution_tests/test_run_metrics_thread.py b/python_modules/dagster/dagster_tests/core_tests/execution_tests/test_run_metrics_thread.py
@@ -135,31 +135,33 @@ def test_start_run_metrics_thread(dagster_instance, dagster_run, mock_container_
     logger = logging.getLogger("test_run_metrics")
     logger.setLevel(logging.DEBUG)
 
-    with patch(
-        "dagster._core.execution.run_metrics_thread._get_container_metrics",
-        return_value=mock_container_metrics,
-    ):
+    with patch.object(dagster_instance.run_storage, "supports_run_telemetry", return_value=True):
         with patch(
-            "dagster._core.execution.run_metrics_thread._process_is_containerized",
-            return_value=True,
+            "dagster._core.execution.run_metrics_thread._get_container_metrics",
+            return_value=mock_container_metrics,
         ):
-            thread, shutdown = run_metrics_thread.start_run_metrics_thread(
-                dagster_instance,
-                dagster_run,
-                logger=logger,
-                polling_interval=2.0,
-            )
-
-            time.sleep(0.1)
-
-            assert thread.is_alive()
-
-            time.sleep(0.1)
-            shutdown.set()
-
-            thread.join()
-            assert thread.is_alive() is False
-            assert "Starting run metrics thread" in caplog.messages[0]
+            with patch(
+                "dagster._core.execution.run_metrics_thread._process_is_containerized",
+                return_value=True,
+            ):
+                thread, shutdown = run_metrics_thread.start_run_metrics_thread(
+                    dagster_instance,
+                    dagster_run,
+                    logger=logger,
+                    polling_interval=2.0,
+                )
+
+                time.sleep(0.1)
+
+                assert thread.is_alive()
+                assert "Starting run metrics thread" in caplog.messages[0]
+
+                time.sleep(0.1)
+                shutdown.set()
+
+                thread.join()
+                assert thread.is_alive() is False
+                assert "Shutting down metrics capture thread" in caplog.messages[-1]
 
 
 def test_report_run_metrics(dagster_instance: DagsterInstance, dagster_run: DagsterRun):