Skip to content

score-log integration #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masc2023 merged 1 commit into from
Feb 26, 2026
Merged

score-log integration #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@ exports_files([
test_suite(
name = "unit_tests",
tests = [
"//src/feo-logger:libfeo_logger_rust_test",
"//src/feo-time:libfeo_time_cc_test",
"//src/feo-time:libfeo_time_test",
"//src/logd:liblogd_test",
],
)
118 changes: 1 addition & 117 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ members = [
"feo-com",
"feo-cpp-build",
"feo-cpp-macros",
"feo-log",
"feo-logger",
"feo-time",
"feo-tracer",
"feo-tracing",
"logd",
"perfetto-model",
"tests/rust/feo_tests/test_agent",
"tests/rust/feo_tests",
Expand All @@ -35,8 +32,6 @@ feo = { path = "feo", default-features = false }
feo-com = { path = "feo-com" }
feo-cpp-build = { path = "feo-cpp-build" }
feo-cpp-macros = { path = "feo-cpp-macros" }
feo-log = { path = "feo-log" }
feo-logger = { path = "feo-logger" }
feo-time = { path = "feo-time" }
feo-tracing = { path = "feo-tracing" }
ctrlc = { version = "3.4.4", features = ["termination"] }
Expand Down
6 changes: 6 additions & 0 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ bazel_dep(name = "score_bazel_platforms", version = "0.0.4")
# SCORE bazel module dependencies
bazel_dep(name = "score_tooling", version = "1.1.0")
bazel_dep(name = "score_crates", version = "0.0.6")
bazel_dep(name = "score_baselibs_rust", version = "0.1.0")
git_override(
module_name = "score_baselibs_rust",
commit = "1b9f2786cd746ae9745dd2e81bf9073b4185a5e2",
remote = "https://github.com/eclipse-score/baselibs_rust.git",
)

# Rust rules for Bazel
bazel_dep(name = "rules_rust", version = "0.67.0")
Expand Down
6 changes: 2 additions & 4 deletions examples/rust/cycle-benchmark/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ rust_library(
deps = [
"//src/feo:libfeo_recording_rust",
"//src/feo-com:libfeo_com_rust",
"//src/feo-log:libfeo_log_rust",
"//src/feo-logger:libfeo_logger_rust",
"//src/feo-time:libfeo_time_rust",
"//src/feo-tracing:libfeo_tracing_rust",
"@score_baselibs_rust//src/log/score_log",
"@score_crates//:postcard",
"@score_crates//:serde",
"@score_crates//:serde_json",
Expand All @@ -56,9 +55,8 @@ rust_binary(
deps = [
":libcycle_benchmark_rust",
"//src/feo:libfeo_recording_rust",
"//src/feo-log:libfeo_log_rust",
"//src/feo-logger:libfeo_logger_rust",
"//src/feo-time:libfeo_time_rust",
"//src/feo-tracing:libfeo_tracing_rust",
"@score_baselibs_rust//src/log/score_log",
],
)
2 changes: 0 additions & 2 deletions examples/rust/cycle-benchmark/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ required-features = []

[dependencies]
feo = { workspace = true }
feo-log = { workspace = true }
feo-logger = { workspace = true }
feo-time = { workspace = true }
feo-tracing = { workspace = true }
tracing = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions examples/rust/cycle-benchmark/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crate::composites::{composite_builder, find_composites};
use core::net::{IpAddr, Ipv4Addr, SocketAddr};
use feo::activity::ActivityIdAndBuilder;
use feo::ids::{ActivityId, AgentId, WorkerId};
use feo_log::info;
use score_log::info;
use serde::Deserialize;
use serde_json;
use std::collections::{HashMap, HashSet};
Expand Down Expand Up @@ -252,7 +252,7 @@ fn application_config() -> ApplicationConfig {
.join(CONFIG_PATH)
.canonicalize()
.unwrap();
info!("Reading configuration from {}", config_file.display());
info!("Reading configuration from {}", format!("{config_file:?}"));

let file = File::open(config_file).unwrap_or_else(|e| panic!("failed to open config file: {e}"));
let reader = BufReader::new(file);
Expand Down
22 changes: 10 additions & 12 deletions examples/rust/mini-adas/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,9 @@ rust_library(
"//src/feo:libfeo_rust",
"//src/feo-com:libfeo_com_rust",
"//src/feo-cpp-build:libfeo_cpp_build_rust",
"//src/feo-log:libfeo_log_rust",
"//src/feo-logger:libfeo_logger_rust",
"//src/feo-time:libfeo_time_rust",
"//src/feo-tracing:libfeo_tracing_rust",
"@score_baselibs_rust//src/log/score_log",
"@score_crates//:tracing",
],
)
Expand Down Expand Up @@ -70,10 +69,9 @@ rust_library(
"//src/feo:libfeo_recording_rust",
"//src/feo-com:libfeo_com_rust",
"//src/feo-cpp-build:libfeo_cpp_build_rust",
"//src/feo-log:libfeo_log_rust",
"//src/feo-logger:libfeo_logger_rust",
"//src/feo-time:libfeo_time_rust",
"//src/feo-tracing:libfeo_tracing_rust",
"@score_baselibs_rust//src/log/score_log",
"@score_crates//:postcard",
"@score_crates//:serde",
"@score_crates//:tracing",
Expand All @@ -95,10 +93,10 @@ rust_binary(
deps = [
":libmini_adas_rust",
"//src/feo:libfeo_rust",
"//src/feo-log:libfeo_log_rust",
"//src/feo-logger:libfeo_logger_rust",
"//src/feo-time:libfeo_time_rust",
"//src/feo-tracing:libfeo_tracing_rust",
"@score_baselibs_rust//src/log/score_log",
"@score_baselibs_rust//src/log/stdout_logger",
],
)

Expand All @@ -117,10 +115,10 @@ rust_binary(
deps = [
":libmini_adas_rust",
"//src/feo:libfeo_rust",
"//src/feo-log:libfeo_log_rust",
"//src/feo-logger:libfeo_logger_rust",
"//src/feo-time:libfeo_time_rust",
"//src/feo-tracing:libfeo_tracing_rust",
"@score_baselibs_rust//src/log/score_log",
"@score_baselibs_rust//src/log/stdout_logger",
],
)

Expand All @@ -137,10 +135,10 @@ rust_binary(
deps = [
":libmini_adas_recording_rust",
"//src/feo:libfeo_recording_rust",
"//src/feo-log:libfeo_log_rust",
"//src/feo-logger:libfeo_logger_rust",
"//src/feo-time:libfeo_time_rust",
"//src/feo-tracing:libfeo_tracing_rust",
"@score_baselibs_rust//src/log/score_log",
"@score_baselibs_rust//src/log/stdout_logger",
],
)

Expand All @@ -154,9 +152,9 @@ rust_binary(
deps = [
":libmini_adas_recording_rust",
"//src/feo:libfeo_recording_rust",
"//src/feo-log:libfeo_log_rust",
"//src/feo-logger:libfeo_logger_rust",
"//src/feo-tracing:libfeo_tracing_rust",
"@score_baselibs_rust//src/log/score_log",
"@score_baselibs_rust//src/log/stdout_logger",
"@score_crates//:postcard",
"@score_crates//:serde",
],
Expand Down
2 changes: 0 additions & 2 deletions examples/rust/mini-adas/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ required-features = ["recording"]
[dependencies]
feo = { workspace = true }
feo-com = { workspace = true }
feo-log = { workspace = true }
feo-logger = { workspace = true }
feo-cpp-macros = { workspace = true }
feo-time = { workspace = true }
feo-tracing = { workspace = true }
Expand Down
Loading
Loading