Fix test warning, add exit code

Author: jviau

src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs

@@ -23,7 +23,6 @@
 using Microsoft.Azure.WebJobs.Script.Diagnostics;
 using Microsoft.Azure.WebJobs.Script.Diagnostics.OpenTelemetry;
 using Microsoft.Azure.WebJobs.Script.Eventing;
-using Microsoft.Azure.WebJobs.Script.Exceptions;
 using Microsoft.Azure.WebJobs.Script.Extensions;
 using Microsoft.Azure.WebJobs.Script.Grpc.Eventing;
 using Microsoft.Azure.WebJobs.Script.Grpc.Extensions;
@@ -388,14 +387,17 @@ public async Task StartWorkerProcessAsync(CancellationToken cancellationToken)
             _workerChannelLogger.LogDebug("Initiating Worker Process start up");
             await _rpcWorkerProcess.StartProcessAsync(cancellationToken);
             _state |= RpcWorkerChannelState.Initializing;
-            Task exited = _rpcWorkerProcess.WaitForExitAsync(cancellationToken);
+            Task<int> exited = _rpcWorkerProcess.WaitForExitAsync(cancellationToken);
             Task winner = await Task.WhenAny(_workerInitTask.Task, exited).WaitAsync(cancellationToken);
             await winner;
 
             if (winner == exited)
             {
-                // process exited without throwing. We need to throw to indicate process is not running.
-                throw new WorkerProcessExitException("Worker process exited before initializing.");
+                // Process exited without throwing. We need to throw to indicate process is not running.
+                throw new WorkerProcessExitException("Worker process exited before initializing.")
+                {
+                    ExitCode = await exited,
+                };
             }
         }
 

src/WebJobs.Script/Workers/ProcessManagement/IWorkerProcess.cs

@@ -15,7 +15,7 @@ public interface IWorkerProcess
 
         Task StartProcessAsync(CancellationToken cancellationToken = default);
 
-        Task WaitForExitAsync(CancellationToken cancellationToken = default);
+        Task<int> WaitForExitAsync(CancellationToken cancellationToken = default);
 
         void WaitForProcessExitInMilliSeconds(int waitTime);
     }

src/WebJobs.Script/Workers/ProcessManagement/WorkerProcess.cs

@@ -38,7 +38,7 @@ internal abstract class WorkerProcess : IWorkerProcess, IDisposable
         private readonly bool _useStdErrorStreamForErrorsOnly;
         private Queue<string> _processStdErrDataQueue = new(3);
         private IHostProcessMonitor _processMonitor;
-        private TaskCompletionSource _processExit; // used to hold custom exceptions on non-success exit.
+        private TaskCompletionSource<int> _processExit; // used to hold custom exceptions on non-success exit.
 
         internal WorkerProcess(IScriptEventManager eventManager, IProcessRegistry processRegistry, ILogger workerProcessLogger, IWorkerConsoleLogSource consoleLogSource, IMetricsLogger metricsLogger,
             IServiceProvider serviceProvider, ILoggerFactory loggerFactory, IEnvironment environment, IOptionsMonitor<ScriptApplicationHostOptions> scriptApplicationHostOptions, bool useStdErrStreamForErrorsOnly = false)
@@ -114,8 +114,9 @@ public Task StartProcessAsync(CancellationToken cancellationToken = default)
             }
         }
 
-        public Task WaitForExitAsync(CancellationToken cancellationToken = default)
+        public Task<int> WaitForExitAsync(CancellationToken cancellationToken = default)
         {
+            ObjectDisposedException.ThrowIf(Disposing, this);
             if (_processExit is { } tcs)
             {
                 // We use a TaskCompletionSource (and not Process.WaitForExitAsync) so we can propagate our custom exceptions.
@@ -201,7 +202,7 @@ private void OnProcessExited(object sender, EventArgs e)
             }
             finally
             {
-                _processExit.TrySetResult();
+                _processExit.TrySetResult(Process.ExitCode);
                 UnregisterFromProcessMonitor();
                 Process.Close();
             }
@@ -375,7 +376,7 @@ private void AssignUserExecutePermissionsIfNotExists()
                     return;
                 }
 
-                UnixFileInfo fileInfo = new UnixFileInfo(filePath);
+                UnixFileInfo fileInfo = new(filePath);
                 if (!fileInfo.FileAccessPermissions.HasFlag(FileAccessPermissions.UserExecute))
                 {
                     _workerProcessLogger.LogDebug("Assigning execute permissions to file: {filePath}", filePath);

test/WebJobs.Script.Tests/ScriptStartupTypeDiscovererTests.cs

@@ -616,6 +616,11 @@ public async Task GetExtensionsStartupTypes_EmptyExtensionsArray()
             AssertNoErrors(traces);
         }
 
+        private static void AssertNoErrors(IList<LogMessage> traces)
+        {
+            Assert.False(traces.Any(m => m.Level == LogLevel.Error || m.Level == LogLevel.Critical));
+        }
+
         private static ExtensionBundleDetails GetBundleDetails(string version = "2.7.0")
         {
             return new ExtensionBundleDetails
@@ -751,10 +756,5 @@ public void CopyTo(string path)
                 }
             }
         }
-
-        private static void AssertNoErrors(IList<LogMessage> traces)
-        {
-            Assert.False(traces.Any(m => m.Level == LogLevel.Error || m.Level == LogLevel.Critical));
-        }
     }
 }

test/WebJobs.Script.Tests/Workers/Rpc/GrpcWorkerChannelTests.cs

@@ -76,7 +76,9 @@ public GrpcWorkerChannelTests(ITestOutputHelper testOutput)
             _testWorkerConfig.CountOptions.EnvironmentReloadTimeout = TimeSpan.FromSeconds(5);
 
             _mockRpcWorkerProcess.Setup(m => m.StartProcessAsync(It.IsAny<CancellationToken>())).Returns(Task.CompletedTask);
-            _mockRpcWorkerProcess.Setup(m => m.WaitForExitAsync(It.IsAny<CancellationToken>())).Returns(Task.Delay(Timeout.Infinite));
+
+            TaskCompletionSource<int> tcs = new();
+            _mockRpcWorkerProcess.Setup(m => m.WaitForExitAsync(It.IsAny<CancellationToken>())).Returns(tcs.Task);
             _mockRpcWorkerProcess.Setup(m => m.Id).Returns(910);
             _testEnvironment = new TestEnvironment();
             _testEnvironment.SetEnvironmentVariable(FunctionDataCacheConstants.FunctionDataCacheEnabledSettingName, "1");
@@ -185,7 +187,7 @@ await Assert.ThrowsAsync<TaskCanceledException>(async () =>
         public async Task StartWorkerProcessAsync_ProcessExits_Throws()
         {
             _mockRpcWorkerProcess.Setup(m => m.WaitForExitAsync(It.IsAny<CancellationToken>()))
-                .Returns(Task.CompletedTask);
+                .ReturnsAsync(0);
             await CreateDefaultWorkerChannel(autoStart: false);
 
             WorkerProcessExitException ex = await Assert.ThrowsAsync<WorkerProcessExitException>(