Skip to content

Commit 26e7c4d

Browse files
DavSanchezDavSanchez
committed
chore: reformat project
1 parent 0037b2b commit 26e7c4d

File tree

119 files changed

+452
-386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+452
-386
lines changed

‎agent-control/src/agent_control/agent_control.rs‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use crate::agent_control::config_validator::DynamicConfigValidator;
99
use crate::agent_control::error::AgentError;
1010
use crate::agent_control::uptime_report::UptimeReporter;
1111
use crate::event::{
12-
channel::{EventConsumer, EventPublisher},
1312
AgentControlEvent, ApplicationEvent, OpAMPEvent, SubAgentEvent,
13+
channel::{EventConsumer, EventPublisher},
1414
};
1515
use crate::opamp::remote_config::report::OpampRemoteConfigStatus;
1616
use crate::opamp::{
@@ -436,18 +436,18 @@ fn sub_agents_difference<'a>(
436436

437437
#[cfg(test)]
438438
mod tests {
439+
use crate::agent_control::AgentControl;
439440
use crate::agent_control::agent_control::sub_agents_difference;
440441
use crate::agent_control::agent_id::AgentID;
441442
use crate::agent_control::config::{
442443
AgentControlConfig, AgentControlDynamicConfig, SubAgentConfig,
443444
};
444445
use crate::agent_control::config_storer::loader_storer::tests::MockAgentControlDynamicConfigStore;
445-
use crate::agent_control::config_validator::tests::MockDynamicConfigValidator;
446446
use crate::agent_control::config_validator::DynamicConfigValidatorError;
447+
use crate::agent_control::config_validator::tests::MockDynamicConfigValidator;
448+
use crate::agent_control::resource_cleaner::ResourceCleanerError;
447449
use crate::agent_control::resource_cleaner::no_op::NoOpResourceCleaner;
448450
use crate::agent_control::resource_cleaner::tests::MockResourceCleaner;
449-
use crate::agent_control::resource_cleaner::ResourceCleanerError;
450-
use crate::agent_control::AgentControl;
451451
use crate::agent_type::agent_type_id::AgentTypeID;
452452
use crate::agent_type::agent_type_registry::AgentRepositoryError;
453453
use crate::event::channel::pub_sub;
@@ -460,7 +460,7 @@ mod tests {
460460
use crate::sub_agent::health::health_checker::{Healthy, Unhealthy};
461461
use crate::sub_agent::tests::MockStartedSubAgent;
462462
use crate::sub_agent::tests::MockSubAgentBuilder;
463-
use mockall::{predicate, Sequence};
463+
use mockall::{Sequence, predicate};
464464
use std::collections::HashMap;
465465
use std::sync::Arc;
466466
use std::thread::{sleep, spawn};
@@ -1113,9 +1113,11 @@ agents:
11131113
)]))),
11141114
);
11151115

1116-
assert!(agent_control
1117-
.apply_remote_agent_control_config(&remote_config, &mut running_sub_agents)
1118-
.is_err());
1116+
assert!(
1117+
agent_control
1118+
.apply_remote_agent_control_config(&remote_config, &mut running_sub_agents)
1119+
.is_err()
1120+
);
11191121

11201122
assert_eq!(running_sub_agents.len(), 1);
11211123

@@ -1380,9 +1382,12 @@ agents:
13801382
let ev = agent_control_consumer.as_ref().recv().unwrap();
13811383
assert_eq!(expected, ev);
13821384

1383-
let expected = AgentControlEvent::AgentControlBecameUnhealthy(Unhealthy::new(String::default(), String::from(
1384-
"Error applying Agent Control remote config: remote config error: `config hash: `a-hash` config error: `some error message``",
1385-
)));
1385+
let expected = AgentControlEvent::AgentControlBecameUnhealthy(Unhealthy::new(
1386+
String::default(),
1387+
String::from(
1388+
"Error applying Agent Control remote config: remote config error: `config hash: `a-hash` config error: `some error message``",
1389+
),
1390+
));
13861391
let ev = agent_control_consumer.as_ref().recv().unwrap();
13871392
assert_eq!(expected, ev);
13881393
}
@@ -1647,12 +1652,14 @@ agents:
16471652
let diff: Vec<_> = sub_agents_difference(&old_sub_agents, &new_sub_agents).collect();
16481653

