Skip to content
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.

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

[RSDK-8612] capture and cache logs, then upload to app.viam.com #299

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 39 additions & 1 deletion Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ once_cell = "1.18.0"
openssl = { version = "0.10.50" }
pin-project = "1.1.5"
pin-project-lite = "0.2.9"
printf-compat = "0.1.1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea what this costs us in terms of binary size?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A difference of about 20K bytes

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's pretty hefty

proc-macro-crate = "2.0.0"
proc-macro2 = "1.0.67"
prost = "0.11.0"
Expand Down
9 changes: 3 additions & 6 deletions micro-rdk-ffi/src/ffi/runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use std::{
use micro_rdk::common::{
config::ConfigType,
entry::RobotRepresentation,
log::initialize_logger,
provisioning::server::ProvisioningInfo,
registry::{ComponentRegistry, Dependency},
sensor::{SensorError, SensorType},
Expand Down Expand Up @@ -206,16 +207,12 @@ pub unsafe extern "C" fn viam_server_start(ctx: *mut viam_server_context) -> via

#[cfg(not(target_os = "espidf"))]
{
use log::LevelFilter;
env_logger::builder()
.format_timestamp(Some(env_logger::TimestampPrecision::Millis))
.filter_level(LevelFilter::Info)
.init()
initialize_logger::<env_logger::Logger>();
}
#[cfg(target_os = "espidf")]
{
micro_rdk::esp32::esp_idf_svc::sys::link_patches();
micro_rdk::esp32::esp_idf_svc::log::EspLogger::initialize_default();
initialize_logger::<micro_rdk::esp32::esp_idf_svc::log::EspLogger>();
micro_rdk::esp32::esp_idf_svc::sys::esp!(unsafe {
micro_rdk::esp32::esp_idf_svc::sys::esp_vfs_eventfd_register(
&micro_rdk::esp32::esp_idf_svc::sys::esp_vfs_eventfd_config_t { max_fds: 5 },
Expand Down
4 changes: 3 additions & 1 deletion micro-rdk-server/esp32/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ mod esp32 {
RobotConfigurationStorage, RobotCredentials, WifiCredentialStorage, WifiCredentials,
},
entry::RobotRepresentation,
log::initialize_logger,
provisioning::server::ProvisioningInfo,
registry::ComponentRegistry,
},
esp32::{
entry::serve,
esp_idf_svc::{
self,
log::EspLogger,
sys::{g_wifi_feature_caps, CONFIG_FEATURE_CACHE_TX_BUF_BIT},
},
nvs_storage::NVSStorage,
Expand All @@ -45,7 +47,7 @@ mod esp32 {

pub(crate) fn main_esp32() {
esp_idf_svc::sys::link_patches();
esp_idf_svc::log::EspLogger::initialize_default();
initialize_logger::<EspLogger>();

esp_idf_svc::sys::esp!(unsafe {
esp_idf_svc::sys::esp_vfs_eventfd_register(
Expand Down
5 changes: 2 additions & 3 deletions micro-rdk-server/native/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ mod native {
conn::network::ExternallyManagedNetwork,
credentials_storage::{RAMStorage, RobotConfigurationStorage, RobotCredentials},
entry::{serve_with_network, RobotRepresentation},
log::initialize_logger,
provisioning::server::ProvisioningInfo,
registry::ComponentRegistry,
};

pub(crate) fn main_native() {
env_logger::builder()
.format_timestamp(Some(env_logger::TimestampPrecision::Millis))
.init();
initialize_logger::<env_logger::Logger>();

let network = match local_ip_address::local_ip().expect("error parsing local IP") {
std::net::IpAddr::V4(ip) => ExternallyManagedNetwork::new(ip),
Expand Down
5 changes: 4 additions & 1 deletion micro-rdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,19 @@ binstart = ["esp-idf-svc/binstart"]
libstart = ["esp-idf-svc/libstart"]
builtin-components = []
camera = []
esp32 = ["dep:esp-idf-svc", "dep:embedded-svc", "dep:embedded-hal", "esp-idf-svc/std", "esp-idf-svc/alloc"]
esp32 = ["dep:esp-idf-svc", "dep:embedded-svc", "dep:embedded-hal", "esp-idf-svc/std", "esp-idf-svc/alloc", "dep:printf-compat"]
native = ["dep:rustls", "dep:webpki-roots", "dep:rustls-pemfile", "dep:mdns-sd", "dep:local-ip-address", "dep:openssl", "dep:rcgen", "dep:async-std-openssl"]
data-upload-hook-unstable = ["data", "esp32"]
data = []
esp-idf-logs = ["esp32"]

[dev-dependencies]
test-log.workspace = true
env_logger.workspace = true

[target.'cfg(not(target_os = "espidf"))'.dependencies]
async-std-openssl = { workspace = true, optional = true }
env_logger.workspace = true
futures-rustls.workspace = true
local-ip-address = { workspace = true, optional = true }
mdns-sd = { workspace = true, optional = true }
Expand Down Expand Up @@ -81,6 +83,7 @@ ringbuf.workspace = true
pin-project.workspace = true
async-lock.workspace = true
dns-message-parser.workspace = true
printf-compat = { workspace = true, optional = true }

[build-dependencies]
embuild.workspace = true
Expand Down
33 changes: 17 additions & 16 deletions micro-rdk/src/common/entry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use super::{
exec::Executor,
grpc::ServerError,
grpc_client::GrpcClient,
log::config_log_entry,
log::LogUploadTask,
provisioning::server::{serve_provisioning_async, ProvisioningInfo},
registry::ComponentRegistry,
restart_monitor::RestartMonitor,
Expand Down Expand Up @@ -150,15 +150,13 @@ pub async fn serve_inner<S>(
cfg_received_datetime,
) {
Ok(robot) => (robot, None),
Err(err) => {
log::error!("could not build robot from config due to {:?}, defaulting to empty robot until a valid config is accessible", err);
(LocalRobot::new(), Some(err))
}
Err(err) => (LocalRobot::new(), Some(err)),
};
if let Some(err) = err {
log::error!("could not build robot from config due to {:?}, defaulting to empty robot until a valid config is accessible", err);
} else {
log::info!("successfully created robot from config");
};
if let Some(datetime) = cfg_received_datetime {
let logs = vec![config_log_entry(datetime, err)];
let _ = app_client.push_logs(logs).await;
}
Arc::new(Mutex::new(r))
}
};
Expand Down Expand Up @@ -202,13 +200,16 @@ pub async fn serve_inner<S>(
network,
rpc_host,
)
.with_webrtc(webrtc)
.with_periodic_app_client_task(Box::new(RestartMonitor::new(restart)))
.with_periodic_app_client_task(Box::new(ConfigMonitor::new(
*(cfg_response.clone()),
storage.clone(),
restart,
)));
.with_webrtc(webrtc);

let server_builder = server_builder
.with_periodic_app_client_task(Box::new(RestartMonitor::new(restart)))
.with_periodic_app_client_task(Box::new(ConfigMonitor::new(
*(cfg_response.clone()),
storage.clone(),
restart,
)))
.with_periodic_app_client_task(Box::new(LogUploadTask {}));

#[cfg(feature = "native")]
let server_builder = {
Expand Down
Loading
Loading