Skip to content

Commit 6791712

Browse files
Fix procmgr CI: rustfmt, clippy, and ddot e2e log expectation.
Align restart-policy log assertion with the current message format and resolve rustfmt/clippy failures on the spawn-profiles branch.
1 parent 9e9a772 commit 6791712

16 files changed

Lines changed: 17 additions & 30 deletions

pkg/procmgr/rust/src/manager.rs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,11 @@ impl ProcessManager {
8383
let mut procs = self.processes.write().await;
8484
for &idx in order.iter() {
8585
let proc = &mut procs[idx];
86-
if proc.may_auto_start() {
87-
match proc.spawn() {
88-
Ok(()) => spawn_watcher(proc, exit_tx.clone()),
89-
Err(e) => {
90-
warn!("{e:#}");
91-
queue_restart(proc, restart_tx);
92-
}
93-
}
86+
if proc.may_auto_start()
87+
&& let Err(e) = try_spawn_and_watch(proc, exit_tx)
88+
{
89+
warn!("{e:#}");
90+
queue_restart(proc, restart_tx);
9491
}
9592
proc.record_config_gate_met();
9693
}
@@ -909,10 +906,7 @@ fn queue_restart(proc: &mut ManagedProcess, restart_tx: &mpsc::Sender<PendingRes
909906
}
910907
}
911908

912-
fn try_spawn_and_watch(
913-
proc: &mut ManagedProcess,
914-
exit_tx: &mpsc::Sender<ExitEvent>,
915-
) -> Result<()> {
909+
fn try_spawn_and_watch(proc: &mut ManagedProcess, exit_tx: &mpsc::Sender<ExitEvent>) -> Result<()> {
916910
proc.spawn()?;
917911
spawn_watcher(proc, exit_tx.clone());
918912
Ok(())
@@ -1153,14 +1147,16 @@ mod tests {
11531147
"reload should start the process with fresh counters"
11541148
);
11551149

1156-
mgr.complete_restart(stale_pending, &exit_tx, &restart_tx).await;
1150+
mgr.complete_restart(stale_pending, &exit_tx, &restart_tx)
1151+
.await;
11571152
let pid = mgr.processes().await[0].pid().unwrap();
11581153
test_helpers::cleanup_process(pid);
11591154
Ok(())
11601155
}
11611156

11621157
#[tokio::test]
1163-
async fn test_reload_discards_pending_retry_for_failed_auto_start_false() -> anyhow::Result<()> {
1158+
async fn test_reload_discards_pending_retry_for_failed_auto_start_false() -> anyhow::Result<()>
1159+
{
11641160
let (cmd, _args) = test_helpers::sleep_cmd(60);
11651161
let make_def = |secs: u32| ProcessDefinition {
11661162
name: "action-executor".to_string(),
@@ -1207,7 +1203,8 @@ mod tests {
12071203
mgr.handle_reload_config(&exit_tx, &restart_tx).await?;
12081204
assert!(!mgr.processes().await[0].is_running());
12091205

1210-
mgr.complete_restart(stale_pending, &exit_tx, &restart_tx).await;
1206+
mgr.complete_restart(stale_pending, &exit_tx, &restart_tx)
1207+
.await;
12111208
assert!(
12121209
!mgr.processes().await[0].is_running(),
12131210
"config reload should discard pending crash retries for failed auto_start=false processes"

pkg/procmgr/rust/src/platform/windows/agent_credentials.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/).
44
// Copyright 2026-present Datadog, Inc.
55

6-
76
use anyhow::{Context, Result, bail};
87
use std::ptr;
98
use windows_sys::Win32::Security::Authentication::Identity::{
@@ -34,7 +33,10 @@ pub(crate) enum AgentAccount {
3433
user: String,
3534
password: String,
3635
},
37-
ServiceAccountLogon { domain: String, user: String },
36+
ServiceAccountLogon {
37+
domain: String,
38+
user: String,
39+
},
3840
}
3941

4042
impl AgentAccount {

pkg/procmgr/rust/src/platform/windows/agent_service_sid.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/).
44
// Copyright 2026-present Datadog, Inc.
55

6-
76
use anyhow::{Context, Result, bail};
87
use std::ptr;
98
use windows_sys::Win32::System::Services::{

pkg/procmgr/rust/src/platform/windows/legacy_scm_env.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/).
44
// Copyright 2026-present Datadog, Inc.
55

6-
76
use std::collections::HashMap;
87
use std::sync::Mutex;
98

pkg/procmgr/rust/src/platform/windows/local_account.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/).
44
// Copyright 2026-present Datadog, Inc.
55

6-
76
use anyhow::{Context, Result, bail};
87
use std::ptr;
98
use windows_sys::Win32::Foundation::{ERROR_INSUFFICIENT_BUFFER, WIN32_ERROR};

pkg/procmgr/rust/src/platform/windows/managed_service_account.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/).
44
// Copyright 2026-present Datadog, Inc.
55

6-
76
use anyhow::{Context, Result, bail};
87
use std::ptr;
98
use windows_sys::Win32::Foundation::{

pkg/procmgr/rust/src/platform/windows/pipe_caller.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/).
44
// Copyright 2026-present Datadog, Inc.
55

6-
76
use windows_sys::Win32::Foundation::{HANDLE, TRUE};
87
use windows_sys::Win32::Security::{
98
AllocateAndInitializeSid, EqualSid, FreeSid, GetTokenInformation, IsWellKnownSid, RevertToSelf,

pkg/procmgr/rust/src/platform/windows/pipe_security.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/).
44
// Copyright 2026-present Datadog, Inc.
55

6-
76
use std::ffi::OsStr;
87
use std::io;
98
use std::ptr;

pkg/procmgr/rust/src/platform/windows/scm_service.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/).
44
// Copyright 2026-present Datadog, Inc.
55

6-
76
use std::ffi::c_void;
87
use std::path::PathBuf;
98
use std::sync::Arc;

pkg/procmgr/rust/src/platform/windows/sid.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/).
44
// Copyright 2026-present Datadog, Inc.
55

6-
76
use anyhow::{Result, bail};
87
use std::ptr;
98
use windows_sys::Win32::Security::Authorization::ConvertSidToStringSidW;

0 commit comments

Comments
 (0)