Add totalAvgResponseTime to charts

locustio · Dec 7, 2023 · 3e89904 · 3e89904
1 parent 4334e80
commit 3e89904
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 39 deletions.
diff --git a/locust/stats.py b/locust/stats.py
@@ -931,6 +931,7 @@ def stats_history(runner: "Runner") -> None:
                 or 0,
                 "response_time_percentile_2": stats.total.get_current_response_time_percentile(PERCENTILES_TO_CHART[1])
                 or 0,
+                "total_avg_response_time": stats.total.avg_response_time,
                 "current_response_time_percentiles": current_response_time_percentiles,
                 "user_count": runner.user_count or 0,
             }

diff --git a/locust/web.py b/locust/web.py
@@ -407,6 +407,7 @@ def request_stats() -> Response:
             if stats:
                 report["total_rps"] = total_stats["current_rps"]
                 report["total_fail_per_sec"] = total_stats["current_fail_per_sec"]
+                report["total_avg_response_time"] = total_stats["avg_response_time"]
                 report["fail_ratio"] = environment.runner.stats.total.fail_ratio
 
                 if self.modern_ui:

diff --git a/locust/webui/dist/assets/index-41a98b45.js → locust/webui/dist/assets/index-6276d787.js b/locust/webui/dist/assets/index-41a98b45.js → locust/webui/dist/assets/index-6276d787.js
diff --git a/locust/webui/dist/index.html b/locust/webui/dist/index.html
@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000" />
 
     <title>Locust</title>
-    <script type="module" crossorigin src="/assets/index-41a98b45.js"></script>
+    <script type="module" crossorigin src="/assets/index-6276d787.js"></script>
   </head>
   <body>
     <div id="root"></div>

diff --git a/locust/webui/src/components/SwarmCharts/SwarmCharts.tsx b/locust/webui/src/components/SwarmCharts/SwarmCharts.tsx
@@ -5,6 +5,11 @@ import { swarmTemplateArgs } from 'constants/swarm';
 import { IRootState } from 'redux/store';
 import { ICharts } from 'types/ui.types';
 
+const percentilesToChartLines = swarmTemplateArgs.percentilesToChart.map(percentile => ({
+  name: `${percentile * 100}th percentile`,
+  key: `responseTimePercentile${percentile}` as keyof ICharts,
+}));
+
 const availableSwarmCharts: ILineChartProps[] = [
   {
     title: 'Total Requests per Second',
@@ -16,10 +21,10 @@ const availableSwarmCharts: ILineChartProps[] = [
   },
   {
     title: 'Response Times (ms)',
-    lines: swarmTemplateArgs.percentilesToChart.map(percentile => ({
-      name: `${percentile * 100}th percentile`,
-      key: `responseTimePercentile${percentile}`,
-    })),
+    lines: [
+      ...percentilesToChartLines,
+      { name: 'Average Response Time', key: 'totalAvgResponseTime' },
+    ],
   },
   {
     title: 'Number of Users',

diff --git a/locust/webui/src/hooks/useSwarmUi.ts b/locust/webui/src/hooks/useSwarmUi.ts
@@ -42,6 +42,7 @@ export default function useSwarmUi() {
       failRatio,
       workers,
       userCount,
+      totalAvgResponseTime,
     } = statsData;
 
     const time = new Date().toLocaleTimeString();
@@ -59,6 +60,7 @@ export default function useSwarmUi() {
       ...currentResponseTimePercentiles,
       currentRps: totalRpsRounded,
       currentFailPerSec: totalFailPerSecRounded,
+      totalAvgResponseTime: roundToDecimalPlaces(totalAvgResponseTime, 2),
       userCount: userCount,
       time,
     };

diff --git a/locust/webui/src/redux/slice/tests/ui.slice.test.ts b/locust/webui/src/redux/slice/tests/ui.slice.test.ts
@@ -20,8 +20,7 @@ const initialState = {
     [responseTimePercentileKey1]: [],
     currentRps: [],
     currentFailPerSec: [],
-    responseTimePercentile1: [],
-    responseTimePercentile2: [],
+    totalAvgResponseTime: [],
     userCount: [],
     time: [],
   },

diff --git a/locust/webui/src/test/mocks/statsRequest.mock.ts b/locust/webui/src/test/mocks/statsRequest.mock.ts
@@ -148,9 +148,8 @@ export const getStatsResponseTransformed = () => ({
     'responseTimePercentile0.95': [2],
     currentRps: [1932.5],
     currentFailPerSec: [1932.5],
-    responseTimePercentile1: [1],
-    responseTimePercentile2: [1],
     userCount: [1],
+    totalAvgResponseTime: [0.41064205516736735],
     time: [new Date().toLocaleTimeString()],
   },
   ratios: {

diff --git a/locust/webui/src/types/swarm.types.ts b/locust/webui/src/types/swarm.types.ts
@@ -26,6 +26,7 @@ export interface IHistory {
   currentResponseTimePercentiles: {
     [key: `responseTimePercentile${number}`]: number | null;
   };
+  totalAvgResponseTime: number;
 }
 
 export interface IReport {

diff --git a/locust/webui/src/types/ui.types.ts b/locust/webui/src/types/ui.types.ts
@@ -58,6 +58,7 @@ export interface ICharts {
   currentRps: (number | NullChartValue)[];
   currentFailPerSec: (number | NullChartValue)[];
   [key: `responseTimePercentile${number}`]: (number | null | NullChartValue)[];
+  totalAvgResponseTime: (number | NullChartValue)[];
   userCount: (number | NullChartValue)[];
   time: string[];
   markers?: string[];
@@ -94,6 +95,7 @@ export interface IStatsResponse {
   workers: ISwarmWorker[];
   totalRps: number;
   totalFailPerSec: number;
+  totalAvgResponseTime: number;
   currentResponseTimePercentiles: {
     [key: `responseTimePercentile${number}`]: number | null;
   };