Merge branch 'master' into master

mozilla-services · Dec 4, 2024 · 232f982 · 232f982
2 parents ae1d5f5 + 7f7cfb7
commit 232f982
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 50 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/syncserver/src/web/handlers.rs b/syncserver/src/web/handlers.rs
@@ -40,34 +40,33 @@ pub async fn get_collections(
     request: HttpRequest,
     state: Data<ServerState>,
 ) -> Result<HttpResponse, ApiError> {
-    if state.glean_enabled {
-        // Values below are be passed to the Glean logic to emit metrics.
-        // This is used to measure DAU (Daily Active Use) of Sync.
-        let user_agent = request
-            .headers()
-            .get(header::USER_AGENT)
-            .and_then(|header| header.to_str().ok())
-            .unwrap_or("");
-        let device_info: DeviceInfo = get_device_info(user_agent);
-
-        state.glean_logger.record_events_ping(
-            &RequestInfo {
-                user_agent: user_agent.to_owned(),
-                ip_address: "".to_owned(),
-            },
-            &EventsPing {
-                syncstorage_device_family: device_info.device_family.to_string(),
-                syncstorage_hashed_device_id: meta.user_id.hashed_device_id.clone(),
-                syncstorage_hashed_fxa_uid: meta.user_id.hashed_fxa_uid.clone(),
-                syncstorage_platform: device_info.platform.to_string(),
-                event: Some(Box::new(SyncstorageGetCollectionsEvent {})),
-            },
-        );
-    }
-
     db_pool
-        .transaction_http(request, |db| async move {
+        .transaction_http(request.clone(), |db| async move {
             meta.emit_api_metric("request.get_collections");
+            if state.glean_enabled {
+                // Values below are be passed to the Glean logic to emit metrics.
+                // This is used to measure DAU (Daily Active Use) of Sync.
+                let user_agent = request
+                    .headers()
+                    .get(header::USER_AGENT)
+                    .and_then(|header| header.to_str().ok())
+                    .unwrap_or("");
+                let device_info: DeviceInfo = get_device_info(user_agent);
+
+                state.glean_logger.record_events_ping(
+                    &RequestInfo {
+                        user_agent: user_agent.to_owned(),
+                        ip_address: "".to_owned(),
+                    },
+                    &EventsPing {
+                        syncstorage_device_family: device_info.device_family.to_string(),
+                        syncstorage_hashed_device_id: meta.user_id.hashed_device_id.clone(),
+                        syncstorage_hashed_fxa_uid: meta.user_id.hashed_fxa_uid.clone(),
+                        syncstorage_platform: device_info.platform.to_string(),
+                        event: Some(Box::new(SyncstorageGetCollectionsEvent {})),
+                    },
+                );
+            }
             let result = db.get_collection_timestamps(meta.user_id).await?;
 
             Ok(HttpResponse::build(StatusCode::OK)

diff --git a/syncstorage-db-common/src/util.rs b/syncstorage-db-common/src/util.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryInto, u64};
+use std::convert::TryInto;
 
 use chrono::{
     offset::{FixedOffset, TimeZone, Utc},

diff --git a/syncstorage-spanner/src/models.rs b/syncstorage-spanner/src/models.rs
@@ -1292,11 +1292,7 @@ impl SpannerDb {
             // most databases) so we specify a max value with offset subtracted
             // to avoid overflow errors (that only occur w/ a FORCE_INDEX=
             // directive) OutOfRange: 400 int64 overflow: <INT64_MAX> + offset
-            query = format!(
-                "{} LIMIT {}",
-                query,
-                i64::max_value() - offset.offset as i64
-            );
+            query = format!("{} LIMIT {}", query, i64::MAX - offset.offset as i64);
         };
 
         if let Some(offset) = params.offset {

diff --git a/tokenserver-auth/Cargo.toml b/tokenserver-auth/Cargo.toml
@@ -28,7 +28,7 @@ syncserver-common = { path = "../syncserver-common" }
 tokenserver-common = { path = "../tokenserver-common" }
 tokenserver-settings = { path = "../tokenserver-settings" }
 tokio = { workspace = true }
-pyo3 = { version = "0.21", features = ["auto-initialize"], optional = true }
+pyo3 = { version = "0.22", features = ["auto-initialize"], optional = true }
 
 
 [dev-dependencies]

diff --git a/tokenserver-auth/src/oauth/py.rs b/tokenserver-auth/src/oauth/py.rs
@@ -19,9 +19,8 @@ use std::{sync::Arc, time::Duration};
 /// The verifier used to verify OAuth tokens.
 #[derive(Clone)]
 pub struct Verifier {
-    // Note that we do not need to use an Arc here, since Py is already a reference-counted
     // pointer
-    inner: Py<PyAny>,
+    inner: Arc<Py<PyAny>>,
     timeout: u64,
     blocking_threadpool: Arc<BlockingThreadpool>,
 }
@@ -103,7 +102,7 @@ impl Verifier {
         })?;
 
         Ok(Self {
-            inner,
+            inner: Arc::new(inner),
             timeout: settings.fxa_oauth_request_timeout,
             blocking_threadpool,
         })