Skip to content

Commit 29c494d

Browse files
hdsdavidbarsky
andauthored
mock: document public APIs in the field module (#2443)
This change adds documentation to the tracing-mock `field` module and all the public APIs within it. This includes doctests on all the methods which serve as examples. Additionally, the `field::msg` function (which constructs a field with name "message" and the provided value) was moved to `expect::message`. This is part of a unification of all expectation constructors inside the `expect` module. Refs: #539 Co-authored-by: David Barsky <[email protected]>
1 parent ad2bfaa commit 29c494d

File tree

7 files changed

+390
-33
lines changed

7 files changed

+390
-33
lines changed

tracing-mock/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ Below is an example that checks that an event contains a message:
7171

7272
```rust
7373
use tracing::collect::with_default;
74-
use tracing_mock::{collector, expect, field};
74+
use tracing_mock::{collector, expect};
7575

7676
fn yak_shaving() {
7777
tracing::info!("preparing to shave yaks");
7878
}
7979

8080
let (collector, handle) = collector::mock()
81-
.event(expect::event().with_fields(field::msg("preparing to shave yaks")))
81+
.event(expect::event().with_fields(expect::message("preparing to shave yaks")))
8282
.only()
8383
.run_with_handle();
8484

@@ -102,7 +102,7 @@ Below is a slightly more complex example. `tracing-mock` asserts that, in order:
102102

103103
```rust
104104
use tracing::collect::with_default;
105-
use tracing_mock::{collector, expect, field};
105+
use tracing_mock::{collector, expect};
106106

107107
#[tracing::instrument]
108108
fn yak_shaving(number_of_yaks: u32) {
@@ -128,15 +128,15 @@ let (collector, handle) = collector::mock()
128128
expect::event().with_fields(
129129
expect::field("number_of_yaks")
130130
.with_value(&yak_count)
131-
.and(field::msg("preparing to shave yaks"))
131+
.and(expect::message("preparing to shave yaks"))
132132
.only(),
133133
),
134134
)
135135
.event(
136136
expect::event().with_fields(
137137
expect::field("all_yaks_shaved")
138138
.with_value(&true)
139-
.and(field::msg("yak shaving completed."))
139+
.and(expect::message("yak shaving completed."))
140140
.only(),
141141
),
142142
)

tracing-mock/src/collector.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//!
1313
//! let (collector, handle) = collector::mock()
1414
//! // Expect a single event with a specified message
15-
//! .event(expect::event().with_fields(field::msg("droids")))
15+
//! .event(expect::event().with_fields(expect::message("droids")))
1616
//! .only()
1717
//! .run_with_handle();
1818
//!
@@ -40,7 +40,7 @@
4040
//! // Enter a matching span
4141
//! .enter(span.clone())
4242
//! // Record an event with message "collect parting message"
43-
//! .event(expect::event().with_fields(field::msg("collect parting message")))
43+
//! .event(expect::event().with_fields(expect::message("collect parting message")))
4444
//! // Record a value for the field `parting` on a matching span
4545
//! .record(span.clone(), expect::field("parting").with_value(&"goodbye world!"))
4646
//! // Exit a matching span
@@ -81,7 +81,7 @@
8181
//! .named("my_span");
8282
//! let (collector, handle) = collector::mock()
8383
//! .enter(span.clone())
84-
//! .event(expect::event().with_fields(field::msg("collect parting message")))
84+
//! .event(expect::event().with_fields(expect::message("collect parting message")))
8585
//! .record(span.clone(), expect::field("parting").with_value(&"goodbye world!"))
8686
//! .exit(span)
8787
//! .only()
@@ -221,7 +221,7 @@ pub struct MockHandle(Arc<Mutex<VecDeque<Expect>>>, String);
221221
/// // Enter a matching span
222222
/// .enter(span.clone())
223223
/// // Record an event with message "collect parting message"
224-
/// .event(expect::event().with_fields(field::msg("collect parting message")))
224+
/// .event(expect::event().with_fields(expect::message("collect parting message")))
225225
/// // Record a value for the field `parting` on a matching span
226226
/// .record(span.clone(), expect::field("parting").with_value(&"goodbye world!"))
227227
/// // Exit a matching span

tracing-mock/src/event.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pub struct ExpectedEvent {
4848
}
4949

5050
pub fn msg(message: impl fmt::Display) -> ExpectedEvent {
51-
expect::event().with_fields(field::msg(message))
51+
expect::event().with_fields(expect::message(message))
5252
}
5353

5454
impl ExpectedEvent {

tracing-mock/src/expect.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ where
3838
}
3939
}
4040

41+
pub fn message(message: impl fmt::Display) -> ExpectedField {
42+
ExpectedField {
43+
name: "message".to_string(),
44+
value: ExpectedValue::Debug(message.to_string()),
45+
}
46+
}
47+
4148
pub fn span() -> ExpectedSpan {
4249
ExpectedSpan {
4350
..Default::default()

0 commit comments

Comments
 (0)