fix: ci to run in parallel

Signed-off-by: Sahil Yeole <[email protected]>

Author: beelchester

.github/workflows/bench.yml

@@ -15,10 +15,6 @@ jobs:
     if: github.event.head_commit.message != 'Update performance results in README.md'
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      GRAFANA_API_KEY: ${{ secrets.GRAFANA_API_KEY }}
-      INFLUXDB_TOKEN: ${{ secrets.INFLUXDB_TOKEN }}
-      INFLUXDB_ORG: ${{ secrets.INFLUXDB_ORG }}
-      INFLUXDB_URL: ${{ secrets.INFLUXDB_URL }}
     strategy:
       matrix:
         service:
@@ -48,19 +44,6 @@ jobs:
       - name: Setup k6
         uses: grafana/setup-k6-action@v1
 
-      - name: Setup influxdb-cli
-        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        run: |
-          echo "UPLOAD_TO_CLOUD=true" >> $GITHUB_ENV
-          mkdir -p influxdb
-          cd influxdb
-          wget https://download.influxdata.com/influxdb/releases/influxdb2-client-2.7.5-linux-amd64.tar.gz
-          tar xvzf influxdb2-client-2.7.5-linux-amd64.tar.gz
-          cp influx /usr/local/bin/
-          influx config create --config-name benchmark --host-url $INFLUXDB_URL --org $INFLUXDB_ORG --token $INFLUXDB_TOKEN --active
-          cd ..
-          rm -rf influxdb
-
       - name: Run benchmarks
         run: |
           bash ./graphql/${{ matrix.service }}/setup.sh
@@ -78,10 +61,28 @@ jobs:
   analyze:
     needs: build
     runs-on: benchmarking-runner
+    env:
+      GRAFANA_API_KEY: ${{ secrets.GRAFANA_API_KEY }}
+      INFLUXDB_TOKEN: ${{ secrets.INFLUXDB_TOKEN }}
+      INFLUXDB_ORG: ${{ secrets.INFLUXDB_ORG }}
+      INFLUXDB_URL: ${{ secrets.INFLUXDB_URL }}
     steps:
       - name: Checkout (GitHub)
         uses: actions/checkout@v4
 
+      - name: Setup influxdb-cli
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        run: |
+          echo "UPLOAD_TO_CLOUD=true" >> $GITHUB_ENV
+          mkdir -p influxdb
+          cd influxdb
+          wget https://download.influxdata.com/influxdb/releases/influxdb2-client-2.7.5-linux-amd64.tar.gz
+          tar xvzf influxdb2-client-2.7.5-linux-amd64.tar.gz
+          cp influx /usr/local/bin/
+          influx config create --config-name benchmark --host-url $INFLUXDB_URL --org $INFLUXDB_ORG --token $INFLUXDB_TOKEN --active
+          cd ..
+          rm -rf influxdb
+
       - name: Download all benchmark results
         uses: actions/download-artifact@v3
         with:

analyze.sh

@@ -44,16 +44,6 @@ for idx in "${!servers[@]}"; do
   avgLatencies[${servers[$idx]}]=$(average "${latencyVals[@]}")
 done
 
-echo "Server Value" >"$reqSecData"
-for server in "${servers[@]}"; do
-  echo "$server ${avgReqSecs[$server]}" >>"$reqSecData"
-done
-
-echo "Server Value" >"$latencyData"
-for server in "${servers[@]}"; do
-  echo "$server ${avgLatencies[$server]}" >>"$latencyData"
-done
-
 whichBench=1
 if [[ $1 == bench2* ]]; then
     whichBench=2

fetch_panels.sh

@@ -0,0 +1,9 @@
+  # Get rendered panels from grafana
+  from=$(date -u -d "-30 minutes" +"%Y-%m-%dT%H:%M:%S.%3NZ")
+  now=$(date -u +"%Y-%m-%dT%H:%M:%S.%3NZ")
+  curl -o assets/posts_users_req.png -H "Authorization: Bearer $GRAFANA_API_KEY" "https://tailcall.grafana.net/render/d-solo/cdqucydulbfggb?tab=queries&from=$from&to=$now&panelId=panel-1&__feature.dashboardSceneSolo&width=1000&height=500&tz=Asia%2FCalcutta" --connect-timeout 120
+  curl -o assets/posts_users_latency.png -H "Authorization: Bearer $GRAFANA_API_KEY" "https://tailcall.grafana.net/render/d-solo/cdqucydulbfggb?tab=queries&from=$from&to=$now&panelId=panel-2&__feature.dashboardSceneSolo&width=1000&height=500&tz=Asia%2FCalcutta" --connect-timeout 120
+  curl -o assets/posts_req.png -H "Authorization: Bearer $GRAFANA_API_KEY" "https://tailcall.grafana.net/render/d-solo/cdqucydulbfggb?tab=queries&from=$from&to=$now&panelId=panel-5&__feature.dashboardSceneSolo&width=1000&height=500&tz=Asia%2FCalcutta" --connect-timeout 120
+  curl -o assets/posts_latency.png -H "Authorization: Bearer $GRAFANA_API_KEY" "https://tailcall.grafana.net/render/d-solo/cdqucydulbfggb?tab=queries&from=$from&to=$now&panelId=panel-6&__feature.dashboardSceneSolo&width=1000&height=500&tz=Asia%2FCalcutta" --connect-timeout 120
+  curl -o assets/greet_req.png -H "Authorization: Bearer $GRAFANA_API_KEY" "https://tailcall.grafana.net/render/d-solo/cdqucydulbfggb?tab=queries&from=$from&to=$now&panelId=panel-8&__feature.dashboardSceneSolo&width=1000&height=500&tz=Asia%2FCalcutta" --connect-timeout 120
+  curl -o assets/greet_latency.png -H "Authorization: Bearer $GRAFANA_API_KEY" "https://tailcall.grafana.net/render/d-solo/cdqucydulbfggb?tab=queries&from=$from&to=$now&panelId=panel-9&__feature.dashboardSceneSolo&width=1000&height=500&tz=Asia%2FCalcutta" --connect-timeout 120

