Fixes

Author: larseggert

.github/workflows/codspeed.yml

@@ -47,9 +47,14 @@ jobs:
         with:
           minimum-version: ${{ steps.nss-version.outputs.minimum }}
 
+      - run: |
+          for crate in $(cargo metadata --no-deps --format-version 1 | jq -r '.packages[].name'); do
+            [ -e "$crate/benches" ] && cargo codspeed build --package "$crate" --locked --features bench
+          done
+
       - name: Run the benchmarks
         uses: CodSpeedHQ/action@4348f634fa7309fe23aac9502e88b999ec90a164 # v4.3.1
         with:
           mode: instrumentation
-          run: cargo codspeed run --features bench
+          run: cargo codspeed run
           token: ${{ secrets.CODSPEED_TOKEN }}

neqo-bin/Cargo.toml

@@ -54,7 +54,6 @@ url = { workspace = true }
 [dev-dependencies]
 criterion = { version = "4.0", package = "codspeed-criterion-compat", default-features = false, features = [
         "async_tokio",
-        "cargo_bench_support",
 ] }
 neqo-bin = { path = ".", features = ["draft-29"] }
 neqo-http3 = { path = "./../neqo-http3", features = ["draft-29"] }

neqo-common/Cargo.toml

@@ -28,9 +28,7 @@ thiserror = { workspace = true }
 windows = { workspace = true, features = ["Win32_Media"] }
 
 [dev-dependencies]
-criterion = { version = "4.0", package = "codspeed-criterion-compat", default-features = false, features = [
-        "cargo_bench_support",
-] }
+criterion = { version = "4.0", package = "codspeed-criterion-compat", default-features = false }
 neqo-crypto = { path = "../neqo-crypto" }
 test-fixture = { path = "../test-fixture" }
 regex = { workspace = true }

neqo-http3/Cargo.toml

@@ -33,9 +33,7 @@ thiserror = { workspace = true }
 url = { workspace = true }
 
 [dev-dependencies]
-criterion = { version = "4.0", package = "codspeed-criterion-compat", default-features = false, features = [
-        "cargo_bench_support",
-] }
+criterion = { version = "4.0", package = "codspeed-criterion-compat", default-features = false }
 neqo-http3 = { path = ".", features = ["draft-29"] }
 neqo-transport = { path = "./../neqo-transport", features = ["draft-29"] }
 test-fixture = { path = "../test-fixture" }

neqo-http3/benches/streams.rs

@@ -63,7 +63,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         group.finish();
     }
 
-    Criterion::default().configure_from_args().final_summary();
+    //FIXME: This fails with codspeed: Criterion::default().configure_from_args().final_summary();
 }
 
 criterion_group!(benches, criterion_benchmark);

neqo-transport/Cargo.toml

@@ -32,9 +32,7 @@ strum = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-criterion = { version = "4.0", package = "codspeed-criterion-compat", default-features = false, features = [
-        "cargo_bench_support",
-] }
+criterion = { version = "4.0", package = "codspeed-criterion-compat", default-features = false }
 neqo-transport = { path = ".", features = ["draft-29"] }
 test-fixture = { path = "../test-fixture" }