Merge branch 'master' into feature/v5

ludeknovy · Jun 1, 2024 · dfedfbe · dfedfbe
2 parents f4de4a0 + ad116c2
commit dfedfbe
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.1",
     "boom": "^7.2.0",
-    "bree": "^9.2.2",
+    "bree": "^9.2.3",
     "compression": "^1.7.4",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",

diff --git a/src/server/data-stats/prepare-data.spec.ts b/src/server/data-stats/prepare-data.spec.ts
@@ -224,6 +224,8 @@ describe("prepare data", () => {
                 bytes_sent_total: 69848465,
                 total: 46596,
                 n90: 271,
+                n95: 272,
+                n99: 273,
                 number_of_failed: 3,
             }
             const labelsData = [
@@ -303,7 +305,9 @@ describe("prepare data", () => {
             const { overview, labelStats } = prepareDataForSavingToDb(overviewData, labelsData, [],
                 statusCodes, responseFailures, apdex, groupedErrors, labelErrors)
             expect(overview).toEqual({
-                percentil: 271,
+                percentile90: 271,
+                percentile95: 272,
+                percentile99: 273,
                 maxVu: undefined,
                 avgResponseTime: 106,
                 errorRate: 0.01,

diff --git a/src/server/data-stats/prepare-data.ts b/src/server/data-stats/prepare-data.ts
@@ -19,7 +19,9 @@ export const prepareDataForSavingToDb = (overviewData, labelData, sutStats, stat
         const endDate = new Date(overviewData.end)
         return {
             overview: {
-                percentil: roundNumberTwoDecimals(overviewData.n90),
+                percentile90: roundNumberTwoDecimals(overviewData.n90),
+                percentile95: roundNumberTwoDecimals(overviewData.n95),
+                percentile99: roundNumberTwoDecimals(overviewData.n99),
                 maxVu: undefined,
                 avgResponseTime: Math.round(overviewData.avg_response),
                 errorRate: roundNumberTwoDecimals((overviewData.number_of_failed / overviewData.total) * 100),
@@ -441,7 +443,9 @@ interface ChartLabelData {
 }
 
 export interface Overview {
-    percentil: number
+    percentile90: number
+    percentile95: number
+    percentile99: number
     errorRate: number
     errorCount: number
     throughput: number

diff --git a/src/server/queries/items.ts b/src/server/queries/items.ts
@@ -243,6 +243,8 @@ export const aggOverviewQuery = (itemId) => {
         text: `
     SELECT
     percentile_cont(0.90) within group (order by (samples.elapsed))::real as n90,
+    percentile_cont(0.95) within group (order by (samples.elapsed))::real as n95,
+    percentile_cont(0.99) within group (order by (samples.elapsed))::real as n99,
     COUNT(DISTINCT samples.hostname)::int number_of_hostnames,
     COUNT(DISTINCT samples.sut_hostname)::int number_of_sut_hostnames,
     MAX(samples.timestamp) as end,

diff --git a/src/server/schema-validator/project-schema.ts b/src/server/schema-validator/project-schema.ts
@@ -14,7 +14,9 @@ export const updateProjectSchema = {
   topMetricsSettings: Joi.object({
     virtualUsers: Joi.boolean().required(),
     errorRate: Joi.boolean().required(),
-    percentile: Joi.boolean().required(),
+    percentile90: Joi.boolean().required(),
+    percentile95: Joi.boolean().required(),
+    percentile99: Joi.boolean().required(),
     throughput: Joi.boolean().required(),
     network: Joi.boolean().required(),
     avgLatency: Joi.boolean().required(),

diff --git a/src/server/utils/notifications/send-notification.spec.ts b/src/server/utils/notifications/send-notification.spec.ts
@@ -11,7 +11,9 @@ jest.mock("./templates/report/ms-teams-template")
 jest.mock("../../../db/db")
 
 const OVERVIEW = {
-  percentil: 10,
+  percentile90: 10,
+  percentile95: 14,
+  percentile99: 18,
   avgConnect: 1,
   avgLatency: 1,
   avgResponseTime: 1,

diff --git a/src/server/utils/notifications/templates/report/gchat-template.spec.ts b/src/server/utils/notifications/templates/report/gchat-template.spec.ts
@@ -2,7 +2,9 @@ import { gchatTemplate } from "./gchat-template"
 
 describe("GChat template", () => {
     const OVERVIEW = {
-        percentil: 10,
+        percentile90: 10,
+        percentile95: 14,
+        percentile99: 18,
         avgConnect: 1,
         avgLatency: 1,
         avgResponseTime: 1,

diff --git a/src/server/utils/notifications/templates/report/gchat-template.ts b/src/server/utils/notifications/templates/report/gchat-template.ts
@@ -14,7 +14,7 @@ export const gchatTemplate = (scenarioName: string, url, overview: Overview) =>
                     {
                         keyValue: {
                             topLabel: "90% percentile",
-                            content: `${overview.percentil} ms`,
+                            content: `${overview.percentile90} ms`,
                         },
                     },
                     { keyValue: { topLabel: "Throughput", content: `${overview.throughput} reqs/s` } },

diff --git a/src/server/utils/notifications/templates/report/ms-teams-template.spec.ts b/src/server/utils/notifications/templates/report/ms-teams-template.spec.ts
@@ -2,7 +2,9 @@ import { msTeamsTemplate } from "./ms-teams-template"
 
 describe("MS Teams template", () => {
   const OVERVIEW = {
-    percentil: 10,
+    percentile90: 10,
+    percentile95: 14,
+    percentile99: 18,
     avgConnect: 1,
     avgLatency: 1,
     avgResponseTime: 1,

diff --git a/src/server/utils/notifications/templates/report/ms-teams-template.ts b/src/server/utils/notifications/templates/report/ms-teams-template.ts
@@ -25,7 +25,7 @@ export const msTeamsTemplate = (scenarioName: string, url, overview: Overview) =
                 },
                 {
                   title: "90% percentile",
-                  value: overview.percentil + " ms",
+                  value: overview.percentile90 + " ms",
                 },
                 {
                   title: "Throughput",

diff --git a/src/server/utils/notifications/templates/report/slack-template.spec.ts b/src/server/utils/notifications/templates/report/slack-template.spec.ts
@@ -2,7 +2,9 @@ import { slackTemplate } from "./slack-template"
 
 describe("Slack template", () => {
     const OVERVIEW = {
-        percentil: 10,
+        percentile90: 10,
+        percentile95: 14,
+        percentile99: 18,
         avgConnect: 1,
         avgLatency: 1,
         avgResponseTime: 1,

diff --git a/src/server/utils/notifications/templates/report/slack-template.ts b/src/server/utils/notifications/templates/report/slack-template.ts
@@ -8,7 +8,7 @@ export const slackTemplate = (scenarioName: string, url, overview: Overview) =>
         }, { type: "divider" }, {
             type: "section",
             fields: [{ type: "mrkdwn", text: `*Error Rate*\n${overview.errorRate}%` }],
-        }, { type: "section", fields: [{ type: "mrkdwn", text: `*90% percentile*\n${overview.percentil} ms` }] }, {
+        }, { type: "section", fields: [{ type: "mrkdwn", text: `*90% percentile*\n${overview.percentile90} ms` }] }, {
             type: "section",
             fields: [{ type: "mrkdwn", text: `*Throughput*\n${overview.throughput} reqs/s` }],
         }, { type: "section", fields: [{ type: "mrkdwn", text: `*Duration*\n${overview.duration} min` }] }],