Merge pull request #213 from ddosify/develop

add p98 func
getanteon · Jul 3, 2023 · 70c7241 · 70c7241
2 parents 08a9c46 + d249eb1
commit 70c7241
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/core/scenario/scripting/assertion/assert_test.go b/core/scenario/scripting/assertion/assert_test.go
@@ -680,6 +680,13 @@ func TestAssert(t *testing.T) {
 			},
 			expected: true,
 		},
+		{
+			input: "p98(iteration_duration) == 99",
+			envs: &evaluator.AssertEnv{
+				TotalTime: []int64{34, 37, 39, 44, 45, 55, 66, 67, 72, 75, 77, 89, 92, 98, 99},
+			},
+			expected: true,
+		},
 		{
 			input: "p95(iteration_duration) == 99",
 			envs: &evaluator.AssertEnv{
@@ -792,6 +799,11 @@ func TestAssert(t *testing.T) {
 			expected:      false,
 			expectedError: "ArgumentError",
 		},
+		{
+			input:         "p98(23)", // arg must be array
+			expected:      false,
+			expectedError: "ArgumentError",
+		},
 		{
 			input:         "p95(23)", // arg must be array
 			expected:      false,

diff --git a/core/scenario/scripting/assertion/evaluator/evaluator.go b/core/scenario/scripting/assertion/evaluator/evaluator.go
@@ -228,6 +228,15 @@ func Eval(node ast.Node, env *AssertEnv, receivedMap map[string]interface{}) (in
 						}
 					}
 					return percentile(arr, 99)
+				case P98:
+					arr, ok := args[0].([]int64)
+					if !ok {
+						return false, ArgumentError{
+							msg:        "argument of percentile funcs must be an int64 array",
+							wrappedErr: nil,
+						}
+					}
+					return percentile(arr, 98)
 				case P95:
 					arr, ok := args[0].([]int64)
 					if !ok {

diff --git a/core/scenario/scripting/assertion/evaluator/function.go b/core/scenario/scripting/assertion/evaluator/function.go
@@ -202,6 +202,7 @@ var assertionFuncMap = map[string]struct{}{
 	MAX:          {},
 	AVG:          {},
 	P99:          {},
+	P98:          {},
 	P95:          {},
 	P90:          {},
 	P80:          {},
@@ -227,6 +228,7 @@ const (
 	MAX = "max"
 	AVG = "avg"
 	P99 = "p99"
+	P98 = "p98"
 	P95 = "p95"
 	P90 = "p90"
 	P80 = "p80"

diff --git a/engine_docs/README.md b/engine_docs/README.md
@@ -744,6 +744,7 @@ Unlike assertions focused on individual steps, which determine the success or fa
 | Function | Parameters           | Description                                     |
 | ---------- | ---------------------- | ------------------------------------------------- |
 | `p99`    | ( arr `int array` ) | 99th percentile, use as `p99(iteration_duration)` |
+| `p98`    | ( arr `int array` ) | 98th percentile, use as `p98(iteration_duration)` |
 | `p95`    | ( arr `int array`)  | 95th percentile, use as `p95(iteration_duration)` |
 | `p90`    | ( arr `int array`)  | 90th percentile, use as `p90(iteration_duration)` |
 | `p80`    | ( arr `int array`)  | 80th percentile, use as `p80(iteration_duration)` |