Skip to content

Commit 1550d53

Browse files
committed
improve tests
1 parent c7ba6a0 commit 1550d53

File tree

1 file changed

+14
-27
lines changed

1 file changed

+14
-27
lines changed

opentelemetry/src/context.rs

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,43 +1023,28 @@ mod tests {
10231023
// Default context should not be suppressed
10241024
assert!(!Context::is_current_telemetry_suppressed());
10251025

1026-
// Enter a suppressed scope
1027-
{
1028-
let _guard = Context::enter_telemetry_suppressed_scope();
1029-
assert!(Context::is_current_telemetry_suppressed());
1030-
assert!(Context::current().is_telemetry_suppressed());
1031-
}
1026+
// Add an entry to the current context
1027+
let cx_with_value = Context::current().with_value(ValueA(42));
1028+
let _guard_with_value = cx_with_value.attach();
10321029

1033-
// After guard is dropped, should be back to unsuppressed
1034-
assert!(!Context::is_current_telemetry_suppressed());
1035-
assert!(!Context::current().is_telemetry_suppressed());
1036-
}
1037-
1038-
#[test]
1039-
fn test_is_current_telemetry_suppressed() {
1040-
// Ensure we start with a clean context
1041-
let _reset_guard = Context::new().attach();
1042-
1043-
// Default context should not be suppressed
1030+
// Verify the entry is present and context is not suppressed
1031+
assert_eq!(Context::current().get::<ValueA>(), Some(&ValueA(42)));
10441032
assert!(!Context::is_current_telemetry_suppressed());
10451033

10461034
// Enter a suppressed scope
10471035
{
10481036
let _guard = Context::enter_telemetry_suppressed_scope();
1049-
assert!(Context::is_current_telemetry_suppressed());
10501037

1051-
// Test nested context - should not be suppressed
1052-
{
1053-
let _inner_guard = Context::new().attach();
1054-
assert!(!Context::is_current_telemetry_suppressed());
1055-
}
1056-
1057-
// Back to suppressed after inner guard is dropped
1038+
// Verify suppression is active and the entry is still present
10581039
assert!(Context::is_current_telemetry_suppressed());
1040+
assert!(Context::current().is_telemetry_suppressed());
1041+
assert_eq!(Context::current().get::<ValueA>(), Some(&ValueA(42)));
10591042
}
10601043

1061-
// Back to unsuppressed after outer guard is dropped
1044+
// After guard is dropped, should be back to unsuppressed and entry should still be present
10621045
assert!(!Context::is_current_telemetry_suppressed());
1046+
assert!(!Context::current().is_telemetry_suppressed());
1047+
assert_eq!(Context::current().get::<ValueA>(), Some(&ValueA(42)));
10631048
}
10641049

10651050
#[test]
@@ -1081,6 +1066,7 @@ mod tests {
10811066
{
10821067
let _inner = Context::current().with_value(ValueA(1)).attach();
10831068
assert!(Context::is_current_telemetry_suppressed());
1069+
assert_eq!(Context::current().get::<ValueA>(), Some(&ValueA(1)));
10841070
}
10851071

10861072
// Another scenario. This component is unaware of Suppression,
@@ -1089,6 +1075,7 @@ mod tests {
10891075
{
10901076
let _inner = Context::new().with_value(ValueA(1)).attach();
10911077
assert!(!Context::is_current_telemetry_suppressed());
1078+
assert_eq!(Context::current().get::<ValueA>(), Some(&ValueA(1)));
10921079
}
10931080

10941081
// Still suppressed after inner scope
@@ -1099,7 +1086,7 @@ mod tests {
10991086
assert!(!Context::is_current_telemetry_suppressed());
11001087
}
11011088

1102-
#[tokio::test]
1089+
#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
11031090
async fn test_async_suppression() {
11041091
async fn nested_operation() {
11051092
assert!(Context::is_current_telemetry_suppressed());

0 commit comments

Comments
 (0)