diff options
| author | Alex <alex@adnab.me> | 2023-03-13 18:09:27 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2023-03-13 18:09:27 +0000 |
| commit | 80f64c5015ada9d1e30b38714a7739ef09cdfa3a (patch) | |
| tree | 406d209dfb0a083372e28426e21117cb77c515d8 /src | |
| parent | 34aade6ce9ccc9789d045fa11bd6bb8af421849e (diff) | |
| parent | 3d77b9c2a101d09159f97d6e808f458d7f8c7737 (diff) | |
| download | netapp-80f64c5015ada9d1e30b38714a7739ef09cdfa3a.tar.gz netapp-80f64c5015ada9d1e30b38714a7739ef09cdfa3a.zip | |
Merge pull request 'Bump dependent crates to latest' (#7) from jpds/netapp:cargo-updates into main
Reviewed-on: https://git.deuxfleurs.fr/lx/netapp/pulls/7
Diffstat (limited to 'src')
| -rw-r--r-- | src/client.rs | 2 | ||||
| -rw-r--r-- | src/peering/basalt.rs | 3 | ||||
| -rw-r--r-- | src/server.rs | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/client.rs b/src/client.rs index 607dd17..d2a8d07 100644 --- a/src/client.rs +++ b/src/client.rs @@ -162,7 +162,7 @@ impl ClientConn { .with_kind(SpanKind::Client) .start(&tracer); let propagator = BinaryPropagator::new(); - let telemetry_id: Bytes = propagator.to_bytes(span.span_context()).to_vec().into(); + let telemetry_id: Bytes = propagator.serialize_into_bytes(span.span_context()).to_vec().into(); } else { let telemetry_id: Bytes = Bytes::new(); } diff --git a/src/peering/basalt.rs b/src/peering/basalt.rs index 2c27dba..21506a7 100644 --- a/src/peering/basalt.rs +++ b/src/peering/basalt.rs @@ -1,5 +1,6 @@ use std::collections::HashSet; use std::net::SocketAddr; +use std::num::NonZeroUsize; use std::sync::{Arc, RwLock}; use std::time::Duration; @@ -229,7 +230,7 @@ impl BasaltView { pub struct BasaltParams { pub view_size: usize, - pub cache_size: usize, + pub cache_size: NonZeroUsize, pub exchange_interval: Duration, pub reset_interval: Duration, pub reset_count: usize, diff --git a/src/server.rs b/src/server.rs index 55b9e67..5825e6f 100644 --- a/src/server.rs +++ b/src/server.rs @@ -142,7 +142,7 @@ impl ServerConn { let mut span = if !req_enc.telemetry_id.is_empty() { let propagator = BinaryPropagator::new(); - let context = propagator.from_bytes(req_enc.telemetry_id.to_vec()); + let context = propagator.deserialize_from_bytes(req_enc.telemetry_id.to_vec()); let context = Context::new().with_remote_span_context(context); tracer.span_builder(format!(">> RPC {}", path)) .with_kind(SpanKind::Server) |