From 14ba9a811f9576dbbbb6368357a0a356aeb25cde Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 31 Jan 2023 13:37:09 +0000 Subject: basalt: Adapt to use NonZeroUsize for lru change. --- src/peering/basalt.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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, -- cgit v1.2.3 From c034bdedfe0d69198e56c78c10eb227222f9ac4e Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 31 Jan 2023 13:45:43 +0000 Subject: src: Use new BinaryPropagator methods in opentelemetry_contrib/0.10. --- src/client.rs | 2 +- src/server.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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/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) -- cgit v1.2.3