Merge pull request #2824 from andrewbaldwin44/feature/locust-cloud

Integrations for Locust Cloud
locustio · Aug 2, 2024 · 5209718 · 5209718
2 parents 45c6166 + 1c0a4e2
commit 5209718
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/locust/main.py b/locust/main.py
@@ -36,11 +36,15 @@
 from .util.load_locustfile import load_locustfile
 from .util.timespan import parse_timespan
 
+# import external plugins if  installed to allow for registering custom arguments etc
 try:
-    # import locust_plugins if it is installed, to allow it to register custom arguments etc
     import locust_plugins  # pyright: ignore[reportMissingImports]
 except ModuleNotFoundError:
     pass
+try:
+    import locust_cloud  # pyright: ignore[reportMissingImports]
+except ModuleNotFoundError:
+    pass
 
 version = locust.__version__
 

diff --git a/locust/web.py b/locust/web.py
@@ -39,6 +39,7 @@
 from .stats import StatsCSV, StatsCSVFileWriter, StatsErrorDict, sort_stats
 from .user.inspectuser import get_ratio
 from .util.cache import memoize
+from .util.date import format_utc_timestamp
 from .util.timespan import parse_timespan
 
 if TYPE_CHECKING:
@@ -617,6 +618,8 @@ def update_template_args(self):
             else None
         )
 
+        start_time = format_utc_timestamp(stats.start_time)
+
         self.template_args = {
             "locustfile": self.environment.locustfile,
             "state": self.environment.runner.state,
@@ -634,6 +637,7 @@ def update_template_args(self):
                 and not (self.userclass_picker_is_active or self.environment.shape_class.use_common_options)
             ),
             "stats_history_enabled": options and options.stats_history_enabled,
+            "start_time": start_time,
             "tasks": dumps({}),
             "extra_options": extra_options,
             "run_time": options and options.run_time,

diff --git a/locust/webui/src/redux/slice/swarm.slice.ts b/locust/webui/src/redux/slice/swarm.slice.ts
@@ -26,6 +26,7 @@ export interface ISwarmState {
   runTime?: string | number;
   showUserclassPicker: boolean;
   spawnRate: number | null;
+  startTime: string;
   state: string;
   statsHistoryEnabled: boolean;
   tasks: string;

diff --git a/locust/webui/src/test/mocks/swarmState.mock.ts b/locust/webui/src/test/mocks/swarmState.mock.ts
@@ -22,6 +22,7 @@ export const swarmStateMock = {
   showUserclassPicker: false,
   spawnRate: null,
   state: 'ready',
+  startTime: '',
   percentilesToChart: percentilesToChart,
   statsHistoryEnabled: false,
   tasks: '{}',