Enable all benchmarks

alloc/Cargo.toml

@@ -25,3 +25,6 @@ features = [
 [dev-dependencies]
 allocator-api2 = { version = "0.2", default-features = false, features = ["alloc"] }
 bolero = "0.10.1"
+
+[lib]
+bench = false

benchmark/run_benchmarks_ci.sh

@@ -21,12 +21,8 @@ OUTPUT_DIR="${1:-}"
 pushd "${PROJECT_DIR}" > /dev/null
 
 # Run benchmarks
-# TODO https://datadoghq.atlassian.net/browse/APMSP-1228
-# Right now we are only running a single benchmark to test the CI setup, and there is only
-# support for the Criterion SamplingMode::Flat in the new benchmarking framework. This will be
-# worked on going forward.
 message "Running benchmarks"
-cargo bench -p datadog-trace-obfuscation --bench trace_obfuscation -- sql/obfuscate_sql_string
+cargo bench --workspace -- --sample-size=200
 message "Finished running benchmarks"
 
 # Copy the benchmark results to the output directory

bin_tests/Cargo.toml

@@ -20,8 +20,21 @@ serde_json = { version = "1.0" }
 hyper = { version = "0.14", default-features = false }
 strum = { version = "0.26.2", features = ["derive"] }
 
+[lib]
+bench = false
+
 [[bin]]
 name = "crashtracker_bin_test"
+bench = false
 
 [[bin]]
 name = "test_the_tests"
+bench = false
+
+[[bin]]
+name = "crashtracker_receiver"
+bench = false
+
+[[bin]]
+name = "crashtracker_unix_socket_receiver"
+bench = false

build-common/Cargo.toml

@@ -16,3 +16,6 @@ cbindgen = []
 cbindgen = {version = "0.26"}
 serde = "1.0"
 serde_json = "1.0"
+
+[lib]
+bench = false

crashtracker/Cargo.toml

@@ -9,6 +9,7 @@ license.workspace = true
 
 [lib]
 crate-type = ["lib"]
+bench = false
 
 [target.'cfg(unix)'.dependencies]
 # Should be kept in sync with the libdatadog symbolizer crate (also using blasesym)

data-pipeline-ffi/Cargo.toml

@@ -12,6 +12,7 @@ license.workspace = true
 
 [lib]
 crate-type = ["lib", "staticlib", "cdylib"]
+bench = false
 
 [features]
 default = ["cbindgen"]

data-pipeline/Cargo.toml

@@ -21,3 +21,6 @@ ddcommon = { path = "../ddcommon" }
 datadog-trace-protobuf = { path = "../trace-protobuf" }
 datadog-trace-utils = { path = "../trace-utils" }
 datadog-trace-normalization = { path = "../trace-normalization" }
+
+[lib]
+bench = false

ddcommon-ffi/Cargo.toml

@@ -8,6 +8,9 @@ version.workspace = true
 rust-version.workspace = true
 license.workspace = true
 
+[lib]
+bench =false
+
 [features]
 default = ["cbindgen"]
 cbindgen = ["build_common/cbindgen"]

ddcommon/Cargo.toml

@@ -10,6 +10,7 @@ license.workspace = true
 
 [lib]
 crate-type = ["lib"]
+bench =false
 
 [dependencies]
 anyhow = "1.0"

ddsketch/Cargo.toml

@@ -17,3 +17,6 @@ protoc-bin-vendored = { version = "3.0.0", optional = true }
 
 [features]
 generate-protobuf = ["dep:prost-build", "dep:protoc-bin-vendored"]
+
+[lib]
+bench = false

ddtelemetry-ffi/Cargo.toml

@@ -10,6 +10,7 @@ license.workspace = true
 
 [lib]
 crate-type = ["lib", "staticlib", "cdylib"]
+bench = false
 
 [features]
 default = ["cbindgen", "expanded_builder_macros"]

ddtelemetry/Cargo.toml

@@ -6,6 +6,9 @@ version.workspace = true
 rust-version.workspace = true
 license.workspace = true
 
+[lib]
+bench = false
+
 [features]
 default = []
 tracing = ["tracing/std"]

ipc/Cargo.toml

@@ -52,6 +52,9 @@ winapi = { version = "0.3.9", features = ["handleapi", "memoryapi", "winbase", "
 windows-sys = { version = "0.48.0", features = ["Win32_System", "Win32_System_WindowsProgramming", "Win32_Foundation"] }
 tokio = { version = "1.23", features = ["sync", "io-util", "signal", "net"] }
 
+[lib]
+bench = false
+
 [[bench]]
 harness = false
 name = "ipc"

ipc/benches/ipc.rs

@@ -3,13 +3,14 @@
 
 #[cfg(not(windows))]
 use criterion::{criterion_group, criterion_main, Criterion};
+#[cfg(all(not(windows), not(target_arch = "aarch64")))]
+use datadog_ipc::example_interface::ExampleInterfaceResponse;
 #[cfg(not(windows))]
 use datadog_ipc::{
-    example_interface::{
-        ExampleInterfaceRequest, ExampleInterfaceResponse, ExampleServer, ExampleTransport,
-    },
+    example_interface::{ExampleInterfaceRequest, ExampleServer, ExampleTransport},
     platform::Channel,
 };
+
 #[cfg(not(windows))]
 use std::{
     os::unix::net::UnixStream,
@@ -41,17 +42,23 @@ fn criterion_benchmark(c: &mut Criterion) {
         b.iter(|| transport.send(ExampleInterfaceRequest::Notify {}).unwrap())
     });
 
+    // This consistently blocks on aarch64 (both MacOS and Linux), is there an issue with the
+    // optimized code?
+    #[cfg(not(target_arch = "aarch64"))]
     c.bench_function("two way interface", |b| {
         b.iter(|| transport.call(ExampleInterfaceRequest::ReqCnt {}).unwrap())
     });
 
-    let requests_received = match transport.call(ExampleInterfaceRequest::ReqCnt {}).unwrap() {
-        ExampleInterfaceResponse::ReqCnt(cnt) => cnt,
+    // This consistently blocks on aarch64 (both MacOS and Linux), is there an issue with the
+    // optimized code?
+    #[cfg(not(target_arch = "aarch64"))]
+    match transport.call(ExampleInterfaceRequest::ReqCnt {}).unwrap() {
+        ExampleInterfaceResponse::ReqCnt(cnt) => {
+            println!("Total requests handled: {cnt}");
+        }
         _ => panic!("shouldn't happen"),
     };
 
-    println!("Total requests handled: {requests_received}");
-
     drop(transport);
     worker.join().unwrap();
 }

ipc/macros/Cargo.toml

@@ -6,6 +6,7 @@ version = "0.0.1"
 
 [lib]
 proc-macro = true
+bench = false
 
 [dependencies]
 syn = "^2"

ipc/tarpc/plugins/Cargo.toml

@@ -26,6 +26,7 @@ syn = { version = "1.0", features = ["full"] }
 
 [lib]
 proc-macro = true
+bench = false
 
 [dev-dependencies]
 assert-type-eq = "0.1.0"

ipc/tarpc/tarpc/Cargo.toml

@@ -16,6 +16,9 @@ categories = ["asynchronous", "network-programming"]
 readme = "README.md"
 description = "An RPC framework for Rust with a focus on ease of use."
 
+[lib]
+bench = false
+
 [features]
 default = []
 

profiling-ffi/Cargo.toml

@@ -12,6 +12,7 @@ license.workspace = true
 # LTO is ignored if "lib" is added as crate type
 # cf. https://github.com/rust-lang/rust/issues/51009
 crate-type = ["staticlib", "cdylib"]
+bench = false
 
 [features]
 default = []

profiling-replayer/Cargo.toml

@@ -13,3 +13,7 @@ clap = { version = "4.3.21", features = ["cargo", "color", "derive"] }
 datadog-profiling = { path = "../profiling"}
 prost = "0.12"
 sysinfo = {version = "0.29.8", default-features = false}
+
+[[bin]]
+name = "datadog-profiling-replayer"
+bench = false

profiling/Cargo.toml

@@ -7,9 +7,11 @@ edition.workspace = true
 version.workspace = true
 rust-version.workspace = true
 license.workspace = true
+autobenches = false
 
 [lib]
 crate-type = ["lib"]
+bench = false
 
 [[bench]]
 name = "main"

serverless/Cargo.toml

@@ -8,4 +8,8 @@ log = "0.4"
 env_logger = "0.10.0"
 datadog-trace-mini-agent = { path = "../trace-mini-agent" }
 datadog-trace-protobuf = { path = "../trace-protobuf" }
-datadog-trace-utils = { path = "../trace-utils" }
+datadog-trace-utils = { path = "../trace-utils" }
+
+[[bin]]
+name = "datadog-serverless-trace-mini-agent"
+bench = false

sidecar-ffi/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2021"
 
 [lib]
 crate-type = ["lib", "staticlib", "cdylib"]
+bench = false
 
 [dependencies]
 ddtelemetry = { path = "../ddtelemetry" }

sidecar/Cargo.toml

@@ -4,6 +4,9 @@ license = "Apache 2.0"
 name = "datadog-sidecar"
 version = "0.0.1"
 
+[lib]
+bench = false
+
 [features]
 default = ["tracing"]
 tracing = ["tracing/std", "tracing-log", "tracing-subscriber"]

sidecar/macros/Cargo.toml

@@ -6,6 +6,7 @@ version = "0.0.1"
 
 [lib]
 proc-macro = true
+bench = false
 
 [dependencies]
 syn = { version = "^2", features = ["full"] }

spawn_worker/Cargo.toml

@@ -3,6 +3,9 @@ edition = "2021"
 name = "spawn_worker"
 version = "0.0.1"
 
+[lib]
+bench = false
+
 [dependencies]
 anyhow = { version = "1.0" }
 io-lifetimes = { version = "1.0" }

symbolizer-ffi/Cargo.toml

@@ -12,6 +12,7 @@ build_common = { path = "../build-common" }
 
 [lib]
 crate-type = ["lib"]
+bench = false
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
 # Should be kept in sync with the libdatadog crashtracker crate (also using blasesym)

tests/spawn_from_lib/Cargo.toml

@@ -6,6 +6,7 @@ version = "0.0.1"
 [lib]
 # needs to by dylib for the trampoline tests to work correctly
 crate-type = ["rlib", "dylib"]
+bench = false
 
 [features]
 # hack to avoid compilation and testing by default

tools/Cargo.toml

@@ -10,9 +10,13 @@ license.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lib]
+bench = false
+
 [dependencies]
 regex = "1"
 lazy_static = "1.4"
 
 [[bin]]
 name = "dedup_headers"
+bench = false

tools/cc_utils/Cargo.toml

@@ -8,3 +8,7 @@ version = "0.1.0"
 [dependencies]
 anyhow = {version = "1.0"}
 cc = {version = "1.0"}
+
+[lib]
+bench = false
+

tools/docker/Dockerfile.build

@@ -107,7 +107,30 @@ COPY "data-pipeline/Cargo.toml" "data-pipeline/"
 COPY "data-pipeline-ffi/Cargo.toml" "data-pipeline-ffi/"
 COPY "bin_tests/Cargo.toml"  "bin_tests/"
 RUN find -name "Cargo.toml" | sed -e s#Cargo.toml#src/lib.rs#g | xargs -n 1 sh -c 'mkdir -p $(dirname $1); touch $1; echo $1' create_stubs
-RUN echo trace-normalization/benches/normalization_utils.rs profiling/benches/main.rs profiling/benches/interning_strings.rs trace-obfuscation/benches/trace_obfuscation.rs tools/src/bin/dedup_headers.rs tools/sidecar_mockgen/src/bin/sidecar_mockgen.rs ddtelemetry/examples/tm-worker-test.rs ipc/benches/ipc.rs ipc/tarpc/tarpc/examples/compression.rs ipc/tarpc/tarpc/examples/custom_transport.rs ipc/tarpc/tarpc/examples/pubsub.rs ipc/tarpc/tarpc/examples/readme.rs ipc/tarpc/tarpc/examples/tracing.rs ipc/tarpc/tarpc/tests/compile_fail.rs ipc/tarpc/tarpc/tests/dataservice.rs ipc/tarpc/tarpc/tests/service_functional.rs bin_tests/src/bin/crashtracker_bin_test.rs bin_tests/src/bin/test_the_tests.rs | xargs -n 1 sh -c 'mkdir -p $(dirname $1); touch $1; echo $1' create_stubs
+RUN echo \
+    bin_tests/src/bin/crashtracker_bin_test.rs \
+    bin_tests/src/bin/crashtracker_receiver.rs \
+    bin_tests/src/bin/crashtracker_unix_socket_receiver.rs \
+    bin_tests/src/bin/test_the_tests.rs \
+    ddtelemetry/examples/tm-worker-test.rs \
+    ipc/benches/ipc.rs \
+    ipc/tarpc/tarpc/examples/compression.rs \
+    ipc/tarpc/tarpc/examples/custom_transport.rs \
+    ipc/tarpc/tarpc/examples/pubsub.rs \
+    ipc/tarpc/tarpc/examples/readme.rs \
+    ipc/tarpc/tarpc/examples/tracing.rs \
+    ipc/tarpc/tarpc/tests/compile_fail.rs \
+    ipc/tarpc/tarpc/tests/dataservice.rs \
+    ipc/tarpc/tarpc/tests/service_functional.rs \
+    profiling-replayer/src/main.rs \
+    profiling/benches/interning_strings.rs \
+    profiling/benches/main.rs \
+    serverless/src/main.rs \
+    tools/sidecar_mockgen/src/bin/sidecar_mockgen.rs \
+    tools/src/bin/dedup_headers.rs \
+    trace-normalization/benches/normalization_utils.rs \
+    trace-obfuscation/benches/trace_obfuscation.rs \
+    | xargs -n 1 sh -c 'mkdir -p $(dirname $1); touch $1; echo $1' create_stubs
 
 # cache dependencies
 RUN cargo fetch --locked

tools/sidecar_mockgen/Cargo.toml

@@ -3,8 +3,12 @@ edition = "2021"
 name = "sidecar_mockgen"
 version = "0.1.0"
 
+[lib]
+bench = false
+
 [dependencies]
 object = {version = "0.31.0"}
 
 [[bin]]
 name = "sidecar_mockgen"
+bench = false

trace-mini-agent/Cargo.toml

@@ -3,6 +3,10 @@ name = "datadog-trace-mini-agent"
 description = "A subset of the trace agent that is shipped alongside tracers in a few serverless use cases (Google Cloud Functions and Azure Functions)"
 version = "0.4.2"
 edition = "2021"
+autobenches = false
+
+[lib]
+bench = false
 
 [dependencies]
 anyhow = "1.0"

trace-normalization/Cargo.toml

@@ -7,6 +7,9 @@ version.workspace = true
 rust-version.workspace = true
 license.workspace = true
 
+[lib]
+bench = false
+
 [dependencies]
 anyhow = "1.0"
 datadog-trace-protobuf = { path = "../trace-protobuf" }

trace-obfuscation/Cargo.toml

@@ -24,6 +24,9 @@ duplicate = "0.4.1"
 criterion = { version = "0.5", features = [ "csv_output"] }
 datadog-trace-utils = { path = "../trace-utils", features = ["test-utils"] }
 
+[lib]
+bench = false
+
 [[bench]]
 name = "trace_obfuscation"
 harness = false