feat: Inject geo information into Prebid configuration and refactor geo header setting into the struct

Author: prk-Jr

crates/common/src/geo.rs

@@ -8,7 +8,7 @@ use fastly::Request;
 
 use crate::constants::{
     HEADER_X_GEO_CITY, HEADER_X_GEO_CONTINENT, HEADER_X_GEO_COORDINATES, HEADER_X_GEO_COUNTRY,
-    HEADER_X_GEO_INFO_AVAILABLE, HEADER_X_GEO_METRO_CODE,
+    HEADER_X_GEO_METRO_CODE,
 };
 
 /// Geographic information extracted from a request.
@@ -81,74 +81,26 @@ impl GeoInfo {
     pub fn has_metro_code(&self) -> bool {
         self.metro_code > 0
     }
-}
-
-/// Extracts the DMA (Designated Market Area) code from the request's geolocation data.
-///
-/// This function:
-/// 1. Checks if running in Fastly environment
-/// 2. Performs geo lookup based on client IP
-/// 3. Sets various geo headers on the request
-/// 4. Returns the metro code (DMA) if available
-///
-/// # Arguments
-///
-/// * `req` - The request to extract DMA code from
-///
-/// # Returns
-///
-/// The DMA/metro code as a string if available, None otherwise
-pub fn get_dma_code(req: &mut Request) -> Option<String> {
-    // Debug: Check if we're running in Fastly environment
-    log::info!("Fastly Environment Check:");
-    log::info!(
-        "  FASTLY_POP: {}",
-        std::env::var("FASTLY_POP").unwrap_or_else(|_| "not in Fastly".to_string())
-    );
-    log::info!(
-        "  FASTLY_REGION: {}",
-        std::env::var("FASTLY_REGION").unwrap_or_else(|_| "not in Fastly".to_string())
-    );
-
-    // Get detailed geo information using geo_lookup
-    if let Some(geo) = req.get_client_ip_addr().and_then(geo_lookup) {
-        log::info!("Geo Information Found:");
 
-        // Set all available geo information in headers
-        let city = geo.city();
-        req.set_header(HEADER_X_GEO_CITY, city);
-        log::info!("  City: {}", city);
-
-        let country = geo.country_code();
-        req.set_header(HEADER_X_GEO_COUNTRY, country);
-        log::info!("  Country: {}", country);
-
-        req.set_header(HEADER_X_GEO_CONTINENT, format!("{:?}", geo.continent()));
-        log::info!("  Continent: {:?}", geo.continent());
-
-        req.set_header(
-            HEADER_X_GEO_COORDINATES,
-            format!("{},{}", geo.latitude(), geo.longitude()),
-        );
-        log::info!("  Location: ({}, {})", geo.latitude(), geo.longitude());
-
-        // Get and set the metro code (DMA)
-        let metro_code = geo.metro_code();
-        req.set_header(HEADER_X_GEO_METRO_CODE, metro_code.to_string());
-        log::info!("Found DMA/Metro code: {}", metro_code);
-        return Some(metro_code.to_string());
-    } else {
-        log::info!("No geo information available for the request");
-        req.set_header(HEADER_X_GEO_INFO_AVAILABLE, "false");
-    }
-
-    // If no metro code is found, log all request headers for debugging
-    log::info!("No DMA/Metro code found. All request headers:");
-    for (name, value) in req.get_headers() {
-        log::info!("  {}: {:?}", name, value);
+    /// Sets the geographic information headers on the given request.
+    ///
+    /// This sets the following headers:
+    /// - `x-geo-city`
+    /// - `x-geo-country`
+    /// - `x-geo-continent`
+    /// - `x-geo-coordinates`
+    /// - `x-geo-metro-code`
+    /// - `x-geo-region` (if available)
+    pub fn set_headers(&self, req: &mut Request) {
+        req.set_header(HEADER_X_GEO_CITY, &self.city);
+        req.set_header(HEADER_X_GEO_COUNTRY, &self.country);
+        req.set_header(HEADER_X_GEO_CONTINENT, &self.continent);
+        req.set_header(HEADER_X_GEO_COORDINATES, self.coordinates_string());
+        req.set_header(HEADER_X_GEO_METRO_CODE, self.metro_code.to_string());
+        if let Some(region) = &self.region {
+            req.set_header("x-geo-region", region);
+        }
     }
-
-    None
 }
 
 /// Returns the geographic information for the request as a JSON response.

crates/common/src/integrations/prebid.rs

@@ -228,7 +228,7 @@ impl crate::integrations::IntegrationHtmlPostProcessor for PrebidHtmlInjector {
         ctx: &crate::integrations::IntegrationHtmlContext<'_>,
     ) -> bool {
         // Construct the Prebid configuration object
-        let config = json!({
+        let mut config = json!({
             "accountId": "trusted-server",
             "enabled": true,
             "bidders": self.config.bidders,
@@ -242,6 +242,19 @@ impl crate::integrations::IntegrationHtmlPostProcessor for PrebidHtmlInjector {
             "debug": self.config.debug,
         });
 
+        // Inject Geo information if available
+        if let Some(geo) = ctx.geo {
+            config["geo"] = json!({
+                "city": geo.city,
+                "country": geo.country,
+                "continent": geo.continent,
+                "lat": geo.latitude,
+                "lon": geo.longitude,
+                "metroCode": geo.metro_code,
+                "region": geo.region,
+            });
+        }
+
         // Script to inject configuration and initialize Prebid via tsjs
         let script = format!(
             r#"<script>

crates/common/src/publisher.rs

@@ -226,13 +226,15 @@ pub fn handle_publisher_request(
     )?;
     let origin_host = settings.publisher.origin_host();
 
-    // Inject Geo headers for the backend request
-    crate::geo::get_dma_code(&mut req);
-
     // Extract GeoInfo from request before it is consumed
     use crate::geo::GeoInfo;
     let geo_info = GeoInfo::from_request(&req);
 
+    // Inject Geo headers for the backend request if available
+    if let Some(geo) = &geo_info {
+        geo.set_headers(&mut req);
+    }
+
     // Capture Geo headers to copy to response
     let geo_headers: Vec<(String, String)> = [
         "x-geo-city",