ingest-router: Rename "locale" to "locality"

devservices/ingest-router.yaml

@@ -20,7 +20,7 @@ ingest_router:
     locality_to_default_cell:
       "--monolith--": "--monolith--"
 
-  locales:
+  localities:
     "--monolith--":
       - id: "--monolith--"
         sentry_url: http://host.docker.internal:8000
@@ -33,35 +33,35 @@ ingest_router:
         method: POST
       action:
         handler: relay_project_configs
-      locale: "--monolith--"
+      locality: "--monolith--"
     - match:
         host: localhost
         path: /api/0/relays/live/
         method: GET
       action:
         handler: health
-      locale: "--monolith--"
+      locality: "--monolith--"
     - match:
         host: localhost
         path: /api/0/relays/register/challenge/
         method: POST
       action:
         handler: register_challenge
-      locale: "--monolith--"
+      locality: "--monolith--"
     - match:
         host: localhost
         path: /api/0/relays/register/response/
         method: POST
       action:
         handler: register_response
-      locale: "--monolith--"
+      locality: "--monolith--"
     - match:
         host: localhost
         path: /api/0/relays/publickeys/
         method: POST
       action:
         handler: public_keys
-      locale: "--monolith--"
+      locality: "--monolith--"
 
 metrics:
   statsd_host: "127.0.0.1"

example_config_ingest_router.yaml

@@ -23,7 +23,7 @@ ingest_router:
       us: us1
       de: de1
 
-  locales:
+  localities:
     us:
       - id: us1
         sentry_url: "http://10.0.0.1:8080"
@@ -43,71 +43,71 @@ ingest_router:
         method: POST
       action:
         handler: relay_project_configs
-      locale: us
+      locality: us
     - match:
         host: de.sentry.io
         path: /api/0/relays/projectconfigs/
         method: POST
       action:
         handler: relay_project_configs
-      locale: de
+      locality: de
     - match:
         host: us.sentry.io
         path: /api/0/relays/live/
         method: GET
       action:
         handler: health
-      locale: us
+      locality: us
     - match:
         host: de.sentry.io
         path: /api/0/relays/live/
         method: GET
       action:
         handler: health
-      locale: de
+      locality: de
     - match:
         host: us.sentry.io
         path: /api/0/relays/register/challenge/
         method: POST
       action:
         handler: register_challenge
-      locale: us
+      locality: us
     - match:
         host: de.sentry.io
         path: /api/0/relays/register/challenge/
         method: POST
       action:
         handler: register_challenge
-      locale: de
+      locality: de
     - match:
         host: us.sentry.io
         path: /api/0/relays/register/response/
         method: POST
       action:
         handler: register_response
-      locale: us
+      locality: us
     - match:
         host: de.sentry.io
         path: /api/0/relays/register/response/
         method: POST
       action:
         handler: register_response
-      locale: de
+      locality: de
     # Public keys endpoint
     - match:
         host: us.sentry.io
         path: /api/0/relays/publickeys/
         method: POST
       action:
         handler: public_keys
-      locale: us
+      locality: us
     - match:
         host: de.sentry.io
         path: /api/0/relays/publickeys/
         method: POST
       action:
         handler: public_keys
-      locale: de
+      locality: de
 
 
 # logging:

ingest-router/src/api/any_cell_handler.rs

@@ -1,7 +1,7 @@
 use crate::api::utils::normalize_headers;
 use crate::errors::IngestRouterError;
 use crate::handler::{CellId, ExecutionMode, Handler, SplitMetadata};
-use crate::locale::Cells;
+use crate::locality::Cells;
 use async_trait::async_trait;
 use http::StatusCode;
 use hyper::body::Bytes;
@@ -103,12 +103,12 @@ impl Handler for AnyCellHandler {
 mod tests {
     use super::*;
     use crate::config::CellConfig;
-    use crate::locale::Locales;
+    use crate::locality::Localities;
     use std::collections::HashMap;
     use url::Url;
 
     fn create_test_cells() -> Cells {
-        let locales = HashMap::from([(
+        let localities = HashMap::from([(
             "us".to_string(),
             vec![
                 CellConfig {
@@ -123,7 +123,7 @@ mod tests {
                 },
             ],
         )]);
-        Locales::new(locales).get_cells("us").unwrap()
+        Localities::new(localities).get_cells("us").unwrap()
     }
 
     #[tokio::test]

ingest-router/src/api/project_config.rs

@@ -284,7 +284,7 @@
 use crate::api::utils::{deserialize_body, normalize_headers, serialize_to_body};
 use crate::errors::IngestRouterError;
 use crate::handler::{CellId, ExecutionMode, Handler, SplitMetadata};
-use crate::locale::Cells;
+use crate::locality::Cells;
 use async_trait::async_trait;
 use http::StatusCode;
 use http::response::Parts;
@@ -576,7 +576,7 @@ impl Handler for ProjectConfigsHandler {
 mod tests {
     use super::*;
     use crate::config::CellConfig;
-    use crate::locale::Locales;
+    use crate::locality::Localities;
     use crate::testutils::create_test_locator;
     use std::collections::HashMap;
     use url::Url;
@@ -604,7 +604,7 @@ mod tests {
         ]);
         let locator = create_test_locator(key_to_cell).await;
 
-        let locales = HashMap::from([(
+        let localities = HashMap::from([(
             "us".to_string(),
             vec![
                 CellConfig {
@@ -620,8 +620,8 @@ mod tests {
             ],
         )]);
 
-        let locales_obj = Locales::new(locales);
-        let cells = locales_obj.get_cells("us").unwrap();
+        let localities_obj = Localities::new(localities);
+        let cells = localities_obj.get_cells("us").unwrap();
 
         let handler = ProjectConfigsHandler::new(locator);
 
@@ -653,7 +653,7 @@ mod tests {
         ]);
         let locator = create_test_locator(key_to_cell).await;
         let handler = ProjectConfigsHandler::new(locator);
-        let locales = HashMap::from([(
+        let localities = HashMap::from([(
             "us".to_string(),
             vec![
                 CellConfig {
@@ -668,8 +668,8 @@ mod tests {
                 },
             ],
         )]);
-        let locales_obj = Locales::new(locales);
-        let cells = locales_obj.get_cells("us").unwrap();
+        let localities_obj = Localities::new(localities);
+        let cells = localities_obj.get_cells("us").unwrap();
         let request2 = build_request(ProjectConfigsRequest {
             public_keys: vec!["key1".to_string(), "key2".to_string(), "key3".to_string()],
             extra_fields: extra.clone(),
@@ -704,7 +704,7 @@ mod tests {
     async fn test_split_request_unknown_key_goes_to_pending() {
         let key_to_cell = HashMap::from([("key1".to_string(), "us1".to_string())]);
         let locator = create_test_locator(key_to_cell).await;
-        let locales = HashMap::from([(
+        let localities = HashMap::from([(
             "us".to_string(),
             vec![CellConfig {
                 id: "us1".to_string(),
@@ -713,8 +713,8 @@ mod tests {
             }],
         )]);
 
-        let locales_obj = Locales::new(locales);
-        let cells = locales_obj.get_cells("us").unwrap();
+        let localities_obj = Localities::new(localities);
+        let cells = localities_obj.get_cells("us").unwrap();
 
         let handler = ProjectConfigsHandler::new(locator);