chore: cargo upgrade deps

And updated slog calls to get rid of deprecation warnings.

Author: chenba

Cargo.lock

@@ -30,15 +30,15 @@ license = "MPL-2.0"
 
 [workspace.dependencies]
 actix-web = { version = "4", default-features = false, features = ["compat", "http2", "macros"] }
-async-trait = "0.1.88"
+async-trait = "0.1.89"
 docopt = "1.1"
 base64 = "0.22"
 
 diesel = "2.3"
 diesel-async = { version = "0.7", features = ["mysql", "deadpool", "migrations", "async-connection-wrapper"] }
 diesel_migrations = "2.3"
 
-cadence = "1.3"
+cadence = "1.7"
 backtrace = "0.3"
 chrono = "0.4"
 deadpool = { version = "0.12", features = ["rt_tokio_1"] }
@@ -54,16 +54,16 @@ hex = "0.4"
 hostname = "0.4"
 hkdf = "0.12"
 hmac = "0.12"
-http = "1.1"
-jsonwebtoken = { version = "9.2", default-features = false }
-lazy_static = "1.4"
+http = "1.4"
+jsonwebtoken = { version = "9.3", default-features = false }
+lazy_static = "1.5"
 log = { version = "0.4", features = [
     "max_level_debug",
     "release_max_level_info",
 ] }
 protobuf = "=2.25.2" # pin to 2.25.2 to prevent side updating
 rand = "0.8"
-regex = "1.4"
+regex = "1.12"
 reqwest = { version = "0.12", default-features = false, features = [
   "rustls-tls",
 ] }
@@ -78,23 +78,23 @@ serde = "1.0"
 serde_derive = "1.0"
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
 sha2 = "0.10"
