From d109780092289962a29b10d3cda0b98c6f913ced Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Tue, 18 Feb 2025 20:56:03 -0500 Subject: [PATCH] apply logging to veilid-flutter, fix jvm version --- veilid-flutter/android/build.gradle | 2 +- veilid-flutter/example/android/app/build.gradle | 2 +- veilid-flutter/rust/src/dart_ffi.rs | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/veilid-flutter/android/build.gradle b/veilid-flutter/android/build.gradle index 89c6c6e7..858cba95 100644 --- a/veilid-flutter/android/build.gradle +++ b/veilid-flutter/android/build.gradle @@ -38,7 +38,7 @@ android { } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } sourceSets { diff --git a/veilid-flutter/example/android/app/build.gradle b/veilid-flutter/example/android/app/build.gradle index a23e45e1..6b63331d 100644 --- a/veilid-flutter/example/android/app/build.gradle +++ b/veilid-flutter/example/android/app/build.gradle @@ -31,7 +31,7 @@ android { } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } sourceSets { diff --git a/veilid-flutter/rust/src/dart_ffi.rs b/veilid-flutter/rust/src/dart_ffi.rs index 0f3ad27b..cfd5c036 100644 --- a/veilid-flutter/rust/src/dart_ffi.rs +++ b/veilid-flutter/rust/src/dart_ffi.rs @@ -233,6 +233,9 @@ pub extern "C" fn initialize_veilid_core(platform_config: FfiStr) { let mut layers = Vec::new(); let mut filters = (*FILTERS).lock(); + let mut fields_to_strip = HashSet::<&'static str>::new(); + fields_to_strip.insert(veilid_core::VEILID_LOG_KEY_FIELD); + // Terminal logger if platform_config.logging.terminal.enabled { cfg_if! { @@ -240,6 +243,7 @@ pub extern "C" fn initialize_veilid_core(platform_config: FfiStr) { let filter = veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, &platform_config.logging.terminal.ignore_log_targets, None); let layer = paranoid_android::layer("veilid-flutter") + .map_fmt_fields(|f| veilid_core::FmtStripFields::new(f, fields_to_strip.clone())) .with_ansi(false) .with_filter(filter.clone()); filters.insert("terminal", filter); @@ -249,6 +253,7 @@ pub extern "C" fn initialize_veilid_core(platform_config: FfiStr) { veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, &platform_config.logging.terminal.ignore_log_targets, None); let layer = tracing_subscriber::fmt::Layer::new() .compact() + .map_fmt_fields(|f| veilid_core::FmtStripFields::new(f, fields_to_strip.clone())) .with_ansi(false) .with_writer(std::io::stdout) .with_filter(filter.clone()); @@ -259,6 +264,7 @@ pub extern "C" fn initialize_veilid_core(platform_config: FfiStr) { veilid_core::VeilidLayerFilter::new(platform_config.logging.terminal.level, &platform_config.logging.terminal.ignore_log_targets, None); let layer = tracing_subscriber::fmt::Layer::new() .compact() + .map_fmt_fields(|f| veilid_core::FmtStripFields::new(f, fields_to_strip.clone())) .with_writer(std::io::stdout) .with_filter(filter.clone()); filters.insert("terminal", filter);