Merge branch 'main' into demo

Author: manojown

server/pkg/utils/client.go

@@ -79,6 +79,9 @@ func GetFormedHttpClient(request models.Request) (*http.Client, error) {
 		Transport: tr,
 		Timeout:   time.Second * 10,
 		Jar:       jar,
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		},
 	}, nil
 }
 

ui/src/pages/Request/index.tsx

@@ -15,6 +15,7 @@ import Spinner from "../../components/Spinner";
 import { StatFields } from "../../constants/request.const";
 import { Animate } from "../../components/Stats/Animation";
 import { getLatencyOptions, getRps } from "../../utils/chartOption";
+import { convertToMilliSeconds } from "../../utils/_shared";
 
 function RPSChart({ servers }: { servers: Record<string, ServerMapData> }) {
   const getRPSOption = getRps(servers);
@@ -74,9 +75,9 @@ function Request({ requestId }: { requestId: string }) {
             <Stat borderRight="1px solid #e2e8f0" mr={2}>
               <StatLabel>Min-Max latency</StatLabel>
               <StatNumber>
-                <Animate value={data.minLatency} />
+                <Animate value={convertToMilliSeconds(data.minLatency)} />
                 -
-                <Animate value={data.maxLatency} /> ms
+                <Animate value={convertToMilliSeconds(data.maxLatency)} /> ms
               </StatNumber>
             </Stat>
           </>

ui/src/utils/_shared.ts

@@ -4,3 +4,10 @@ export const NumberFormat = (value: number) => {
     maximumFractionDigits: 1,
   }).format(value);
 };
+
+export const convertToMilliSeconds = (value) => {
+  if (value > 0) {
+    return Math.ceil(value / 1000);
+  }
+  return value;
+};

ui/src/utils/chartOption.ts

@@ -3,6 +3,7 @@ import {
   LoadsterResponse,
   ServerMapData,
 } from "../store/stress/dashboard/types";
+import { convertToMilliSeconds } from "./_shared";
 
 const getGridOptions = (options = {}) => {
   return {
@@ -61,7 +62,7 @@ export function getLatencyOptions(latency: LoadsterResponse[]) {
     grid: getGridOptions(),
     series: keyToMap.map((key) => ({
       name: key,
-      data: latency?.map((item) => item[key]?.toFixed()),
+      data: latency?.map((item) => convertToMilliSeconds(item[key])),
       type: "line",
     })),
   };