Merged PR 692226: Fix capturing ADO requester info

Fix capturing ADO requester info

Author: semihokur

Public/Src/App/Bxl/Tracing/CaptureBuildInfo.cs

@@ -61,7 +61,12 @@ public class CaptureBuildInfo
         /// <summary>
         /// ADO predefined variable to obtain the requester of the ADO build.
         /// </summary>
-        public const string AdoPreDefinedVariableForRequester = "BUILD_REQUESTEDFOR";
+        public const string AdoPreDefinedVariableForRequester = "BUILD_REQUESTEDFORID";
+
+        /// <summary>
+        /// ADO pre-defined environment variable to obtain the job id.
+        /// </summary>
+        public const string AdoPreDefinedVariableForJobId = "SYSTEM_JOBID";
 
         /// <summary>
         /// This is the primary method in the class which is called by ComputeEnvironment(), to capture the build properties.
@@ -88,7 +93,10 @@ public static Dictionary<string, string> CaptureTelemetryEnvProperties(IConfigur
             CaptureNewPropertyFromEnvironment(traceInfoProperties, CaptureBuildProperties.AdoProjectKey, AdoPreDefinedVariableForProject);
 
             // The requester name for this build (ADO only)
-            CaptureNewPropertyFromEnvironment(traceInfoProperties, CaptureBuildProperties.AdoProjectKey, AdoPreDefinedVariableForRequester);
+            CaptureNewPropertyFromEnvironment(traceInfoProperties, CaptureBuildProperties.AdoRequesterKey, AdoPreDefinedVariableForRequester);
+
+            // The job id for the pipeline run that triggers this build (ADO only)
+            CaptureNewPropertyFromEnvironment(traceInfoProperties, CaptureBuildProperties.AdoJobIdKey, AdoPreDefinedVariableForJobId);
 
             // See GetStageId and GetInfra
             CaptureNewProperty(traceInfoProperties, CaptureBuildProperties.StageIdKey, () => GetStageId(configuration));

Public/Src/Utilities/Utilities/Tracing/CaptureBuildProperties.cs

@@ -55,6 +55,11 @@ public class CaptureBuildProperties
         /// </summary>
         public const string AdoRequesterKey = "adorequester";
 
+        /// <summary>
+        /// Job Id of the run that launched this build.
+        /// </summary>
+        public const string AdoJobIdKey = "adojobid";
+
         /// <summary>
         /// cloudBuildQueue property key name.
         /// In CB this build structure refers to the CB queue name.