-slog = { version = "2.5", features = [
+slog = { version = "2.8", features = [
   "max_level_trace",
   "release_max_level_info",
   "dynamic-keys",
 ] }
-slog-async = "2.5"
+slog-async = "2.8"
 slog-envlogger = "2.2.0"
 slog-mozlog-json = "0.1"
-slog-scope = "4.3"
+slog-scope = "4.4"
 slog-stdlog = "4.1"
-slog-term = "2.6"
+slog-term = "2.9"
 tokio = "1"
-thiserror = "1.0.26"
+thiserror = "1.0.69"
 time = "0.3.47"
 utoipa = "5.4.0"
 utoipa-swagger-ui = { version = "9", features = ["actix-web"] }
-uuid = { version = "1.11", features = ["serde", "v4"] }
+uuid = { version = "1.20", features = ["serde", "v4"] }
 
 [profile.release]
 # Enables line numbers in Sentry reporting

Cargo.toml

@@ -1,6 +1,3 @@
-#[macro_use]
-extern crate slog_scope;
-
 mod metrics;
 pub mod middleware;
 mod tags;

syncserver-common/src/lib.rs

@@ -31,7 +31,7 @@ impl Drop for Metrics {
             && let Some(timer) = self.timer.as_ref()
         {
             let lapse = (Instant::now() - timer.start).as_millis() as u64;
-            trace!("⌚ Ending timer at nanos: {:?} : {:?}", &timer.label, lapse; &MetricTags(tags));
+            slog::trace!(slog_scope::logger(), "⌚ Ending timer at nanos: {:?} : {:?}", &timer.label, lapse; &MetricTags(tags));
             let mut tagged = client.time_with_tags(&timer.label, lapse);
             // Include any "hard coded" tags.
             // tagged = tagged.with_tag("version", env!("CARGO_PKG_VERSION"));
@@ -43,10 +43,15 @@ impl Drop for Metrics {
             match tagged.try_send() {
                 Err(e) => {
                     // eat the metric, but log the error
-                    warn!("⚠️ Metric {} error: {:?} ", &timer.label, e);
+                    slog::warn!(
+                        slog_scope::logger(),
+                        "⚠️ Metric {} error: {:?} ",
+                        &timer.label,
+                        e
+                    );
                 }
                 Ok(v) => {
-                    trace!("⌚ {:?}", v.as_metric_str());
+                    slog::trace!(slog_scope::logger(), "⌚ {:?}", v.as_metric_str());
                 }
             }
         }
@@ -73,7 +78,7 @@ impl Metrics {
         }
 
         let mtags = MetricTags(mtags);
-        trace!("⌚ Starting timer... {:?}", &label; &mtags);
+        slog::trace!(slog_scope::logger(), "⌚ Starting timer... {:?}", &label; &mtags);
         self.timer = Some(MetricTimer {
             label: label.to_owned(),
             start: Instant::now(),
@@ -125,9 +130,9 @@ impl Metrics {
             match tagged.try_send() {
                 Err(e) => {
                     // eat the metric, but log the error
-                    warn!("⚠️ Metric {} error: {:?} ", label, e; MetricTags(mtags));
+                    slog::warn!(slog_scope::logger(), "⚠️ Metric {} error: {:?} ", label, e; MetricTags(mtags));
                 }
-                Ok(v) => trace!("☑️ {:?}", v.as_metric_str()),
+                Ok(v) => slog::trace!(slog_scope::logger(), "☑️ {:?}", v.as_metric_str()),
             }
         }
     }
@@ -152,7 +157,7 @@ pub fn metrics_from_opts(
     Ok(Arc::new(
         builder
             .with_error_handler(|err| {
-                warn!("⚠️ Metric send error:  {:?}", err);
+                slog::warn!(slog_scope::logger(), "⚠️ Metric send error:  {:?}", err);
             })
             .build(),
     ))

syncserver-common/src/metrics.rs

@@ -94,17 +94,25 @@ where
                             // add an info here, temporarily turn on info level debugging on a given server,
                             // capture it, and then turn it off before we run out of money.
                             maybe_emit_metrics(&metrics, reportable_err);
-                            debug!("Sentry: Not reporting error (service error): {:?}", error);
+                            slog::debug!(
+                                slog_scope::logger(),
+                                "Sentry: Not reporting error (service error): {:?}",
+                                error
+                            );
                             return Err(error);
                         }
                     };
-                    debug!("Reporting error to Sentry (service error): {}", error);
+                    slog::debug!(
+                        slog_scope::logger(),
+                        "Reporting error to Sentry (service error): {}",
+                        error
+                    );
                     let mut event = event_from_actix_error::<E>(&error);
                     // Add in the tags from the request
                     event.tags.extend(tags);
                     event.extra.extend(extras);
                     let event_id = hub.capture_event(event);
-                    trace!("event_id = {}", event_id);
+                    slog::trace!(slog_scope::logger(), "event_id = {}", event_id);
                     return Err(error);
                 }
             };
@@ -114,13 +122,21 @@ where
                     && !reportable_err.is_sentry_event()
                 {
                     maybe_emit_metrics(&metrics, reportable_err);
-                    debug!("Not reporting error (service error): {:?}", error);
+                    slog::debug!(
+                        slog_scope::logger(),
+                        "Not reporting error (service error): {:?}",
+                        error
+                    );
                     return Ok(response);
                 }
-                debug!("Reporting error to Sentry (response error): {}", error);
+                slog::debug!(
+                    slog_scope::logger(),
+                    "Reporting error to Sentry (response error): {}",
+                    error
+                );
                 let event = event_from_actix_error::<E>(error);
                 let event_id = hub.capture_event(event);
-                trace!("event_id = {}", event_id);
+                slog::trace!(slog_scope::logger(), "event_id = {}", event_id);
             }
             Ok(response)
         }
@@ -136,7 +152,7 @@ where
     let Some(label) = err.metric_label() else {
         return;
     };
