diff --git a/.bazelrc b/.bazelrc index adbae50..acc86ba 100644 --- a/.bazelrc +++ b/.bazelrc @@ -17,7 +17,6 @@ common --registry=https://bcr.bazel.build # Build stamping for version info build --workspace_status_command=$(pwd)/bazel_stamp_vars.sh -build:_common --@score_baselibs//score/mw/log/detail/flags:KUse_Stub_Implementation_Only=False build:_common --@score_baselibs//score/mw/log/flags:KRemote_Logging=False build:_common --@score_baselibs//score/json:base_library=nlohmann build:_common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False diff --git a/MODULE.bazel b/MODULE.bazel index 8f8805d..1323a4c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -65,6 +65,7 @@ bazel_dep(name = "rules_cc", version = "0.2.1") # tooling bazel_dep(name = "score_tooling", version = "1.0.5") +bazel_dep(name = "score_rust_policies", version = "0.0.3") bazel_dep(name = "aspect_rules_lint", version = "1.5.3") bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2") @@ -75,6 +76,12 @@ bazel_dep(name = "score_baselibs", version = "0.1.3") bazel_dep(name = "score_communication", version = "0.1.1") bazel_dep(name = "platforms", version = "1.0.0") bazel_dep(name = "score_bazel_platforms", version = "0.0.2") +bazel_dep(name = "score_logging", version = "0.0.3") +git_override( + module_name = "score_logging", + commit = "9ed6a88cab10a81bf6b0813712cbd7b9fc7e44c5", + remote = "https://github.com/eclipse-score/logging.git", +) # TRLC dependency for requirements traceability bazel_dep(name = "trlc", version = "0.0.0") @@ -87,7 +94,7 @@ git_override( bazel_dep(name = "rules_go", version = "0.59.0") bazel_dep(name = "gazelle", version = "0.42.0", repo_name = "bazel_gazelle") -go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk") +go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk", dev_dependency = True) go_sdk.download( name = "go_sdk", version = "1.23.5", diff --git a/feo/ad-demo/src/activities/application_config.rs b/feo/ad-demo/src/activities/application_config.rs index 6383539..c102e2a 100644 --- a/feo/ad-demo/src/activities/application_config.rs +++ b/feo/ad-demo/src/activities/application_config.rs @@ -51,10 +51,7 @@ pub fn agent_assignments() -> HashMap HashMap ActivityDependencies { - let dependencies = [ - (0.into(), vec![]), - (1.into(), vec![0.into()]), - (2.into(), vec![]), - ]; + let dependencies = [(0.into(), vec![]), (1.into(), vec![0.into()]), (2.into(), vec![])]; dependencies.into() } @@ -84,10 +77,7 @@ pub fn topic_dependencies<'a>() -> Vec> { use Direction::*; vec![ - TopicSpecification::new::( - TOPIC_CAMERA_FRONT, - vec![(0.into(), Outgoing), (1.into(), Incoming)], - ), + TopicSpecification::new::(TOPIC_CAMERA_FRONT, vec![(0.into(), Outgoing), (1.into(), Incoming)]), TopicSpecification::new::(TOPIC_INFERRED_SCENE, vec![(1.into(), Outgoing)]), ] } diff --git a/feo/ad-demo/src/activities/mcap_activity.rs b/feo/ad-demo/src/activities/mcap_activity.rs index b4492a5..ffaf3ee 100644 --- a/feo/ad-demo/src/activities/mcap_activity.rs +++ b/feo/ad-demo/src/activities/mcap_activity.rs @@ -48,11 +48,9 @@ impl Mcap { } pub fn build(activity_id: ActivityId) -> Box { - let mcap_to_map = Self::map_mcap("feo/ad-demo/src/assets/gps_route.mcap") - .expect("Could not open MCAP file"); + let mcap_to_map = Self::map_mcap("feo/ad-demo/src/assets/gps_route.mcap").expect("Could not open MCAP file"); let static_slice: &'static [u8] = Box::leak(mcap_to_map.to_vec().into_boxed_slice()); - let message_stream = - MessageStream::new(static_slice).expect("Failed to create MessageStream"); + let message_stream = MessageStream::new(static_slice).expect("Failed to create MessageStream"); Box::new(Self { activity_id, message_stream, @@ -62,21 +60,20 @@ impl Mcap { fn get_single_msg(&mut self) -> Result> { match self.message_stream.next() { Some(Ok(message)) => { - let data_json = serde_json::from_slice(&message.data) - .context("Failed to convert msg data as JSON")?; + let data_json = serde_json::from_slice(&message.data).context("Failed to convert msg data as JSON")?; debug!("single mcap message data: {}", data_json); Ok(Some(data_json)) - } + }, Some(Err(e)) => { debug!("Error reading MCAP message: {}", e); Ok(None) - } + }, None => { debug!("No more messages in MCAP file"); Ok(None) - } + }, } } @@ -112,8 +109,7 @@ impl Activity for Mcap { debug!("Stepping Mcap"); if let Ok(Some(mcap_msg_json)) = self.get_single_msg() { - let compact_json = - serde_json::to_string(&mcap_msg_json).expect("failed to stringify Json"); + let compact_json = serde_json::to_string(&mcap_msg_json).expect("failed to stringify Json"); debug!("Read Mcap message: {compact_json:?}"); self.send_tcp_msg(&compact_json); diff --git a/feo/ad-demo/src/activities/render_activity.rs b/feo/ad-demo/src/activities/render_activity.rs index 1c89185..a9a69b8 100644 --- a/feo/ad-demo/src/activities/render_activity.rs +++ b/feo/ad-demo/src/activities/render_activity.rs @@ -25,11 +25,7 @@ pub struct SceneRender { } impl SceneRender { - pub fn build( - activity_id: ActivityId, - image_topic: &str, - scene_topic: &str, - ) -> Box { + pub fn build(activity_id: ActivityId, image_topic: &str, scene_topic: &str) -> Box { Box::new(Self { activity_id, input_image: activity_input(image_topic), diff --git a/feo/ad-demo/src/agents/primary.rs b/feo/ad-demo/src/agents/primary.rs index 035779d..bb0f4d4 100644 --- a/feo/ad-demo/src/agents/primary.rs +++ b/feo/ad-demo/src/agents/primary.rs @@ -20,8 +20,8 @@ use feo_time::Duration; use std::collections::HashMap; use ad_demo::activities::application_config::{ - activity_dependencies, agent_assignments, agent_assignments_ids, topic_dependencies, - worker_agent_map, BIND_ADDR, BIND_ADDR2, COM_BACKEND, MAX_ADDITIONAL_SUBSCRIBERS, + activity_dependencies, agent_assignments, agent_assignments_ids, topic_dependencies, worker_agent_map, BIND_ADDR, + BIND_ADDR2, COM_BACKEND, MAX_ADDITIONAL_SUBSCRIBERS, }; const AGENT_ID: AgentId = AgentId::new(100); diff --git a/feo/ad-demo/src/agents/secondary.rs b/feo/ad-demo/src/agents/secondary.rs index 29e1af9..fffd74f 100644 --- a/feo/ad-demo/src/agents/secondary.rs +++ b/feo/ad-demo/src/agents/secondary.rs @@ -12,8 +12,7 @@ // ******************************************************************************* use ad_demo::activities::application_config::{ - agent_assignments, agent_assignments_ids, topic_dependencies, BIND_ADDR, BIND_ADDR2, - COM_BACKEND, + agent_assignments, agent_assignments_ids, topic_dependencies, BIND_ADDR, BIND_ADDR2, COM_BACKEND, }; use core::time::Duration; use feo::agent::com_init::initialize_com_secondary; @@ -48,8 +47,7 @@ fn main() { .collect(); // Initialize topics. Make it alive until application runs. - let _topic_guards = - initialize_com_secondary(COM_BACKEND, topic_dependencies(), &local_activities); + let _topic_guards = initialize_com_secondary(COM_BACKEND, topic_dependencies(), &local_activities); info!("Starting secondary agent {}", secondary_agent_id); diff --git a/src/BUILD b/src/BUILD index 5f80e68..6180746 100644 --- a/src/BUILD +++ b/src/BUILD @@ -22,8 +22,8 @@ cc_binary( ":sample_sender_receiver", "@boost.program_options", "@score_baselibs//score/language/futurecpp", - "@score_baselibs//score/mw/log", "@score_communication//score/mw/com", + "@score_logging//score/mw/log", ], ) @@ -37,7 +37,7 @@ cc_library( ], deps = [ ":datatype", - "@score_baselibs//score/mw/log", + "@score_baselibs//score/mw/log:frontend", "@score_communication//score/mw/com", ], )