16491654
assert_eq!(diff.len(), 2);
1650-
assert!(diff
1651-
.iter()
1652-
.any(|(id, _)| id == &&AgentID::new("infra-agent").unwrap()));
1653-
assert!(diff
1654-
.iter()
1655-
.any(|(id, _)| id == &&AgentID::new("nrdot").unwrap()));
1655+
assert!(
1656+
diff.iter()
1657+
.any(|(id, _)| id == &&AgentID::new("infra-agent").unwrap())
1658+
);
1659+
assert!(
1660+
diff.iter()
1661+
.any(|(id, _)| id == &&AgentID::new("nrdot").unwrap())
1662+
);
16561663
}
16571664

16581665
#[test]

‎agent-control/src/agent_control/agent_id.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ pub struct AgentID(String);
1717

1818
#[derive(Error, Debug)]
1919
pub enum AgentIDError {
20-
#[error("AgentID must contain 32 characters at most, contain lowercase alphanumeric characters or dashes only, start with alphabetic, and end with alphanumeric")]
20+
#[error(
21+
"AgentID must contain 32 characters at most, contain lowercase alphanumeric characters or dashes only, start with alphabetic, and end with alphanumeric"
22+
)]
2123
InvalidFormat,
2224
#[error("AgentID '{0}' is reserved")]
2325
Reserved(String),

‎agent-control/src/agent_control/config.rs‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use super::uptime_report::UptimeReportConfig;
44
use crate::http::config::ProxyConfig;
55
use crate::instrumentation::config::logs::config::LoggingConfig;
66
use crate::opamp::auth::config::AuthConfig;
7-
use crate::opamp::remote_config::validators::signature::validator::SignatureValidatorConfig;
87
use crate::opamp::remote_config::RemoteConfigError;
8+
use crate::opamp::remote_config::validators::signature::validator::SignatureValidatorConfig;
99
use crate::values::yaml_config::YAMLConfig;
1010
use crate::{
1111
agent_type::agent_type_id::AgentTypeID, instrumentation::config::InstrumentationConfig,
@@ -390,10 +390,12 @@ agents: {}
390390
serde_yaml::from_str::<AgentControlDynamicConfig>(EXAMPLE_SUBAGENTS_CONFIG).is_ok()
391391
);
392392
assert!(serde_yaml::from_str::<AgentControlDynamicConfig>(EXAMPLE_K8S_CONFIG).is_ok());
393-
assert!(serde_yaml::from_str::<AgentControlDynamicConfig>(
394-
EXAMPLE_AGENTCONTROL_CONFIG_EMPTY_AGENTS
395-
)
396-
.is_ok());
393+
assert!(
394+
serde_yaml::from_str::<AgentControlDynamicConfig>(
395+
EXAMPLE_AGENTCONTROL_CONFIG_EMPTY_AGENTS
396+
)
397+
.is_ok()
398+
);
397399
assert!(
398400
serde_yaml::from_str::<AgentControlConfig>(EXAMPLE_AGENTCONTROL_CONFIG_NO_AGENTS)
399401
.is_err()
@@ -418,21 +420,25 @@ agents: {}
418420
let actual =
419421
serde_yaml::from_str::<AgentControlConfig>(AGENTCONTROL_CONFIG_RESERVED_AGENT_ID);
420422
assert!(actual.is_err());
421-
assert!(actual
422-
.unwrap_err()
423-
.to_string()
424-
.contains("AgentID 'agent-control' is reserved at line"))
423+
assert!(
424+
actual
425+
.unwrap_err()
426+
.to_string()
427+
.contains("AgentID 'agent-control' is reserved at line")
428+
)
425429
}
426430

