fix: Fix local runs, reduce warmup duration

Author: ddyurchenko

benchmark/load/insecure-bank/k6.js

@@ -9,15 +9,15 @@ export const options = {
     [`load--insecure-bank--${__ENV.VARIANT}--warmup`]: {
       executor: 'constant-vus',  // https://grafana.com/docs/k6/latest/using-k6/scenarios/executors/#all-executors
       vus: 5,
-      duration: '15s',
-      gracefulStop: '5s',
+      duration: '10s',
+      gracefulStop: '2s',
     },
     [`load--insecure-bank--${__ENV.VARIANT}--high_load`]: {
       executor: 'constant-vus',
       vus: 5,
-      startTime: '15s',
+      startTime: '12s',
       duration: '20s',
-      gracefulStop: '5s',
+      gracefulStop: '2s',
     },
   }
 };

benchmark/load/petclinic/benchmark.json

@@ -9,49 +9,37 @@
     "${NO_AGENT_VARIANT}": {
       "env": {
         "VARIANT": "${NO_AGENT_VARIANT}",
-        "JAVA_OPTS": "",
-        "CPU_AFFINITY_K6": "taskset -c 24-30 ",
-        "CPU_AFFINITY_APP": "taskset -c 31-32 "
+        "JAVA_OPTS": ""
       }
     },
     "tracing": {
       "env": {
         "VARIANT": "tracing",
-        "JAVA_OPTS": "-javaagent:${TRACER}",
-        "CPU_AFFINITY_K6": "taskset -c 24-30 ",
-        "CPU_AFFINITY_APP": "taskset -c 33-34 "
+        "JAVA_OPTS": "-javaagent:${TRACER}"
       }
     },
     "profiling": {
       "env": {
         "VARIANT": "profiling",
-        "JAVA_OPTS": "-javaagent:${TRACER} -Ddd.profiling.enabled=true",
-        "CPU_AFFINITY_K6": "taskset -c 24-30 ",
-        "CPU_AFFINITY_APP": "taskset -c 35-36 "
+        "JAVA_OPTS": "-javaagent:${TRACER} -Ddd.profiling.enabled=true"
       }
     },
     "appsec": {
       "env": {
         "VARIANT": "appsec",
-        "JAVA_OPTS": "-javaagent:${TRACER} -Ddd.appsec.enabled=true",
-        "CPU_AFFINITY_K6": "taskset -c 24-30 ",
-        "CPU_AFFINITY_APP": "taskset -c 37-38 "
+        "JAVA_OPTS": "-javaagent:${TRACER} -Ddd.appsec.enabled=true"
       }
     },
     "iast": {
       "env": {
         "VARIANT": "iast",
-        "JAVA_OPTS": "-javaagent:${TRACER} -Ddd.iast.enabled=true",
-        "CPU_AFFINITY_K6": "taskset -c 24-30 ",
-        "CPU_AFFINITY_APP": "taskset -c 39-40 "
+        "JAVA_OPTS": "-javaagent:${TRACER} -Ddd.iast.enabled=true"
       }
     },
     "code_origins": {
       "env": {
         "VARIANT": "code_origins",
-        "JAVA_OPTS": "-javaagent:${TRACER} -Ddd.code.origin.for.spans.enabled=true",
-        "CPU_AFFINITY_K6": "taskset -c 24-30 ",
-        "CPU_AFFINITY_APP": "taskset -c 41-42 "
+        "JAVA_OPTS": "-javaagent:${TRACER} -Ddd.code.origin.for.spans.enabled=true"
       }
     }
   }

benchmark/load/petclinic/k6.js

@@ -9,15 +9,15 @@ export const options = {
     [`load--petclinic--${__ENV.VARIANT}--warmup`]: {
       executor: 'constant-vus',  // https://grafana.com/docs/k6/latest/using-k6/scenarios/executors/#all-executors
       vus: 5,
-      duration: '15s',
-      gracefulStop: '5s',
+      duration: '10s',
+      gracefulStop: '2s',
     },
     [`load--petclinic--${__ENV.VARIANT}--high_load`]: {
       executor: 'constant-vus',
       vus: 5,
-      startTime: '15s',
+      startTime: '12s',
       duration: '20s',
-      gracefulStop: '5s',
+      gracefulStop: '2s',
     },
   }
 };

benchmark/load/run.sh

@@ -1,5 +1,15 @@
 #!/usr/bin/env bash
 set -eu
 
+if [ -n "$CI_JOB_TOKEN" ]; then
+  # Inside BP, so we can assume 24 CPU cores available and set CPU affinity
+  export CPU_AFFINITY_K6="taskset -c 24-30 "
+  export CPU_AFFINITY_APP="taskset -c 31-32 "
+else
+  export CPU_AFFINITY_K6=""
+  export CPU_AFFINITY_APP=""
+fi
+
+
 source "${UTILS_DIR}/update-java-version.sh" 17
 "${UTILS_DIR}/run-sirun-benchmarks.sh" "$@"