Log as client_main_id, not main_client_id

Summary:
We are logging the same info in 2 different columns: client_main_id and main_client_id. The latter only in the context of rate-limited requests.
This should have never been the case, let's fix it

Reviewed By: andreacampi

Differential Revision: D72091301

fbshipit-source-id: 9fe2aeab34fd1c845b4938cbb274ba1a0e3f7e95

Author: Clara Rull

eden/mononoke/edenapi_service/src/handlers/commit.rs

@@ -234,23 +234,23 @@ async fn ratelimit_commit_creation(ctx: CoreContext) -> Result<(), Error> {
     let max_value = limit.body.raw_config.limit;
     let time_window = limit.fci_metric.window.as_secs() as u32;
 
-    let main_client_id = match &client_request_info.main_id {
-        Some(main_client_id) => main_client_id,
+    let client_main_id = match &client_request_info.main_id {
+        Some(client_main_id) => client_main_id,
         None => {
             debug!(ctx.logger(), "No main client id found");
             return Ok(());
         }
     };
 
-    let counter = build_counter(&ctx, category, COMMITS_PER_USER_RATE_LIMIT, main_client_id);
+    let counter = build_counter(&ctx, category, COMMITS_PER_USER_RATE_LIMIT, client_main_id);
     counter_check_and_bump(
         &ctx,
         counter,
         COMMITS_PER_USER_RATE_LIMIT,
         max_value,
         time_window,
         enforced,
-        hashmap! {"main_client_id" => main_client_id.as_str() },
+        hashmap! {"client_main_id" => client_main_id.as_str() },
     )
     .await
 }

eden/mononoke/edenapi_service/src/middleware/rate_limiter.rs

@@ -58,8 +58,8 @@ impl Middleware for ThrottleMiddleware {
                 debug!(ctx.logger(), "No client request info found");
                 None
             })?;
-        // Retrieve main client ID
-        let main_client_id = client_request_info.main_id.clone().or_else(|| {
+        // Retrieve client main id
+        let client_main_id = client_request_info.main_id.clone().or_else(|| {
             debug!(ctx.logger(), "No main client id found");
             None
         })?;
@@ -74,7 +74,7 @@ impl Middleware for ThrottleMiddleware {
         let limit = rate_limiter.find_rate_limit(
             Metric::EdenApiQps,
             Some(identities.clone()),
-            Some(&main_client_id),
+            Some(&client_main_id),
         )?;
 
         let enforced = match limit.body.raw_config.status {
@@ -85,7 +85,7 @@ impl Middleware for ThrottleMiddleware {
         };
 
         let category = rate_limiter.category();
-        let counter = build_counter(&ctx, category, EDENAPI_QPS_LIMIT, &main_client_id);
+        let counter = build_counter(&ctx, category, EDENAPI_QPS_LIMIT, &client_main_id);
         let max_value = limit.body.raw_config.limit;
         let time_window = limit.fci_metric.window.as_secs() as u32;
 
@@ -96,7 +96,7 @@ impl Middleware for ThrottleMiddleware {
             max_value,
             time_window,
             enforced,
-            hashmap! {"main_client_id" => main_client_id.as_str() },
+            hashmap! {"client_main_id" => client_main_id.as_str() },
         )
         .await
         {