Fix rntbd headers for proxy request.

Author: aavasthy

Microsoft.Azure.Cosmos/src/ThinClientStoreClient.cs

@@ -91,11 +91,6 @@ private async ValueTask<HttpRequestMessage> PrepareRequestForProxyAsync(
             BufferProviderWrapper bufferProviderWrapper = this.bufferProviderWrapperPool.Get();
             try
             {
-                ContainerProperties collection = await clientCollectionCache.ResolveCollectionAsync(
-                     request,
-                     CancellationToken.None,
-                     NoOpTrace.Singleton);
-                request.ResourceId = collection.ResourceId;
                 requestMessage.Headers.TryAddWithoutValidation(
                     ThinClientConstants.ProxyOperationType,
                     request.OperationType.ToOperationTypeString());

Microsoft.Azure.Cosmos/src/ThinClientTransportSerializer.cs

@@ -63,6 +63,11 @@ public static async Task<Stream> SerializeProxyRequestAsync(
                                                 requestStream, AuthorizationTokenType.PrimaryMasterKey,
                                                 dictionaryCollection);
 
+            ContainerProperties collection = await clientCollectionCache.ResolveCollectionAsync(
+                 request,
+                 CancellationToken.None,
+                 NoOpTrace.Singleton);
+
             if (operationType.IsPointOperation())
             {
                 string partitionKey = request.Headers.Get(HttpConstants.HttpHeaders.PartitionKey);
@@ -72,10 +77,6 @@ public static async Task<Stream> SerializeProxyRequestAsync(
                     throw new InternalServerErrorException();
                 }
 
-                ContainerProperties collection = await clientCollectionCache.ResolveCollectionAsync(
-                     request,
-                     CancellationToken.None,
-                     NoOpTrace.Singleton);
                 string epk = GetEffectivePartitionKeyHash(partitionKey, collection.PartitionKey);
 
                 request.Properties = new Dictionary<string, object>
@@ -96,6 +97,8 @@ public static async Task<Stream> SerializeProxyRequestAsync(
                 request.Headers.Add(HttpConstants.HttpHeaders.StartEpk, request.Headers[ThinClientConstants.ProxyStartEpk]);
                 request.Headers.Add(HttpConstants.HttpHeaders.EndEpk, request.Headers[ThinClientConstants.ProxyEndEpk]);
             }
+            request.ResourceId = collection.ResourceId;
+            request.Headers.Add(WFConstants.BackendHeaders.CollectionRid, collection.ResourceId);
 
             await request.EnsureBufferedBodyAsync();