Update FileCommandManager.cs

src/Runner.Common/JobServerQueue.cs

@@ -77,7 +77,6 @@ namespace GitHub.Runner.Common
         private int _resultsServiceExceptionsCount = 0;
         private Stopwatch _resultsUploadTimer = new();
         private Stopwatch _actionsUploadTimer = new();
-        private Stopwatch _jobRecordUpdatedTimer = new();
 
         public TaskCompletionSource<int> JobRecordUpdated => _jobRecordUpdated;
 
@@ -97,8 +96,6 @@ namespace GitHub.Runner.Common
 
         private bool _resultsClientInitiated = false;
         private bool _enableTelemetry = false;
-        private bool _enableJobRecordUpdatedTelemetry = false;
-        private bool _enableAutoRetry = false;
         private delegate Task ResultsFileUploadHandler(ResultsUploadFileInfo file);
 
         public override void Initialize(IHostContext hostContext)
@@ -183,23 +180,6 @@ namespace GitHub.Runner.Common
 
             _allDequeueTasks = new Task[] { _webConsoleLineDequeueTask, _fileUploadDequeueTask, _timelineUpdateDequeueTask, _resultsUploadDequeueTask };
             _queueInProcess = true;
-
-
-            if (jobRequest.Variables.TryGetValue("DistributedTask.EnableJobRecordUpdatedTelemetry", out VariableValue enableTelemetry))
-            {
-                _enableJobRecordUpdatedTelemetry = StringUtil.ConvertToBoolean(enableTelemetry?.Value);
-                if (_enableJobRecordUpdatedTelemetry)
-                {
-                    Trace.Info("Enable telemetry for first job record update.");
-                    _jobRecordUpdatedTimer.Start();
-                }
-            }
-
-            if (jobRequest.Variables.TryGetValue("DistributedTask.EnableRecordUpdateAutoRetry", out VariableValue enableAutoRetry))
-            {
-                Trace.Info("Enable auto retry for timeline record update.");
-                _enableAutoRetry = StringUtil.ConvertToBoolean(enableAutoRetry?.Value);
-            }
         }
 
         // WebConsoleLine queue and FileUpload queue are always best effort
@@ -252,11 +232,6 @@ namespace GitHub.Runner.Common
                 Trace.Info(uploadTimeComparison);
                 _jobTelemetries.Add(new JobTelemetry() { Type = JobTelemetryType.General, Message = uploadTimeComparison });
             }
-
-            if (_enableJobRecordUpdatedTelemetry)
-            {
-                _jobTelemetries.Add(new JobTelemetry() { Type = JobTelemetryType.General, Message = $"First job record updated time after: {_jobRecordUpdatedTimer.ElapsedMilliseconds} ms" });
-            }
         }
 
         public void QueueWebConsoleLine(Guid stepRecordId, string line, long? lineNumber)
@@ -754,11 +729,6 @@ namespace GitHub.Runner.Common
                                 // We have changed the state of the job
                                 Trace.Info("Job timeline record has been updated for the first time.");
                                 _jobRecordUpdated.TrySetResult(0);
-
-                                if (_enableJobRecordUpdatedTelemetry)
-                                {
-                                    _jobRecordUpdatedTimer.Stop();
-                                }
                             }
                         }
                         catch (Exception ex)
@@ -770,15 +740,6 @@ namespace GitHub.Runner.Common
                             {
                                 mainTimelineRecordsUpdateErrors.Add(ex);
                             }
-
-                            if (!runOnce && _enableAutoRetry)
-                            {
-                                foreach (var retryRecordId in update.PendingRecords.DistinctBy(x => x.Id).Select(r => r.Id))
-                                {
-                                    Trace.Verbose("Enqueue timeline record {0} update for retry.", retryRecordId);
-                                    _timelineUpdateQueue[update.TimelineId].Enqueue(new TimelineRecord() { Id = retryRecordId });
-                                }
-                            }
                         }
                     }
                 }

src/Runner.Worker/FileCommandManager.cs

@@ -179,7 +179,8 @@ namespace GitHub.Runner.Worker
 
         private string[] _setEnvBlockList =
         {
-            "NODE_OPTIONS"
+            "NODE_OPTIONS",
+            "BASH_ENV"
         };
     }
 

src/Runner.Worker/JobRunner.cs

@@ -210,14 +210,8 @@ namespace GitHub.Runner.Worker
                     // Server won't issue ID_TOKEN for non-inprogress job.
                     // If the job is trying to use OIDC feature, we want the job to be marked as in-progress before running any customer's steps as much as we can.
                     // Timeline record update background process runs every 500ms, so delay 1000ms is enough for most of the cases
-                    var maxWaitTimeInSeconds = jobContext.Global.Variables.GetInt("DistributedTask.FirstJobRecordUpdateWaitTimeInSeconds");
-                    if (maxWaitTimeInSeconds == null)
-                    {
-                        maxWaitTimeInSeconds = 1;
-                    }
-
-                    Trace.Info($"Waiting {maxWaitTimeInSeconds.Value} seconds for job to be marked as started.");
-                    await Task.WhenAny(_jobServerQueue.JobRecordUpdated.Task, Task.Delay(maxWaitTimeInSeconds.Value * 1000));
+                    Trace.Info($"Waiting for job to be marked as started.");
+                    await Task.WhenAny(_jobServerQueue.JobRecordUpdated.Task, Task.Delay(1000));
                 }
 
                 // Run all job steps