Stop retrying http requests when script invocation result is failed

src/WebJobs.Script/Http/DefaultHttpProxyService.cs

@@ -21,6 +21,7 @@ internal class DefaultHttpProxyService : IHttpProxyService, IDisposable
         private readonly HttpMessageInvoker _messageInvoker;
         private readonly ForwarderRequestConfig _forwarderRequestConfig;
         private readonly ILogger<DefaultHttpProxyService> _logger;
+        private readonly HttpTransformer _httpTransformer;
 
         public DefaultHttpProxyService(IHttpForwarder httpForwarder, ILogger<DefaultHttpProxyService> logger)
         {
@@ -39,6 +40,8 @@ public DefaultHttpProxyService(IHttpForwarder httpForwarder, ILogger<DefaultHttp
             {
                 ActivityTimeout = TimeSpan.FromSeconds(240)
             };
+
+            _httpTransformer = new ScriptInvocationRequestTransformer();
         }
 
         public void Dispose()
@@ -98,8 +101,12 @@ public void StartForwarding(ScriptInvocationContext context, Uri httpUri)
             // add invocation id as correlation id, override existing header if present
             httpRequest.Headers[ScriptConstants.HttpProxyCorrelationHeader] = context.ExecutionContext.InvocationId.ToString();
 
-            var forwardingTask = _httpForwarder.SendAsync(httpContext, httpUri.ToString(), _messageInvoker, _forwarderRequestConfig).AsTask();
+            // Add the script invocation context for later observation of the ScriptInvocationResult task.
+            // This helps track failures/cancellations that should halt retrying the http request.
+            httpContext.Items[ScriptConstants.HttpProxyScriptInvocationContext] = context;
+
+            var forwardingTask = _httpForwarder.SendAsync(httpContext, httpUri.ToString(), _messageInvoker, _forwarderRequestConfig, _httpTransformer).AsTask();
             context.Properties[ScriptConstants.HttpProxyTask] = forwardingTask;
         }
     }
-}
+}

src/WebJobs.Script/Http/RetryProxyHandler.cs

@@ -5,6 +5,8 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Azure.WebJobs.Script.Description;
+using Microsoft.Azure.WebJobs.Script.Exceptions;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Azure.WebJobs.Script.Http
@@ -30,11 +32,23 @@ public RetryProxyHandler(HttpMessageHandler innerHandler, ILogger logger)
 
         protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
