Update wrk benchmarks

Author: bitterpanda63

.github/workflows/benchmark.yml

@@ -62,12 +62,13 @@ jobs:
         run: |
           k6 run -q ./benchmarks/flask-mysql-benchmarks.js
 
-  benchmark_with_starlette_app:
+  wrk_benchmarks:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:
+        app: [starlette-postgres-uvicorn, flask-mysql-uwsgi]
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Checkout code
@@ -83,12 +84,13 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           make install && make build
-      - name: Start starlette
-        working-directory: ./sample-apps/starlette-postgres-uvicorn
+      - name: Start app
+        working-directory: ./sample-apps/${{ matrix.app }}
         run: nohup make runBenchmark & nohup make runZenDisabled &
       - name: Install wrk
         run: |
           sudo apt-get update
           sudo apt-get install -y wrk
-      - name: Run benchmark
-        run: python ./benchmarks/starlette_benchmark.py
+      - name: Run benchmarks
+        working-directory: ./benchmarks/wrk_benchmark
+        run: make benchmark_${{ matrix.app }}

benchmarks/wrk_benchmark/Makefile

@@ -0,0 +1,10 @@
+
+.PHONY: benchmark_starlette-postgres-uvicorn
+benchmark_starlette-postgres-uvicorn:
+	@echo "Running wrk benchmarks for Starlette w/ Postgres, Uvicorn"
+	python starlette_postgres_uvicorn.py
+
+.PHONY: benchmark_flask-mysql-uwsgi
+benchmark_flask-mysql-uwsgi:
+	@echo "Running wrk benchmarks for Flask w/ MySQL, UWSGI"
+	python flask_mysql_uwsgi.py

benchmarks/wrk_benchmark/flask_mysql_uwsgi.py

@@ -0,0 +1,10 @@
+from script import run_benchmark
+
+# Run benchmarks
+
+run_benchmark(
+    "http://localhost:8088/benchmark",
+    "http://localhost:8089/benchmark",
+    "a non empty route which makes a simulated request to a database",
+    percentage_limit=15
+)

benchmarks/starlette_benchmark.py benchmarks/wrk_benchmark/script.pybenchmarks/starlette_benchmark.py renamed to benchmarks/wrk_benchmark/script.py

@@ -6,7 +6,7 @@
 
 def generate_wrk_command_for_url(url):
     # Define the command with awk included
-    return "wrk -t5 -c200 -d15s " + url
+    return "wrk -t12 -c400 -d15s " + url
 
 def wait_until_live(url):
     for i in range(30):
@@ -34,12 +34,12 @@ def extract_requests_and_latency_tuple(output):
             latency_float *= 1000
         return (float(requests_sec), latency_float)
     else:
-        print("Exception occurred running benchmark command:")
+        print("Error occured running benchmark command:")
         print(output.stderr.strip())
         sys.exit(1)
 
 def run_benchmark(route1, route2, descriptor, percentage_limit):
-    # Make sure both routes are accessible before running benchmark
+    # Cold start :
     if not wait_until_live(route1):
         raise Exception("Unable to access: " + route1)
     if not wait_until_live(route2):
@@ -72,23 +72,13 @@ def run_benchmark(route1, route2, descriptor, percentage_limit):
 
         delta_in_ms = round(result_fw[1] - result_nofw[1], 2)
         print(f"-> Delta in ms: {delta_in_ms}ms after running load test on {descriptor}")
+
         delay_percentage = round(
             (result_nofw[0] - result_fw[0]) / result_nofw[0] * 100
         )
         print(
             f"-> {delay_percentage}% decrease in throughput after running load test on {descriptor} \n"
         )
+
         if delay_percentage > percentage_limit:
             sys.exit(1)
-
-# Run benchmarks :
-run_benchmark(
-    "http://localhost:8102/delayed_route", 
-    "http://localhost:8103/delayed_route", 
-    "a non empty route which makes a simulated request to a database",
-    percentage_limit=15
-)
-run_benchmark(
-    "http://localhost:8102/just", "http://localhost:8103/just", "an empty route",
-    percentage_limit=30
-)

benchmarks/wrk_benchmark/starlette_postgres_uvicorn.py

@@ -0,0 +1,15 @@
+from script import run_benchmark
+
+# Run benchmarks
+
+run_benchmark(
+    "http://localhost:8102/delayed_route",
+    "http://localhost:8103/delayed_route",
+    "a non empty route which makes a simulated request to a database",
+    percentage_limit=15
+)
+
+run_benchmark(
+    "http://localhost:8102/just", "http://localhost:8103/just", "an empty route",
+    percentage_limit=30
+)

sample-apps/flask-mysql-uwsgi/app.py

@@ -1,3 +1,5 @@
+import time
+
 import aikido_zen # Aikido package import
 aikido_zen.protect()
 
@@ -44,3 +46,8 @@ def create_dog():
     cursor.execute(f'INSERT INTO dogs (dog_name, isAdmin) VALUES ("%s", 0)' % (dog_name))
     connection.commit()
     return f'Dog {dog_name} created successfully'
+
+@app.route("/benchmark", methods=['GET'])
+def benchmark():
+    time.sleep(1)
+    return "OK"