feat: Add country-code to metric tags for ad fill instrumentation (#526)

src/adm/tiles.rs

@@ -137,19 +137,17 @@ pub async fn get_tiles(
     let settings = &state.settings;
     let image_store = &state.img_store;
     let pse = AdmPse::appropriate_from_settings(&device_info, settings);
+    let country_code = location
+        .country
+        .as_deref()
+        .unwrap_or_else(|| settings.fallback_country.as_ref());
     let adm_url = Url::parse_with_params(
         &pse.endpoint,
         &[
             ("partner", pse.partner_id.as_str()),
             ("sub1", pse.sub1.as_str()),
             ("sub2", "newtab"),
-            (
-                "country-code",
-                &(location
-                    .country
-                    .clone()
-                    .unwrap_or_else(|| settings.fallback_country.clone())),
-            ),
+            ("country-code", country_code),
             ("region-code", &location.region()),
             (
                 "dma-code",
@@ -180,6 +178,9 @@ pub async fn get_tiles(
     }
     tags.add_extra("adm_url", adm_url);
 
+    // Add `country_code` for ad fill instrumentation.
+    tags.add_tag("geo.country_code", country_code);
+
     metrics.incr_with_tags("tiles.adm.request", Some(tags));
     let response: AdmTileResponse = match state.settings.test_mode {
         crate::settings::TestModes::TestFakeResponse => {

src/web/test.rs

@@ -880,6 +880,7 @@ async fn metrics() {
     assert!(get_metric.contains("ua.form_factor:desktop"));
     assert!(get_metric.contains("ua.os.family:windows"));
     assert!(!&metrics[1].contains("endpoint:mobile"));
+    assert!(&metrics[1].contains("geo.country_code"));
 
     let req = test::TestRequest::get()
         .uri("/v1/tiles")
@@ -894,6 +895,7 @@ async fn metrics() {
     assert!(get_metric.contains("ua.form_factor:phone"));
     assert!(get_metric.contains("ua.os.family:ios"));
     assert!(&metrics[1].contains("endpoint:mobile"));
+    assert!(&metrics[1].contains("geo.country_code"));
 }
 
 #[actix_web::test]