+            TaskCompletionSource<ScriptInvocationResult> resultSource = null;
+            if (request.Options.TryGetValue(ScriptConstants.HttpProxyScriptInvocationContext, out ScriptInvocationContext scriptInvocationContext))
+            {
+                resultSource = scriptInvocationContext.ResultSource;
+            }
+
             var currentDelay = InitialDelay;
             for (int attemptCount = 1; attemptCount <= MaxRetries; attemptCount++)
             {
                 try
                 {
+                    if (resultSource is not null && resultSource.Task.IsFaulted)
+                    {
+                        throw resultSource.Task.Exception?.InnerException ??
+                            new HttpRequestException($"The function invocation tied to this HTTP request failed. Invocation ID: {scriptInvocationContext.ExecutionContext.InvocationId}");
+                    }
+
                     return await base.SendAsync(request, cancellationToken);
                 }
                 catch (TaskCanceledException) when (cancellationToken.IsCancellationRequested)

src/WebJobs.Script/Http/ScriptInvocationRequestTransformer.cs

@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Azure.WebJobs.Script.Description;
+using Yarp.ReverseProxy.Forwarder;
+
+namespace Microsoft.Azure.WebJobs.Script.Http
+{
+    internal class ScriptInvocationRequestTransformer : HttpTransformer
+    {
+        public override async ValueTask TransformRequestAsync(HttpContext httpContext, HttpRequestMessage proxyRequest, string destinationPrefix, CancellationToken cancellationToken)
+        {
+            // this preserves previous behavior (which called the default transformer) - base method is also called inside of here
+            await HttpTransformer.Default.TransformRequestAsync(httpContext, proxyRequest, destinationPrefix, cancellationToken);
+
+            if (httpContext.Items.TryGetValue(ScriptConstants.HttpProxyScriptInvocationContext, out object result)
+                && result is ScriptInvocationContext scriptContext)
+            {
+                proxyRequest.Options.TryAdd(ScriptConstants.HttpProxyScriptInvocationContext, scriptContext);
+            }
+        }
+    }
+}

src/WebJobs.Script/ScriptConstants.cs

@@ -261,6 +261,7 @@ public static class ScriptConstants
         public static readonly string HttpProxyingEnabled = "HttpProxyingEnabled";
         public static readonly string HttpProxyCorrelationHeader = "x-ms-invocation-id";
         public static readonly string HttpProxyTask = "HttpProxyTask";
+        public static readonly string HttpProxyScriptInvocationContext = "HttpProxyScriptInvocationContext";
 
         public static readonly string OperationNameKey = "OperationName";
 

test/WebJobs.Script.Tests/HttpProxyService/DefaultHttpProxyServiceTests.cs

@@ -12,7 +12,7 @@
 using Xunit;
 using Yarp.ReverseProxy.Forwarder;
 
-namespace Microsoft.Azure.WebJobs.Script.Tests
+namespace Microsoft.Azure.WebJobs.Script.Tests.Http
 {
     public class DefaultHttpProxyServiceTests
     {

test/WebJobs.Script.Tests/HttpProxyService/ScriptInvocationRequestTransformerTests.cs

@@ -0,0 +1,135 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Azure.WebJobs.Script.Description;
+using Microsoft.Azure.WebJobs.Script.Http;
+using Xunit;
+
+namespace Microsoft.Azure.WebJobs.Script.Tests.Http
+{
+    public class ScriptInvocationRequestTransformerTests
+    {
+        private readonly ScriptInvocationRequestTransformer _transformer;
+
+        public ScriptInvocationRequestTransformerTests()
+        {
+            _transformer = new ScriptInvocationRequestTransformer();
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task TransformRequestAsync_IncludesXForwardedHeaders(bool includeScriptInvocationContext)
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Scheme = "https";
+            httpContext.Request.Host = new HostString("example.com", 443);
+            httpContext.Request.PathBase = "/api";
+            httpContext.Request.Path = "/test";
+            httpContext.Request.QueryString = new QueryString("?param=value");
+
+            var remoteAddress = "192.168.1.100";
+            httpContext.Connection.RemoteIpAddress = System.Net.IPAddress.Parse(remoteAddress);
+
+            if (includeScriptInvocationContext)
+            {
+                var scriptContext = new ScriptInvocationContext
+                {
+                    FunctionMetadata = new FunctionMetadata { Name = "TestFunction" },
+                    ExecutionContext = new ExecutionContext { InvocationId = Guid.NewGuid() }
+                };
+
+                httpContext.Items[ScriptConstants.HttpProxyScriptInvocationContext] = scriptContext;
+            }
+
+            var proxyRequest = new HttpRequestMessage(HttpMethod.Get, "http://localhost:7071/api/test");
+            const string destinationPrefix = "http://localhost:7071";
+
+            await _transformer.TransformRequestAsync(httpContext, proxyRequest, destinationPrefix, CancellationToken.None);
+
+            Assert.True(proxyRequest.Headers.Contains("X-Forwarded-For"), "X-Forwarded-For header should be present");
+            Assert.True(proxyRequest.Headers.Contains("X-Forwarded-Host"), "X-Forwarded-Host header should be present");
+            Assert.True(proxyRequest.Headers.Contains("X-Forwarded-Proto"), "X-Forwarded-Proto header should be present");
+
+            var forwardedFor = proxyRequest.Headers.GetValues("X-Forwarded-For");
+            Assert.Contains(remoteAddress, forwardedFor);
+
+            var forwardedHost = proxyRequest.Headers.GetValues("X-Forwarded-Host");
+            Assert.Contains("example.com:443", forwardedHost);
+
+            var forwardedProto = proxyRequest.Headers.GetValues("X-Forwarded-Proto");
+            Assert.Contains("https", forwardedProto);
+        }
+
+        [Fact]
+        public async Task TransformRequestAsync_WithScriptInvocationContext_AddsContextToRequestOptions()
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Scheme = "http";
+            httpContext.Request.Host = new HostString("localhost", 7071);
+            var remoteAddress = "192.168.1.100";
+            httpContext.Connection.RemoteIpAddress = System.Net.IPAddress.Parse(remoteAddress);
+
+            var scriptContext = new ScriptInvocationContext
+            {
+                FunctionMetadata = new FunctionMetadata { Name = "TestFunction" },
+                ExecutionContext = new ExecutionContext { InvocationId = Guid.NewGuid() }
+            };
+
+            httpContext.Items[ScriptConstants.HttpProxyScriptInvocationContext] = scriptContext;
+
+            var proxyRequest = new HttpRequestMessage(HttpMethod.Get, "http://localhost:7071/api/test");
+            const string destinationPrefix = "http://localhost:7071";
+
+            await _transformer.TransformRequestAsync(httpContext, proxyRequest, destinationPrefix, CancellationToken.None);
+
+            Assert.True(proxyRequest.Options.TryGetValue(ScriptConstants.HttpProxyScriptInvocationContext, out ScriptInvocationContext contextValue));
+            Assert.Equal(scriptContext.ExecutionContext.InvocationId, contextValue.ExecutionContext.InvocationId);
+
+            Assert.True(proxyRequest.Headers.Contains("X-Forwarded-For"));
+            Assert.True(proxyRequest.Headers.Contains("X-Forwarded-Host"));
+            Assert.True(proxyRequest.Headers.Contains("X-Forwarded-Proto"));
+        }
+
+        [Fact]
+        public async Task TransformRequestAsync_PreservesExistingXForwardedHeaders()
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Scheme = "https";
+            httpContext.Request.Host = new HostString("proxy.example.com");
+            var requestRemoteAddress = "172.16.0.1";
+            httpContext.Connection.RemoteIpAddress = System.Net.IPAddress.Parse(requestRemoteAddress);
+
+            // Add existing X-Forwarded headers to simulate request through multiple proxies
+            var originalFor = "203.0.113.195," + requestRemoteAddress;
+            var originalHost = "proxy.example.com";
+            var originalProto = "https";
+            httpContext.Request.Headers["X-Forwarded-For"] = originalFor;
+            httpContext.Request.Headers["X-Forwarded-Host"] = originalHost;
+            httpContext.Request.Headers["X-Forwarded-Proto"] = originalProto;
+
+            var proxyRequest = new HttpRequestMessage(HttpMethod.Get, "http://localhost:7071/api/test");
+            const string destinationPrefix = "http://localhost:7071";
+
+            await _transformer.TransformRequestAsync(httpContext, proxyRequest, destinationPrefix, CancellationToken.None);
+
+            Assert.True(proxyRequest.Headers.Contains("X-Forwarded-For"));
+            Assert.True(proxyRequest.Headers.Contains("X-Forwarded-Host"));
+            Assert.True(proxyRequest.Headers.Contains("X-Forwarded-Proto"));
+
+            var forwardedFor = proxyRequest.Headers.GetValues("X-Forwarded-For");
+            Assert.Contains(requestRemoteAddress, forwardedFor);
+
+            var forwardedHost = proxyRequest.Headers.GetValues("X-Forwarded-Host");
+            Assert.Contains(originalHost, forwardedHost);
+
+            var forwardedProto = proxyRequest.Headers.GetValues("X-Forwarded-Proto");
+            Assert.Contains(originalProto, forwardedProto);
+        }
+    }
+}