Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-10-01 01:26:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

crate update work

Browse Source
This commit is contained in:
Christien Rioux 2024-07-17 18:58:33 -04:00
parent deaff56232
commit 4a55cd08c3
4 changed files with 373 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

488
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

6
veilid-core/Cargo.toml
View File

@ -167,11 +167,9 @@ keyring-manager = "0.5.1"
keyvaluedb-sqlite = "0.1.2" keyvaluedb-sqlite = "0.1.2"
# Network # Network
async-tungstenite = { package = "veilid-async-tungstenite", version = "0.23.0", features = [ async-tungstenite = { version = "0.27.0", features = ["async-tls"] }
"async-tls",
] }
igd = { package = "veilid-igd", version = "0.1.1" } 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 = "0.22.4"
webpki-roots = "0.25.3" webpki-roots = "0.25.3"
rustls = "0.21.10" rustls = "0.21.10"

67
veilid-server/Cargo.toml
View File

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

8
veilid-server/src/veilid_logs.rs
View File

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