Skip to content

refactor: parametrize tests #3256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor: parametrize tests #3256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ opentelemetry-proto = { path = "opentelemetry-proto", version= "0.31", default-f
opentelemetry-semantic-conventions = { path = "opentelemetry-semantic-conventions", version = "0.31", default-features = false }
opentelemetry-stdout = { path = "opentelemetry-stdout", version = "0.31", default-features = false }
percent-encoding = "2.0"
rstest = "0.23.0"
rstest = "0.26.1"
schemars = "0.8"
sysinfo = "0.32"
tempfile = "3.3.0"
Expand Down
106 changes: 26 additions & 80 deletions opentelemetry-sdk/src/metrics/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ mod tests {
use std::thread;
use std::time::Duration;

use rstest::rstest;

// Run all tests in this mod
// cargo test metrics::tests --features=testing,spec_unstable_metrics_views
// Note for all tests from this point onwards in this mod:
Expand Down Expand Up @@ -377,34 +379,15 @@ mod tests {
counter_aggregation_overflow_helper_custom_limit(Temporality::Cumulative);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn counter_aggregation_attribute_order_sorted_first_delta() {
// Run this test with stdout enabled to see output.
// cargo test counter_aggregation_attribute_order_sorted_first_delta --features=testing -- --nocapture
counter_aggregation_attribute_order_helper(Temporality::Delta, true);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn counter_aggregation_attribute_order_sorted_first_cumulative() {
// Run this test with stdout enabled to see output.
// cargo test counter_aggregation_attribute_order_sorted_first_cumulative --features=testing -- --nocapture
counter_aggregation_attribute_order_helper(Temporality::Cumulative, true);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn counter_aggregation_attribute_order_unsorted_first_delta() {
#[rstest]
#[case(Temporality::Delta, true)]
#[case(Temporality::Delta, false)]
#[case(Temporality::Cumulative, true)]
#[case(Temporality::Cumulative, false)]
fn counter_aggregation(#[case] temporality: Temporality, #[case] start_sorted: bool) {
// Run this test with stdout enabled to see output.
// cargo test counter_aggregation_attribute_order_unsorted_first_delta --features=testing -- --nocapture

counter_aggregation_attribute_order_helper(Temporality::Delta, false);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn counter_aggregation_attribute_order_unsorted_first_cumulative() {
// Run this test with stdout enabled to see output.
// cargo test counter_aggregation_attribute_order_unsorted_first_cumulative --features=testing -- --nocapture

counter_aggregation_attribute_order_helper(Temporality::Cumulative, false);
// cargo test counter_aggregation_attribute --features=testing -- --nocapture
counter_aggregation_attribute_order_helper(temporality, start_sorted);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
Expand Down Expand Up @@ -473,60 +456,23 @@ mod tests {
observable_gauge_aggregation_helper(Temporality::Cumulative, true);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn observable_counter_aggregation_cumulative_non_zero_increment() {
// Run this test with stdout enabled to see output.
// cargo test observable_counter_aggregation_cumulative_non_zero_increment --features=testing -- --nocapture
observable_counter_aggregation_helper(Temporality::Cumulative, 100, 10, 4, false);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn observable_counter_aggregation_cumulative_non_zero_increment_no_attrs() {
// Run this test with stdout enabled to see output.
// cargo test observable_counter_aggregation_cumulative_non_zero_increment_no_attrs --features=testing -- --nocapture
observable_counter_aggregation_helper(Temporality::Cumulative, 100, 10, 4, true);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn observable_counter_aggregation_delta_non_zero_increment() {
// Run this test with stdout enabled to see output.
// cargo test observable_counter_aggregation_delta_non_zero_increment --features=testing -- --nocapture
observable_counter_aggregation_helper(Temporality::Delta, 100, 10, 4, false);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn observable_counter_aggregation_delta_non_zero_increment_no_attrs() {
// Run this test with stdout enabled to see output.
// cargo test observable_counter_aggregation_delta_non_zero_increment_no_attrs --features=testing -- --nocapture
observable_counter_aggregation_helper(Temporality::Delta, 100, 10, 4, true);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn observable_counter_aggregation_cumulative_zero_increment() {
// Run this test with stdout enabled to see output.
// cargo test observable_counter_aggregation_cumulative_zero_increment --features=testing -- --nocapture
observable_counter_aggregation_helper(Temporality::Cumulative, 100, 0, 4, false);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn observable_counter_aggregation_cumulative_zero_increment_no_attrs() {
// Run this test with stdout enabled to see output.
// cargo test observable_counter_aggregation_cumulative_zero_increment_no_attrs --features=testing -- --nocapture
observable_counter_aggregation_helper(Temporality::Cumulative, 100, 0, 4, true);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn observable_counter_aggregation_delta_zero_increment() {
// Run this test with stdout enabled to see output.
// cargo test observable_counter_aggregation_delta_zero_increment --features=testing -- --nocapture
observable_counter_aggregation_helper(Temporality::Delta, 100, 0, 4, false);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn observable_counter_aggregation_delta_zero_increment_no_attrs() {
#[rstest]
#[case(Temporality::Cumulative, 10, false)]
#[case(Temporality::Cumulative, 10, true)]
#[case(Temporality::Delta, 10, false)]
#[case(Temporality::Delta, 10, true)]
#[case(Temporality::Cumulative, 0, false)]
#[case(Temporality::Cumulative, 0, true)]
#[case(Temporality::Delta, 0, false)]
#[case(Temporality::Delta, 0, true)]
fn observable_counter_aggregation(
#[case] temporality: Temporality,
#[case] increment: u64,
#[case] is_empty_attributes: bool,
) {
// Run this test with stdout enabled to see output.
// cargo test observable_counter_aggregation_delta_zero_increment_no_attrs --features=testing -- --nocapture
observable_counter_aggregation_helper(Temporality::Delta, 100, 0, 4, true);
// cargo test observable_counter_aggregation --features=testing -- --nocapture
observable_counter_aggregation_helper(temporality, 100, increment, 4, is_empty_attributes);
}

fn observable_counter_aggregation_helper(
Expand Down