Skip to content

Assert explicitly that shutdown succeeded in Integration tests #2605

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

Merged
cijothomas merged 2 commits into from
Feb 4, 2025
+6 −3
Merged

Assert explicitly that shutdown succeeded in Integration tests #2605

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e80b637
Assert explicitly that shutdown succeeded in Integration tests
cijothomas Feb 4, 2025
f4f50f6
Merge branch 'main' into cijothomas/int-test-nits
cijothomas Feb 4, 2025
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
9 changes: 6 additions & 3 deletions opentelemetry-otlp/tests/integration_test/tests/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,11 @@ mod metrictests {
);

// In tokio::current_thread flavor, shutdown must be done in a separate thread
let _res = Handle::current()
let shutdown_resut = Handle::current()
Copy link
Member

@lalitb lalitb Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit shutdown_result all the places.

.spawn_blocking(move || meter_provider.shutdown())
.await
.unwrap();
assert!(shutdown_resut.is_ok());
// We still need to sleep, to give otel-collector a chance to flush to disk
std::thread::sleep(SLEEP_DURATION);

Expand Down Expand Up @@ -101,7 +102,8 @@ mod metrictests {
],
);

meter_provider.shutdown()?;
let shutdown_resut = meter_provider.shutdown();
assert!(shutdown_resut.is_ok());
// We still need to sleep, to give otel-collector a chance to flush to disk
std::thread::sleep(SLEEP_DURATION);

Expand All @@ -127,7 +129,8 @@ mod metrictests {
],
);

meter_provider.shutdown()?;
let shutdown_resut = meter_provider.shutdown();
assert!(shutdown_resut.is_ok());
// We still need to sleep, to give otel-collector a chance to flush to disk
std::thread::sleep(SLEEP_DURATION);

Expand Down