[Internal] [FaultInjection] ThinClient: Fixes payload of injected errors for requests going to ThinClient Proxy

Microsoft.Azure.Cosmos/FaultInjection/src/implementation/FaultInjectionRuleProcessor.cs

@@ -189,7 +189,8 @@ await BackoffRetryUtility<IEnumerable<string>>.ExecuteAsync(
                     result.GetDelay(),
                     result.GetSuppressServiceRequests(),
                     result.GetInjectionRate(),
-                    this.applicationContext));
+                    this.applicationContext, 
+                    this.globalEndpointManager));
         }
 
         private async Task<IFaultInjectionRuleInternal> GetEffectiveConnectionErrorRule(FaultInjectionRule rule)

Microsoft.Azure.Cosmos/src/DocumentClient.cs

@@ -1090,7 +1090,8 @@ private async Task<bool> GetInitializationTaskAsync(IStoreClientFactory storeCli
                     this.serializerSettings,
                     this.httpClient,
                     this.PartitionKeyRangeLocation,
-                    isPartitionLevelFailoverEnabled: this.ConnectionPolicy.EnablePartitionLevelFailover || this.ConnectionPolicy.EnablePartitionLevelCircuitBreaker);
+                    isPartitionLevelFailoverEnabled: this.ConnectionPolicy.EnablePartitionLevelFailover || this.ConnectionPolicy.EnablePartitionLevelCircuitBreaker,
+                    this.chaosInterceptor);
 
             this.GatewayStoreModel = gatewayStoreModel;
 
@@ -1116,7 +1117,8 @@ private async Task<bool> GetInitializationTaskAsync(IStoreClientFactory storeCli
                     this.eventSource,
                     this.serializerSettings,
                     this.httpClient,
-                    isPartitionLevelFailoverEnabled: this.ConnectionPolicy.EnablePartitionLevelFailover || this.ConnectionPolicy.EnablePartitionLevelCircuitBreaker);
+                    isPartitionLevelFailoverEnabled: this.ConnectionPolicy.EnablePartitionLevelFailover || this.ConnectionPolicy.EnablePartitionLevelCircuitBreaker,
+                    chaosInterceptor: this.chaosInterceptor);
 
                 thinClientStoreModel.SetCaches(this.partitionKeyRangeCache, this.collectionCache);
 

Microsoft.Azure.Cosmos/src/GatewayStoreModel.cs

@@ -19,6 +19,7 @@ namespace Microsoft.Azure.Cosmos
     using Microsoft.Azure.Cosmos.Tracing;
     using Microsoft.Azure.Documents;
     using Microsoft.Azure.Documents.Collections;
+    using Microsoft.Azure.Documents.FaultInjection;
     using Newtonsoft.Json;
 
     // Marking it as non-sealed in order to unit test it using Moq framework
@@ -32,6 +33,8 @@ internal class GatewayStoreModel : IStoreModelExtension, IDisposable
         private readonly DocumentClientEventSource eventSource;
         internal readonly ConsistencyLevel defaultConsistencyLevel;
 
+        private readonly IChaosInterceptor chaosInterceptor;
+
         private GatewayStoreClient gatewayStoreClient;
 
         // Caches to resolve the PartitionKeyRange from request. For Session Token Optimization.
@@ -47,7 +50,8 @@ public GatewayStoreModel(
             JsonSerializerSettings serializerSettings,
             CosmosHttpClient httpClient,
             GlobalPartitionEndpointManager globalPartitionEndpointManager,
-            bool isPartitionLevelFailoverEnabled = false)
+            bool isPartitionLevelFailoverEnabled = false,
+            IChaosInterceptor chaosInterceptor = null)
         {
             this.isPartitionLevelFailoverEnabled = isPartitionLevelFailoverEnabled;
             this.endpointManager = endpointManager;
@@ -63,6 +67,7 @@ public GatewayStoreModel(
 
             this.globalPartitionEndpointManager.SetBackgroundConnectionPeriodicRefreshTask(
                 this.MarkEndpointsToHealthyAsync);
+            this.chaosInterceptor = chaosInterceptor;
         }
 
         public virtual async Task<DocumentServiceResponse> ProcessMessageAsync(DocumentServiceRequest request, CancellationToken cancellationToken = default)

Microsoft.Azure.Cosmos/src/HttpClient/CosmosHttpClientCore.cs

@@ -359,7 +359,6 @@ private async Task<HttpResponseMessage> SendHttpHelperAsync(
                     {
                         if (this.chaosInterceptor != null && documentServiceRequest != null)
                         {
-                            this.SetFaultInjectionHeader(documentServiceRequest, requestMessage);
                             (bool hasFault, HttpResponseMessage fiResponseMessage) = await this.InjectFaultsAsync(cancellationTokenSource, documentServiceRequest, requestMessage);
                             if (hasFault)
                             {
@@ -374,7 +373,6 @@ private async Task<HttpResponseMessage> SendHttpHelperAsync(
 
                         if (this.chaosInterceptor != null && documentServiceRequest != null)
                         {
-                            this.SetFaultInjectionHeader(documentServiceRequest, requestMessage);
                             CancellationToken fiToken = cancellationTokenSource.Token;
                             fiToken.ThrowIfCancellationRequested();
                             await this.chaosInterceptor.OnAfterHttpSendAsync(documentServiceRequest, fiToken);
@@ -469,11 +467,6 @@ private async Task<HttpResponseMessage> SendHttpHelperAsync(
             }
         }
 
-        private void SetFaultInjectionHeader(DocumentServiceRequest documentServiceRequest, HttpRequestMessage requestMessage)
-        {
-            documentServiceRequest.Headers.Set("FAULTINJECTION_GW_URI", requestMessage.RequestUri.ToString());
-        }
-
         private async Task<(bool, HttpResponseMessage)> InjectFaultsAsync(
             CancellationTokenSource cancellationTokenSource, 
             DocumentServiceRequest documentServiceRequest,