-    debug!("Sending error to metrics: {:?}", err);
+    slog::debug!(slog_scope::logger(), "Sending error to metrics: {:?}", err);
     let mut builder = metrics.incr_with_tags(label);
     let tags = err.tags();
     for (key, val) in &tags {

syncserver-common/src/middleware/sentry.rs

@@ -7,14 +7,15 @@ edition.workspace = true
 
 [dependencies]
 serde.workspace = true
+slog.workspace = true
 slog-scope.workspace = true
 
 config = "0.11"                                             # pin to 11, 12+ introduces a breaking change for env vars.
 num_cpus = "1"
 syncserver-common = { path = "../syncserver-common" }
 syncstorage-settings = { path = "../syncstorage-settings" }
 tokenserver-settings = { path = "../tokenserver-settings" }
-url = "2.1"
+url = "2.5"
 
 [dev-dependencies]
 temp-env = "0.3"

syncserver-settings/Cargo.toml

@@ -1,6 +1,3 @@
-#[macro_use]
-extern crate slog_scope;
-
 use config::{Config, ConfigError, Environment, File};
 use serde::{Deserialize, Deserializer};
 use syncserver_common::{
@@ -127,11 +124,15 @@ impl Settings {
                     "For example to set `database_url` use env var `{}_DATABASE_URL`\n",
                     PREFIX.to_uppercase()
                 );
-                error!("Configuration error: Value undefined {:?}", &v);
+                slog::error!(
+                    slog_scope::logger(),
+                    "Configuration error: Value undefined {:?}",
+                    &v
+                );
                 Err(ConfigError::NotFound(v))
             }
             Err(e) => {
-                error!("Configuration error: Other: {:?}", &e);
+                slog::error!(slog_scope::logger(), "Configuration error: Other: {:?}", &e);
                 Err(e)
             }
         }

syncserver-settings/src/lib.rs

@@ -1,8 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![allow(clippy::try_err)]
 
-#[macro_use]
-extern crate slog_scope;
 #[macro_use]
 extern crate validator_derive;
 

syncserver/src/lib.rs

@@ -8,7 +8,7 @@ use std::os::linux::fs::MetadataExt;
 
 use crate::error::ApiResult;
 
-use slog::{self, Drain, slog_o};
+use slog::{self, Drain};
 use slog_mozlog_json::MozLogJson;
 
 #[cfg(target_os = "linux")]
@@ -44,7 +44,7 @@ pub fn init_logging(json: bool) -> ApiResult<()> {
             .fuse();
         let drain = slog_envlogger::new(drain);
         let drain = slog_async::Async::new(drain).build().fuse();
-        slog::Logger::root(drain, slog_o!())
+        slog::Logger::root(drain, slog::o!())
     } else {
         let drain = if connected_to_journal() {
             #[cfg(target_os = "linux")]
@@ -59,7 +59,7 @@ pub fn init_logging(json: bool) -> ApiResult<()> {
             let drain = slog_envlogger::new(drain);
             slog_async::Async::new(drain).build().fuse()
         };
-        slog::Logger::root(drain, slog_o!())
+        slog::Logger::root(drain, slog::o!())
     };
     // XXX: cancel slog_scope's NoGlobalLoggerSet for now, it's difficult to
     // prevent it from potentially panicing during tests. reset_logging resets
@@ -71,6 +71,6 @@ pub fn init_logging(json: bool) -> ApiResult<()> {
 }
 
 pub fn reset_logging() {
-    let logger = slog::Logger::root(slog::Discard, slog_o!());
+    let logger = slog::Logger::root(slog::Discard, slog::o!());
     slog_scope::set_global_logger(logger).cancel_reset();
 }

syncserver/src/logging.rs

@@ -1,7 +1,4 @@
 //! Sync Storage Server for Sync 1.5
-#[macro_use]
-extern crate slog_scope;
-
 use std::{error::Error, sync::Arc};
 
 use docopt::Docopt;
@@ -31,7 +28,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .unwrap_or_else(|e| e.exit());
     let settings = Settings::with_env_and_config_file(args.flag_config.as_deref())?;
     init_logging(!settings.human_logs).expect("Logging failed to initialize");
-    debug!("Starting up...");
+    slog::debug!(slog_scope::logger(), "Starting up...");
 
     // Set SENTRY_DSN environment variable to enable Sentry.
     // Avoid its default reqwest transport for now due to issues w/
@@ -62,9 +59,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
     } else {
         server::Server::with_settings(settings).await.unwrap()
     };
-    info!("Server running on {}", banner);
+    slog::info!(slog_scope::logger(), "Server running on {}", banner);
     server.await?;
-    info!("Server closing");
+    slog::info!(slog_scope::logger(), "Server closing");
     logging::reset_logging();
 
     Ok(())