run_analyze_script.sh

@@ -33,4 +33,8 @@ for bench in 1 2 3; do
     # Execute the command
     echo "Executing: $cmd"
     eval $cmd
-done
+done
+
+if [[ "$UPLOAD_TO_CLOUD" == "true" ]]; then
+    bash fetch_panels.sh
+fi

run_benchmarks.sh

@@ -89,33 +89,12 @@ if [[ ! " ${valid_services[@]} " =~ " ${service} " ]]; then
     exit 1
 fi
 
-
-
-runBenchmark "graphql/${service}/run.sh"
+runBenchmark "${service}"
 
 if [ "$service" == "apollo_server" ]; then
     cd graphql/apollo_server/
     npm stop
     cd ../../
 elif [ "$service" == "hasura" ]; then
     bash "graphql/hasura/kill.sh"
-fi
-
-bash analyze.sh "${bench1Results[@]}"
-bash analyze.sh "${bench2Results[@]}"
-bash analyze.sh "${bench3Results[@]}"
-
-if [[ "$UPLOAD_TO_CLOUD" == "true" ]]; then
-  # Wait for 5 seconds to ensure the results are uploaded to influxdb
-  sleep 5
-
-  # Get rendered panels from grafana
-  from=$(date -u -d "-30 minutes" +"%Y-%m-%dT%H:%M:%S.%3NZ")
-  now=$(date -u +"%Y-%m-%dT%H:%M:%S.%3NZ")
-  curl -o assets/posts_users_req.png -H "Authorization: Bearer $GRAFANA_API_KEY" "https://tailcall.grafana.net/render/d-solo/cdqucydulbfggb?tab=queries&from=$from&to=$now&panelId=panel-1&__feature.dashboardSceneSolo&width=1000&height=500&tz=Asia%2FCalcutta" --connect-timeout 120
-  curl -o assets/posts_users_latency.png -H "Authorization: Bearer $GRAFANA_API_KEY" "https://tailcall.grafana.net/render/d-solo/cdqucydulbfggb?tab=queries&from=$from&to=$now&panelId=panel-2&__feature.dashboardSceneSolo&width=1000&height=500&tz=Asia%2FCalcutta" --connect-timeout 120
-  curl -o assets/posts_req.png -H "Authorization: Bearer $GRAFANA_API_KEY" "https://tailcall.grafana.net/render/d-solo/cdqucydulbfggb?tab=queries&from=$from&to=$now&panelId=panel-5&__feature.dashboardSceneSolo&width=1000&height=500&tz=Asia%2FCalcutta" --connect-timeout 120
-  curl -o assets/posts_latency.png -H "Authorization: Bearer $GRAFANA_API_KEY" "https://tailcall.grafana.net/render/d-solo/cdqucydulbfggb?tab=queries&from=$from&to=$now&panelId=panel-6&__feature.dashboardSceneSolo&width=1000&height=500&tz=Asia%2FCalcutta" --connect-timeout 120
-  curl -o assets/greet_req.png -H "Authorization: Bearer $GRAFANA_API_KEY" "https://tailcall.grafana.net/render/d-solo/cdqucydulbfggb?tab=queries&from=$from&to=$now&panelId=panel-8&__feature.dashboardSceneSolo&width=1000&height=500&tz=Asia%2FCalcutta" --connect-timeout 120
-  curl -o assets/greet_latency.png -H "Authorization: Bearer $GRAFANA_API_KEY" "https://tailcall.grafana.net/render/d-solo/cdqucydulbfggb?tab=queries&from=$from&to=$now&panelId=panel-9&__feature.dashboardSceneSolo&width=1000&height=500&tz=Asia%2FCalcutta" --connect-timeout 120
 fi