427431
#[test]
428432
fn parse_with_missing_k8s_fields() {
429433
let actual =
430434
serde_yaml::from_str::<AgentControlConfig>(AGENTCONTROL_CONFIG_MISSING_K8S_FIELDS);
431435
assert!(actual.is_err());
432-
assert!(actual
433-
.unwrap_err()
434-
.to_string()
435-
.contains("k8s: missing field"));
436+
assert!(
437+
actual
438+
.unwrap_err()
439+
.to_string()
440+
.contains("k8s: missing field")
441+
);
436442
}
437443

438444
#[test]

‎agent-control/src/agent_control/config_storer/store.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::agent_control::config_storer::loader_storer::{
66
AgentControlConfigLoader, AgentControlDynamicConfigDeleter, AgentControlDynamicConfigLoader,
77
AgentControlDynamicConfigStorer,
88
};
9-
use crate::agent_control::defaults::{default_capabilities, AGENT_CONTROL_CONFIG_ENV_VAR_PREFIX};
9+
use crate::agent_control::defaults::{AGENT_CONTROL_CONFIG_ENV_VAR_PREFIX, default_capabilities};
1010
use crate::values::yaml_config::{YAMLConfig, YAMLConfigError};
1111
use crate::values::yaml_config_repository::{YAMLConfigRepository, YAMLConfigRepositoryError};
1212
use config::builder::DefaultState;

