Make request timeout a parameter

Author: alexeyr

.github/workflows/benchmark.yml

@@ -19,6 +19,11 @@ on:
         required: false
         default: 10
         type: number
+      request_timeout:
+        description: 'Request timeout (e.g., "60s", "1m", "90s")'
+        required: false
+        default: '60s'
+        type: string
       vus:
         description: 'Virtual users for k6'
         required: false
@@ -41,6 +46,7 @@ env:
   # Benchmark parameters
   RATE: ${{ github.event.inputs.rate || '50' }}
   DURATION_SEC: ${{ github.event.inputs.duration_sec || '10' }}
+  REQUEST_TIMEOUT: ${{ github.event.inputs.request_timeout || '60s' }}
   VUS: ${{ github.event.inputs.vus || '100' }}
   TOOLS: ${{ github.event.inputs.tools || 'fortio,vegeta,k6' }}
 

spec/performance/bench.sh

@@ -10,6 +10,8 @@ RATE=${RATE:-50}
 VUS=${VUS:-100}
 DURATION_SEC=${DURATION_SEC:-10}
 DURATION="${DURATION_SEC}s"
+# request timeout (duration string like "60s", "1m", "90s")
+REQUEST_TIMEOUT=${REQUEST_TIMEOUT:-60s}
 # Tools to run (comma-separated)
 TOOLS=${TOOLS:-fortio,vegeta,k6}
 
@@ -26,6 +28,10 @@ if ! { [[ "$DURATION_SEC" =~ ^[0-9]+(\.[0-9]+)?$ ]] && (( $(bc -l <<< "$DURATION
   echo "Error: DURATION_SEC must be a positive number (got: '$DURATION_SEC')" >&2
   exit 1
 fi
+if ! [[ "$REQUEST_TIMEOUT" =~ ^([0-9]+(\.[0-9]+)?[smh])+$ ]]; then
+  echo "Error: REQUEST_TIMEOUT must be a duration like '60s', '1m', '1.5m' (got: '$REQUEST_TIMEOUT')" >&2
+  exit 1
+fi
 
 OUTDIR="bench_results"
 
@@ -92,14 +98,14 @@ fi
 if (( RUN_FORTIO )); then
   echo "===> Fortio"
   # TODO https://github.com/fortio/fortio/wiki/FAQ#i-want-to-get-the-best-results-what-flags-should-i-pass
-  fortio load "${FORTIO_ARGS[@]}" -t "$DURATION" -timeout 30s -json "$OUTDIR/fortio.json" "$TARGET" \
+  fortio load "${FORTIO_ARGS[@]}" -t "$DURATION" -timeout "$REQUEST_TIMEOUT" -json "$OUTDIR/fortio.json" "$TARGET" \
     | tee "$OUTDIR/fortio.txt"
 fi
 
 if (( RUN_VEGETA )); then
   echo
   echo "===> Vegeta"
-  echo "GET $TARGET" | vegeta attack "${VEGETA_ARGS[@]}" -duration="$DURATION" \
+  echo "GET $TARGET" | vegeta attack "${VEGETA_ARGS[@]}" -duration="$DURATION" -timeout="$REQUEST_TIMEOUT" \
     | tee "$OUTDIR/vegeta.bin" \
     | vegeta report | tee "$OUTDIR/vegeta.txt"
   vegeta report -type=json "$OUTDIR/vegeta.bin" > "$OUTDIR/vegeta.json"
@@ -114,6 +120,9 @@ import { check } from 'k6';
 
 export const options = {
   scenarios: $K6_SCENARIOS,
+  httpReq: {
+    timeout: '$REQUEST_TIMEOUT',
+  },
 };
 
 export default function () {