Merge branch 'crate-updates' into 'main'

Crate updates

See merge request veilid/veilid!296
This commit is contained in:
Christien Rioux 2024-07-18 00:39:24 +00:00
commit 65509efc08
9 changed files with 456 additions and 278 deletions

488
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -39,7 +39,7 @@ cursive_buffered_backend = { git = "https://gitlab.com/veilid/cursive-buffered-b
# cursive-multiplex = "0.6.0"
# cursive_tree_view = "0.6.0"
cursive_table_view = { git = "https://gitlab.com/veilid/cursive-table-view.git" }
arboard = "3.3.0"
arboard = "3.4.0"
# cursive-tabs = "0.5.0"
clap = { version = "4", features = ["derive"] }
directories = "^5"
@ -63,9 +63,9 @@ flume = { version = "^0", features = ["async"] }
data-encoding = { version = "^2" }
indent = { version = "0.1.1" }
chrono = "0.4.31"
chrono = "0.4.38"
owning_ref = "0.4.1"
unicode-width = "0.1.11"
unicode-width = "0.1.13"
lru = "0.10.1"
rustyline-async = "0.4.2"
console = "0.15.8"

View File

@ -60,78 +60,78 @@ veilid_core_ios_tests = ["dep:tracing-oslog"]
veilid-tools = { version = "0.3.3", path = "../veilid-tools", features = [
"tracing",
], default-features = false }
paste = "1.0.14"
paste = "1.0.15"
once_cell = "1.19.0"
backtrace = "0.3.69"
num-traits = "0.2.17"
backtrace = "0.3.71"
num-traits = "0.2.19"
shell-words = "1.1.0"
static_assertions = "1.1.0"
cfg-if = "1.0.0"
hex = "0.4.3"
lazy_static = "1.4.0"
lazy_static = "1.5.0"
directories = "5.0.1"
# Logging
tracing = { version = "0.1.40", features = ["log", "attributes"] }
tracing-subscriber = "0.3.18"
tracing-error = "0.2.0"
eyre = "0.6.11"
thiserror = "1.0.50"
eyre = "0.6.12"
thiserror = "1.0.63"
# Data structures
enumset = { version = "1.1.3", features = ["serde"] }
keyvaluedb = "0.1.2"
range-set-blaze = "0.1.13"
range-set-blaze = "0.1.16"
weak-table = "0.3.2"
hashlink = { package = "veilid-hashlink", version = "0.1.0", features = [
"serde_impl",
] }
# System
futures-util = { version = "0.3.29", default-features = false, features = [
futures-util = { version = "0.3.30", default-features = false, features = [
"alloc",
] }
flume = { version = "0.11.0", features = ["async"] }
parking_lot = "0.12.1"
lock_api = "0.4.11"
parking_lot = "0.12.3"
lock_api = "0.4.12"
stop-token = { version = "0.7.0", default-features = false }
# Crypto
ed25519-dalek = { version = "2.1.0", default-features = false, features = [
ed25519-dalek = { version = "2.1.1", default-features = false, features = [
"alloc",
"rand_core",
"digest",
"zeroize",
] }
x25519-dalek = { version = "2.0.0", default-features = false, features = [
x25519-dalek = { version = "2.0.1", default-features = false, features = [
"alloc",
"static_secrets",
"zeroize",
"precomputed-tables",
] }
curve25519-dalek = { version = "4.1.1", default-features = false, features = [
curve25519-dalek = { version = "4.1.3", default-features = false, features = [
"alloc",
"zeroize",
"precomputed-tables",
] }
blake3 = { version = "1.5.0" }
blake3 = { version = "1.5.3" }
chacha20poly1305 = "0.10.1"
chacha20 = "0.9.1"
argon2 = "0.5.2"
argon2 = "0.5.3"
# Network
async-std-resolver = { version = "0.24.0", optional = true }
hickory-resolver = { version = "0.24.0", optional = true }
async-std-resolver = { version = "0.24.1", optional = true }
hickory-resolver = { version = "0.24.1", optional = true }
# Serialization
capnp = { version = "0.19.5", default-features = false, features = ["alloc"] }
serde = { version = "1.0.193", features = ["derive", "rc"] }
serde_json = { version = "1.0.108" }
capnp = { version = "0.19.6", default-features = false, features = ["alloc"] }
serde = { version = "1.0.204", features = ["derive", "rc"] }
serde_json = { version = "1.0.120" }
serde-big-array = "0.5.1"
json = "0.12.4"
data-encoding = { version = "2.5.0" }
schemars = "0.8.16"
lz4_flex = { version = "0.11.1", default-features = false, features = [
data-encoding = { version = "2.6.0" }
schemars = "0.8.21"
lz4_flex = { version = "0.11.3", default-features = false, features = [
"safe-encode",
"safe-decode",
] }
@ -144,18 +144,18 @@ indent = "0.1.1"
# Tools
config = { version = "0.13.4", features = ["yaml"] }
bugsalot = { package = "veilid-bugsalot", version = "0.2.0" }
chrono = "0.4.31"
libc = "0.2.151"
chrono = "0.4.38"
libc = "0.2.155"
nix = "0.27.1"
# System
async-std = { version = "1.12.0", features = ["unstable"], optional = true }
sysinfo = { version = "^0.30.6" }
tokio = { version = "1.35.0", features = ["full"], optional = true }
tokio-util = { version = "0.7.10", features = ["compat"], optional = true }
tokio-stream = { version = "0.1.14", features = ["net"], optional = true }
sysinfo = { version = "^0.30.13" }
tokio = { version = "1.38.1", features = ["full"], optional = true }
tokio-util = { version = "0.7.11", features = ["compat"], optional = true }
tokio-stream = { version = "0.1.15", features = ["net"], optional = true }
async-io = { version = "1.13.0" }
futures-util = { version = "0.3.29", default-features = false, features = [
futures-util = { version = "0.3.30", default-features = false, features = [
"async-await",
"sink",
"std",
@ -167,16 +167,14 @@ keyring-manager = "0.5.1"
keyvaluedb-sqlite = "0.1.2"
# Network
async-tungstenite = { package = "veilid-async-tungstenite", version = "0.23.0", features = [
"async-tls",
] }
async-tungstenite = { version = "0.27.0", features = ["async-tls"] }
igd = { package = "veilid-igd", version = "0.1.1" }
async-tls = { package = "veilid-async-tls", version = "0.12.0" }
async-tls = { version = "0.13.0" }
webpki = "0.22.4"
webpki-roots = "0.25.3"
rustls = "0.21.10"
webpki-roots = "0.25.4"
rustls = "0.21.12"
rustls-pemfile = "1.0.4"
socket2 = { version = "0.5.5", features = ["all"] }
socket2 = { version = "0.5.7", features = ["all"] }
# Dependencies for WASM builds only
[target.'cfg(target_arch = "wasm32")'.dependencies]
@ -186,7 +184,7 @@ veilid-tools = { version = "0.3.3", path = "../veilid-tools", default-features =
] }
# Tools
getrandom = { version = "0.2.11", features = ["js"] }
getrandom = { version = "0.2.15", features = ["js"] }
# System
async_executors = { version = "0.7.0", default-features = false, features = [
@ -194,15 +192,15 @@ async_executors = { version = "0.7.0", default-features = false, features = [
"timer",
] }
async-lock = "2.8.0"
wasm-bindgen = "0.2.89"
js-sys = "0.3.66"
wasm-bindgen-futures = "0.4.39"
wasm-bindgen = "0.2.92"
js-sys = "0.3.69"
wasm-bindgen-futures = "0.4.42"
send_wrapper = { version = "0.6.0", features = ["futures"] }
serde_bytes = { version = "0.11", default-features = false, features = [
"alloc",
] }
tsify = { version = "0.4.5", features = ["js"] }
serde-wasm-bindgen = "0.6.3"
serde-wasm-bindgen = "0.6.5"
# Network
ws_stream_wasm = "0.7.4"
@ -216,7 +214,7 @@ keyvaluedb-web = "0.1.2"
### Configuration for WASM32 'web-sys' crate
[target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]
version = "0.3.66"
version = "0.3.69"
features = [
'Document',
'HtmlDocument',
@ -236,7 +234,7 @@ jni = "0.21.1"
jni-sys = "0.3.0"
ndk = { version = "0.7.0" }
ndk-glue = { version = "0.7.0", features = ["logger"] }
paranoid-android = { version = "0.2.1", optional = true }
paranoid-android = { version = "0.2.2", optional = true }
# Dependencies for Windows
[target.'cfg(target_os = "windows")'.dependencies]
@ -254,7 +252,7 @@ tracing-oslog = { version = "0.1.2", optional = true }
### DEV DEPENDENCIES
[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
simplelog = { version = "0.12.1", features = ["test"] }
simplelog = { version = "0.12.2", features = ["test"] }
serial_test = "2.0.0"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
@ -262,7 +260,7 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
serial_test = { version = "2.0.0", default-features = false, features = [
"async",
] }
wasm-bindgen-test = "0.3.39"
wasm-bindgen-test = "0.3.42"
console_error_panic_hook = "0.1.7"
wee_alloc = "0.4.5"
wasm-logger = "0.2.0"

View File

@ -33,15 +33,15 @@ debug-load = ["dep:ctor", "dep:libc-print", "dep:android_log-sys", "dep:oslog"]
veilid-core = { path = "../../veilid-core", default-features = false }
tracing = { version = "0.1.40", features = ["log", "attributes"] }
tracing-subscriber = "0.3.18"
parking_lot = "0.12.1"
backtrace = "0.3.69"
serde_json = "1.0.108"
serde = "1.0.193"
futures-util = { version = "0.3.29", default-features = false, features = [
parking_lot = "0.12.3"
backtrace = "0.3.71"
serde_json = "1.0.120"
serde = "1.0.204"
futures-util = { version = "0.3.30", default-features = false, features = [
"alloc",
] }
cfg-if = "1.0.0"
data-encoding = { version = "2.5.0" }
data-encoding = { version = "2.6.0" }
tracing-flame = "0.2.0"
# Dependencies for native builds only
@ -52,15 +52,15 @@ opentelemetry = { version = "0.20" }
opentelemetry-otlp = { version = "0.13" }
opentelemetry-semantic-conventions = "0.12"
async-std = { version = "1.12.0", features = ["unstable"], optional = true }
tokio = { version = "1.35.0", features = ["full"], optional = true }
tokio-stream = { version = "0.1.14", features = ["net"], optional = true }
tokio-util = { version = "0.7.10", features = ["compat"], optional = true }
allo-isolate = "0.1.20"
tokio = { version = "1.38.1", features = ["full"], optional = true }
tokio-stream = { version = "0.1.15", features = ["net"], optional = true }
tokio-util = { version = "0.7.11", features = ["compat"], optional = true }
allo-isolate = "0.1.25"
ffi-support = "0.4.4"
lazy_static = "1.4.0"
lazy_static = "1.5.0"
hostname = "0.3.1"
ctor = { version = "0.2.6", optional = true }
libc-print = { version = "0.1.22", optional = true }
ctor = { version = "0.2.8", optional = true }
libc-print = { version = "0.1.23", optional = true }
# Dependencies for WASM builds only
@ -69,7 +69,7 @@ libc-print = { version = "0.1.22", optional = true }
# Dependencies for Android builds only
[target.'cfg(target_os = "android")'.dependencies]
jni = "0.21.1"
paranoid-android = "0.2.1"
paranoid-android = "0.2.2"
android_log-sys = { version = "0.3.1", optional = true }
# Dependencies for iOS builds only

View File

@ -21,19 +21,19 @@ crypto-test = ["rt-tokio", "veilid-core/crypto-test"]
crypto-test-none = ["rt-tokio", "veilid-core/crypto-test-none"]
otlp-tonic = ["opentelemetry-otlp/grpc-tonic", "opentelemetry-otlp/trace"]
otlp-grpc = ["opentelemetry-otlp/grpc-sys", "opentelemetry-otlp/trace"]
# otlp-grpc = ["opentelemetry-otlp/grpc-sys", "opentelemetry-otlp/trace"]
rt-async-std = [
"veilid-core/rt-async-std",
"async-std",
"opentelemetry/rt-async-std",
"opentelemetry_sdk/rt-async-std",
]
rt-tokio = [
"veilid-core/rt-tokio",
"tokio",
"tokio-stream",
"tokio-util",
"opentelemetry/rt-tokio",
"opentelemetry_sdk/rt-tokio",
"console-subscriber",
]
tracking = ["veilid-core/tracking"]
@ -41,32 +41,31 @@ debug-json-api = []
[dependencies]
veilid-core = { path = "../veilid-core", default-features = false }
tracing = { version = "^0", features = ["log", "attributes"] }
tracing-subscriber = { version = "^0", features = ["env-filter"] }
tracing-appender = "^0"
tracing-opentelemetry = "0.21"
tracing = { version = "^0.1.40", features = ["log", "attributes"] }
tracing-subscriber = { version = "^0.3.18", features = ["env-filter"] }
tracing-appender = "^0.2.3"
tracing-opentelemetry = "^0.24.0"
# Buggy: tracing-error = "^0"
opentelemetry = { version = "0.20" }
opentelemetry-otlp = { version = "0.13", default-features = false, optional = true }
opentelemetry-semantic-conventions = "0.12"
async-std = { version = "^1", features = ["unstable"], optional = true }
tokio = { version = "1.35.0", features = ["full", "tracing"], optional = true }
tokio-stream = { version = "0.1.14", features = ["net"], optional = true }
tokio-util = { version = "0.7.10", features = ["compat"], optional = true }
console-subscriber = { version = "^0", optional = true }
async-tungstenite = { package = "veilid-async-tungstenite", version = "^0", features = [
"async-tls",
] }
color-eyre = { version = "^0", default-features = false }
backtrace = "^0"
clap = { version = "4", features = ["derive", "string", "wrap_help"] }
directories = "^5"
parking_lot = "^0"
config = { version = "^0", features = ["yaml"] }
cfg-if = "^1"
serde = "^1"
serde_derive = "^1"
serde_yaml = "^0"
opentelemetry = { version = "^0.23" }
opentelemetry-otlp = { version = "^0.16.0", default-features = false, optional = true }
opentelemetry_sdk = "0.23.0"
opentelemetry-semantic-conventions = "^0.16.0"
async-std = { version = "^1.12.0", features = ["unstable"], optional = true }
tokio = { version = "^1.38.1", features = ["full", "tracing"], optional = true }
tokio-stream = { version = "^0.1.15", features = ["net"], optional = true }
tokio-util = { version = "^0.7.11", features = ["compat"], optional = true }
console-subscriber = { version = "^0.3.0", optional = true }
async-tungstenite = { version = "^0.27.0", features = ["async-tls"] }
color-eyre = { version = "^0.6.3", default-features = false }
backtrace = "^0.3.71"
clap = { version = "^4.5.9", features = ["derive", "string", "wrap_help"] }
directories = "^5.0.1"
parking_lot = "^0.12.3"
config = { version = "^0.14.0", features = ["yaml"] }
cfg-if = "^1.0.0"
serde = "^1.0.204"
serde_derive = "^1.0.204"
serde_yaml = "^0.9.34"
json = "^0"
futures-util = { version = "^0", default-features = false, features = [
"alloc",
@ -79,7 +78,7 @@ flume = { version = "^0", features = ["async"] }
rpassword = "^7"
hostname = "^0"
stop-token = { version = "^0", default-features = false }
sysinfo = { version = "^0.30.6" }
sysinfo = { version = "^0.30.13" }
wg = { version = "^0.9.1", features = ["future"] }
tracing-flame = "0.2.0"
@ -88,13 +87,13 @@ windows-service = "^0"
ansi_term = "^0"
[target.'cfg(unix)'.dependencies]
daemonize = "^0"
signal-hook = "^0"
signal-hook-async-std = "^0"
nix = "^0"
daemonize = "^0.5.0"
signal-hook = "^0.3.17"
signal-hook-async-std = "^0.2.2"
nix = "^0.29.0"
[target.'cfg(target_os = "linux")'.dependencies]
tracing-journald = "^0"
tracing-journald = "^0.3.0"
[dev-dependencies]
serial_test = "^2"
serial_test = "^3.1.1"

View File

@ -199,6 +199,7 @@ fn main() -> EyreResult<()> {
settingsrw.logging.terminal.enabled = true;
settingsrw.logging.terminal.level = LogLevel::Trace;
}
#[cfg(feature = "opentelemetry-otlp")]
if args.otlp.is_some() {
println!("Enabling OTLP tracing");
settingsrw.logging.otlp.enabled = true;

View File

@ -6,8 +6,8 @@ use console_subscriber::ConsoleLayer;
cfg_if::cfg_if! {
if #[cfg(feature = "opentelemetry-otlp")] {
use opentelemetry::sdk::*;
use opentelemetry::*;
use opentelemetry_sdk::*;
use opentelemetry_otlp::WithExportConfig;
}
}
@ -103,12 +103,12 @@ impl VeilidLogs {
let exporter = opentelemetry_otlp::new_exporter()
.grpcio()
.with_endpoint(grpc_endpoint);
let batch = opentelemetry::runtime::AsyncStd;
let batch = opentelemetry_sdk::runtime::AsyncStd;
} else if #[cfg(feature="rt-tokio")] {
let exporter = opentelemetry_otlp::new_exporter()
.tonic()
.with_endpoint(format!("http://{}", grpc_endpoint));
let batch = opentelemetry::runtime::Tokio;
let batch = opentelemetry_sdk::runtime::Tokio;
} else {
compile_error!("needs executor implementation")
}
@ -117,7 +117,7 @@ impl VeilidLogs {
let tracer = opentelemetry_otlp::new_pipeline()
.tracing()
.with_exporter(exporter)
.with_trace_config(opentelemetry::sdk::trace::config().with_resource(
.with_trace_config(opentelemetry_sdk::trace::Config::default().with_resource(
Resource::new(vec![KeyValue::new(
opentelemetry_semantic_conventions::resource::SERVICE_NAME,
format!(

View File

@ -43,47 +43,47 @@ tracing = { version = "0.1.40", features = [
tracing-subscriber = { version = "0.3.18", features = [
"env-filter",
], optional = true }
log = { version = "0.4.20" }
eyre = "0.6.11"
log = { version = "0.4.22" }
eyre = "0.6.12"
static_assertions = "1.1.0"
cfg-if = "1.0.0"
thiserror = "1.0.50"
futures-util = { version = "0.3.29", default-features = false, features = [
thiserror = "1.0.63"
futures-util = { version = "0.3.30", default-features = false, features = [
"alloc",
] }
parking_lot = "0.12.1"
parking_lot = "0.12.3"
once_cell = "1.19.0"
stop-token = { version = "0.7.0", default-features = false }
rand = "0.8.5"
rand_core = "0.6.4"
backtrace = "0.3.69"
backtrace = "0.3.71"
fn_name = "0.1.0"
range-set-blaze = "0.1.13"
range-set-blaze = "0.1.16"
flume = { version = "0.11.0", features = ["async"] }
# Dependencies for native builds only
# Linux, Windows, Mac, iOS, Android
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
async-std = { version = "1.12.0", features = ["unstable"], optional = true }
tokio = { version = "1.35.0", features = ["full"], optional = true }
tokio-util = { version = "0.7.10", features = ["compat"], optional = true }
tokio-stream = { version = "0.1.14", features = ["net"], optional = true }
futures-util = { version = "0.3.29", default-features = false, features = [
tokio = { version = "1.38.1", features = ["full"], optional = true }
tokio-util = { version = "0.7.11", features = ["compat"], optional = true }
tokio-stream = { version = "0.1.15", features = ["net"], optional = true }
futures-util = { version = "0.3.30", default-features = false, features = [
"async-await",
"sink",
"std",
"io",
] }
chrono = "0.4.31"
chrono = "0.4.38"
libc = "0.2.151"
libc = "0.2.155"
nix = { version = "0.27.1", features = ["user"] }
# Dependencies for WASM builds only
[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = "0.2.89"
js-sys = "0.3.66"
wasm-bindgen-futures = "0.4.39"
wasm-bindgen = "0.2.92"
js-sys = "0.3.69"
wasm-bindgen-futures = "0.4.42"
async_executors = { version = "0.7.0", default-features = false }
getrandom = { version = "0.2", features = ["js"] }
@ -102,8 +102,8 @@ jni = "0.21.1"
jni-sys = "0.3.0"
ndk = { version = "0.7.0" }
ndk-glue = { version = "0.7.0", features = ["logger"] }
lazy_static = "1.4.0"
paranoid-android = { version = "0.2.1", optional = true }
lazy_static = "1.5.0"
paranoid-android = { version = "0.2.2", optional = true }
android_logger = "0.13.3"
# Dependencies for Windows
@ -122,7 +122,7 @@ ifstructs = "0.1.1"
### DEV DEPENDENCIES
[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
simplelog = { version = "0.12.1", features = ["test"] }
simplelog = { version = "0.12.2", features = ["test"] }
serial_test = "2.0.0"
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
@ -130,7 +130,7 @@ serial_test = { version = "2.0.0", default-features = false, features = [
"async",
] }
console_error_panic_hook = "0.1.7"
wasm-bindgen-test = "0.3.39"
wasm-bindgen-test = "0.3.42"
wee_alloc = "0.4.5"
wasm-logger = "0.2.0"
tracing-wasm = { version = "0.2.1" }

View File

@ -39,8 +39,8 @@ futures-util = { version = "^0" }
data-encoding = { version = "^2" }
gloo-utils = { version = "^0", features = ["serde"] }
tsify = { version = "0.4.5", features = ["js"] }
serde-wasm-bindgen = "0.6.3"
serde-wasm-bindgen = "0.6.5"
[dev-dependencies]
wasm-bindgen-test = "^0"
parking_lot = "0.12.1"
parking_lot = "0.12.3"