‎agent-control/src/agent_control/event_handler/opamp/remote_config.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::sub_agent::health::health_checker::{Healthy, Unhealthy};
99
use crate::{
1010
agent_control::{agent_control::AgentControl, error::AgentError},
1111
opamp::{hash_repository::HashRepository, remote_config::RemoteConfig},
12-
sub_agent::{collection::StartedSubAgents, NotStartedSubAgent, SubAgentBuilder},
12+
sub_agent::{NotStartedSubAgent, SubAgentBuilder, collection::StartedSubAgents},
1313
};
1414
use opamp_client::StartedClient;
1515
use tracing::{error, info};
@@ -82,7 +82,7 @@ mod tests {
8282
opamp::{
8383
client_builder::tests::MockStartedOpAMPClient,
8484
hash_repository::repository::tests::MockHashRepository,
85-
remote_config::{hash::Hash, ConfigurationMap, RemoteConfig},
85+
remote_config::{ConfigurationMap, RemoteConfig, hash::Hash},
8686
},
8787
sub_agent::{
8888
collection::StartedSubAgents,

‎agent-control/src/agent_control/http_server/async_bridge.rs‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,51 @@ pub fn run_async_sync_bridge(
1515
sub_agent_consumer: EventConsumer<SubAgentEvent>,
1616
stop_rx: EventConsumer<()>,
1717
) -> JoinHandle<()> {
18-
spawn_named_thread("Async-Sync bridge", move || loop {
19-
select! {
20-
recv(&agent_control_consumer.as_ref()) -> sa_event_res => {
21-
match sa_event_res {
22-
Ok(agent_control_event) => {
23-
let _ = async_sa_publisher.send(agent_control_event).inspect_err(|err| {
24-
error!(
18+
spawn_named_thread("Async-Sync bridge", move || {
19+
loop {
20+
select! {
21+
recv(&agent_control_consumer.as_ref()) -> sa_event_res => {
22+
match sa_event_res {
23+
Ok(agent_control_event) => {
24+
let _ = async_sa_publisher.send(agent_control_event).inspect_err(|err| {
25+
error!(
26+
error_msg = %err,
27+
"cannot forward agent control event"
28+
);
29+
});
30+
}
31+
Err(err) => {
32+
debug!(
2533
error_msg = %err,
26-
"cannot forward agent control event"
34+
"status server bridge channel closed"
2735
);
28-
});
36+
break;
37+
}
2938
}
30-
Err(err) => {
31-
debug!(
32-
error_msg = %err,
33-
"status server bridge channel closed"
34-
);
35-
break;
36-
}
37-
}
38-
},
39-
recv(&sub_agent_consumer.as_ref()) -> suba_event_res => {
40-
match suba_event_res {
41-
Ok(sub_agent_event) => {
42-
let _ = async_suba_publisher.send(sub_agent_event).inspect_err(|err| {
43-
error!(
39+
},
40+
recv(&sub_agent_consumer.as_ref()) -> suba_event_res => {
41+
match suba_event_res {
42+
Ok(sub_agent_event) => {
43+
let _ = async_suba_publisher.send(sub_agent_event).inspect_err(|err| {
44+
error!(
45+
error_msg = %err,
46+
"cannot forward agent control event"
47+
);
48+
});
49+
}
50+
Err(err) => {
51+
debug!(
4452
error_msg = %err,
45-
"cannot forward agent control event"
53+
"status server bridge channel closed"
4654
);
47-
});
48-
}
49-
Err(err) => {
50-
debug!(
51-
error_msg = %err,
52-
"status server bridge channel closed"
53-
);
54-
break;
55+
break;
56+
}
5557
}
58+
},
59+
recv(&stop_rx.as_ref()) -> _ => {
60+
debug!("status server bridge stopping");
61+
break;
5662
}
57-
},
58-
recv(&stop_rx.as_ref()) -> _ => {
59-
debug!("status server bridge stopping");
60-
break;
6163
}
6264
}
6365
})

‎agent-control/src/agent_control/http_server/config.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl Display for Host {
5353
#[cfg(test)]
5454
mod tests {
5555
use crate::agent_control::http_server::config::{
56-
Host, Port, ServerConfig, DEFAULT_HOST, DEFAULT_PORT,
56+
DEFAULT_HOST, DEFAULT_PORT, Host, Port, ServerConfig,
5757
};
5858
use serde::Deserialize;
5959

‎agent-control/src/agent_control/http_server/runner.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ mod tests {
164164
use tracing_test::traced_test;
165165

166166
use crate::agent_control::http_server::config::ServerConfig;
167-
use crate::event::channel::pub_sub;
168167
use crate::event::AgentControlEvent;
168+
use crate::event::channel::pub_sub;
169169

170170
use super::Runner;
171171

‎agent-control/src/agent_control/http_server/server.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
use crate::agent_control::config::OpAMPClientConfig;
2-
use crate::agent_control::http_server::config::{ServerConfig, DEFAULT_WORKERS};
2+
use crate::agent_control::http_server::StatusServerError;
3+
use crate::agent_control::http_server::config::{DEFAULT_WORKERS, ServerConfig};
34
use crate::agent_control::http_server::status::Status;
45
use crate::agent_control::http_server::status_handler::status_handler;
56
use crate::agent_control::http_server::status_updater::on_agent_control_event_update_status;
6-
use crate::agent_control::http_server::StatusServerError;
77
use crate::event::{AgentControlEvent, SubAgentEvent};
8-
use actix_web::{dev::ServerHandle, web, App, HttpServer};
9-
use std::sync::mpsc;
8+
use actix_web::{App, HttpServer, dev::ServerHandle, web};
109
use std::sync::Arc;
10+
use std::sync::mpsc;
1111
use tokio::runtime::Handle;
12-
use tokio::sync::mpsc::UnboundedReceiver;
1312
use tokio::sync::RwLock;
13+
use tokio::sync::mpsc::UnboundedReceiver;
1414
use tracing::{debug, error, info};
1515

1616
pub async fn run_status_server(

‎agent-control/src/agent_control/http_server/status.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use crate::sub_agent::health::health_checker::{Healthy, Unhealthy};
66
use crate::sub_agent::health::with_start_time::HealthWithStartTime;
77
use crate::sub_agent::identity::AgentIdentity;
88
use serde::Serialize;
9-
use std::collections::hash_map::Entry;
109
use std::collections::HashMap;
10+
use std::collections::hash_map::Entry;
1111
use std::time::SystemTime;
1212
use url::Url;
1313

0 commit comments

Comments
 (0)