Skip to content

Commit b74e52a

Browse files
committed
chore(bin-tests): use builder
1 parent ff68810 commit b74e52a

File tree

3 files changed

+34
-43
lines changed

3 files changed

+34
-43
lines changed

bin_tests/src/bin/crashing_test_app.rs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ mod unix {
1818
use std::sync::Arc;
1919
use std::time::Duration;
2020

21-
use libdd_common::{tag, Endpoint};
21+
use libdd_common::tag;
2222
use libdd_crashtracker::{
2323
self as crashtracker, CrashtrackerConfiguration, CrashtrackerReceiverConfig, Metadata,
2424
};
@@ -91,19 +91,17 @@ mod unix {
9191
let stdout_filename = format!("{output_dir}/out.stdout");
9292

9393
ensure!(!output_url.is_empty(), "output_url must not be empty");
94-
let endpoint = Some(Endpoint::from_slice(&output_url));
95-
96-
let config = CrashtrackerConfiguration::new(
97-
vec![], // additional_files
98-
true, // create_alt_stack
99-
true, // use_alt_stack
100-
endpoint,
101-
crashtracker::StacktraceCollection::EnabledWithSymbolsInReceiver,
102-
crashtracker::default_signals(),
103-
Some(TEST_COLLECTOR_TIMEOUT),
104-
Some("".to_string()), // unix_socket_path
105-
true, // demangle_names
106-
)?;
94+
95+
let config = CrashtrackerConfiguration::builder()
96+
.create_alt_stack(true)
97+
.use_alt_stack(true)
98+
.endpoint_url(&output_url)
99+
.resolve_frames(crashtracker::StacktraceCollection::EnabledWithSymbolsInReceiver)
100+
.signals(crashtracker::default_signals())
101+
.timeout(TEST_COLLECTOR_TIMEOUT)
102+
.unix_socket_path("".to_string())
103+
.demangle_names(true)
104+
.build()?;
107105

108106
let metadata = Metadata {
109107
library_name: "libdatadog".to_owned(),

bin_tests/src/bin/crashtracker_bin_test.rs

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mod unix {
2222
use std::process;
2323
use std::time::Duration;
2424

25-
use libdd_common::{tag, Endpoint};
25+
use libdd_common::tag;
2626
use libdd_crashtracker::{
2727
self as crashtracker, CrashtrackerConfiguration, CrashtrackerReceiverConfig, Metadata,
2828
StackFrame, StackTrace,
@@ -73,12 +73,6 @@ mod unix {
7373
let stdout_filename = format!("{output_dir}/out.stdout");
7474
let output_dir: &Path = output_dir.as_ref();
7575

76-
let endpoint = if output_url.is_empty() {
77-
None
78-
} else {
79-
Some(Endpoint::from_slice(output_url))
80-
};
81-
8276
// The configuration can be modified by a Behavior (testing plan), so it is mut here.
8377
// Unlike a normal harness, in this harness tests are run in individual processes, so race
8478
// issues are avoided.
@@ -97,17 +91,16 @@ mod unix {
9791
Err(_) => crashtracker::StacktraceCollection::WithoutSymbols,
9892
};
9993

100-
let mut config = CrashtrackerConfiguration::new(
101-
vec![],
102-
true,
103-
true,
104-
endpoint,
105-
stacktrace_collection,
106-
crashtracker::default_signals(),
107-
Some(TEST_COLLECTOR_TIMEOUT),
108-
Some("".to_string()),
109-
true,
110-
)?;
94+
let mut config = CrashtrackerConfiguration::builder()
95+
.create_alt_stack(true)
96+
.demangle_names(true)
97+
.endpoint_url(output_url)
98+
.resolve_frames(stacktrace_collection)
99+
.signals(crashtracker::default_signals())
100+
.timeout(TEST_COLLECTOR_TIMEOUT)
101+
.unix_socket_path("".to_string())
102+
.use_alt_stack(true)
103+
.build()?;
111104

112105
let metadata = Metadata {
113106
library_name: "libdatadog".to_owned(),

bin_tests/tests/crashtracker_bin_test.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,23 +1331,23 @@ fn crash_tracking_empty_endpoint() {
13311331
#[cfg_attr(miri, ignore)]
13321332
#[cfg(unix)]
13331333
fn test_receiver_emits_debug_logs_on_receiver_issue() -> anyhow::Result<()> {
1334+
use std::time::Duration;
1335+
13341336
let receiver = artifacts::crashtracker_receiver(BuildProfile::Debug);
13351337
let artifacts = build_artifacts(&[&receiver])?;
13361338
let fixtures = bin_tests::test_runner::TestFixtures::new()?;
13371339

13381340
let missing_file = fixtures.output_dir.join("missing_additional_file.txt");
13391341

1340-
let config = CrashtrackerConfiguration::new(
1341-
vec![missing_file.display().to_string()],
1342-
true,
1343-
true,
1344-
None,
1345-
StacktraceCollection::WithoutSymbols,
1346-
libdd_crashtracker::default_signals(),
1347-
Some(std::time::Duration::from_millis(500)),
1348-
None,
1349-
true,
1350-
)?;
1342+
let config = CrashtrackerConfiguration::builder()
1343+
.additional_files(vec![missing_file.display().to_string()])
1344+
.create_alt_stack(true)
1345+
.demangle_names(true)
1346+
.resolve_frames(StacktraceCollection::WithoutSymbols)
1347+
.signals(libdd_crashtracker::default_signals())
1348+
.timeout(Duration::from_millis(500))
1349+
.use_alt_stack(true)
1350+
.build()?;
13511351

13521352
let metadata = Metadata {
13531353
library_name: "libdatadog".to_owned(),

0 commit comments

Comments
 (0)