Added stack trace to CosmosException, ResponseMessage.ErrorMessage includes full exception info.

Microsoft.Azure.Cosmos/src/Batch/TransactionalBatchOperationResult.cs

@@ -212,9 +212,8 @@ internal ResponseMessage ToResponseMessage()
             ResponseMessage responseMessage = new ResponseMessage(
                 statusCode: this.StatusCode,
                 requestMessage: null,
-                errorMessage: null,
-                error: null,
                 headers: headers,
+                cosmosException: null,
                 diagnostics: this.DiagnosticsContext ?? CosmosDiagnosticsContext.Create())
             {
                 Content = this.ResourceStream

Microsoft.Azure.Cosmos/src/Encryption/EncryptionProcessor.cs

@@ -11,6 +11,7 @@ namespace Microsoft.Azure.Cosmos
     using System.Text;
     using System.Threading;
     using System.Threading.Tasks;
+    using Microsoft.Azure.Cosmos.Resource.CosmosExceptions;
     using Microsoft.Azure.Documents;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
@@ -134,7 +135,7 @@ public async Task<Stream> DecryptAsync(
             EncryptionProperties encryptionProperties = encryptionPropertiesJObj.ToObject<EncryptionProperties>();
             if (encryptionProperties.EncryptionFormatVersion != 1)
             {
-                throw new CosmosException(HttpStatusCode.InternalServerError, $"Unknown encryption format version: {encryptionProperties.EncryptionFormatVersion}. Please upgrade your SDK to the latest version.");
+                throw new CosmosInternalServerErrorException($"Unknown encryption format version: {encryptionProperties.EncryptionFormatVersion}. Please upgrade your SDK to the latest version.");
             }
 
             DataEncryptionKeyCore tempDek = (DataEncryptionKeyInlineCore)database.GetDataEncryptionKey(id: "unknown");

Microsoft.Azure.Cosmos/src/Handler/ResponseMessage.cs

@@ -8,6 +8,7 @@ namespace Microsoft.Azure.Cosmos
     using System.Diagnostics;
     using System.IO;
     using System.Net;
+    using Microsoft.Azure.Cosmos.Resource.CosmosExceptions;
     using Microsoft.Azure.Documents;
 
     /// <summary>
@@ -22,6 +23,7 @@ public ResponseMessage()
         {
             this.Headers = new Headers();
             this.DiagnosticsContext = CosmosDiagnosticsContext.Create();
+            this.CosmosException = null;
         }
 
         /// <summary>
@@ -42,32 +44,36 @@ public ResponseMessage(
 
             this.StatusCode = statusCode;
             this.RequestMessage = requestMessage;
-            this.ErrorMessage = errorMessage;
             this.Headers = new Headers();
             this.DiagnosticsContext = requestMessage?.DiagnosticsContext ?? CosmosDiagnosticsContext.Create();
+
+            if (!string.IsNullOrEmpty(errorMessage))
+            {
+                this.CosmosException = CosmosExceptionFactory.Create(
+                    statusCode,
+                    requestMessage,
+                    errorMessage);
+            }
         }
 
         /// <summary>
         /// Create a <see cref="ResponseMessage"/>
         /// </summary>
         /// <param name="statusCode">The HttpStatusCode of the response</param>
         /// <param name="requestMessage">The <see cref="Cosmos.RequestMessage"/> object</param>
-        /// <param name="errorMessage">The reason for failures if any.</param>
-        /// <param name="error">The inner error object</param>
         /// <param name="headers">The headers for the response.</param>
+        /// <param name="cosmosException">The exception if the response is from an error.</param>
         /// <param name="diagnostics">The diagnostics for the request</param>
         internal ResponseMessage(
             HttpStatusCode statusCode,
             RequestMessage requestMessage,
-            string errorMessage,
-            Error error,
             Headers headers,
+            CosmosException cosmosException,
             CosmosDiagnosticsContext diagnostics)
         {
             this.StatusCode = statusCode;
             this.RequestMessage = requestMessage;
-            this.ErrorMessage = errorMessage;
-            this.Error = error;
+            this.CosmosException = cosmosException;
             this.Headers = headers ?? new Headers();
             this.DiagnosticsContext = diagnostics ?? throw new ArgumentNullException(nameof(diagnostics));
         }
@@ -93,7 +99,7 @@ public virtual Stream Content
         /// <summary>
         /// Gets the reason for a failure in the current response.
         /// </summary>
-        public virtual string ErrorMessage { get; internal set; }
+        public virtual string ErrorMessage => this.CosmosException?.ToString();
 
         /// <summary>
         /// Gets the current <see cref="ResponseMessage"/> HTTP headers.
@@ -120,10 +126,7 @@ public virtual Stream Content
 
         internal CosmosDiagnosticsContext DiagnosticsContext { get; }
 
-        /// <summary>
-        /// Gets the internal error object.
-        /// </summary>
-        internal virtual Error Error { get; set; }
+        internal CosmosException CosmosException { get; }
 
         private bool disposed;
 
@@ -137,19 +140,13 @@ public virtual Stream Content
         /// <summary>
         /// Checks if the current <see cref="ResponseMessage"/> has a successful status code, otherwise, throws.
         /// </summary>
-        /// <exception cref="CosmosException">An instance of <see cref="CosmosException"/> representing the error state.</exception>
+        /// <exception cref="Cosmos.CosmosException">An instance of <see cref="Cosmos.CosmosException"/> representing the error state.</exception>
         /// <returns>The current <see cref="ResponseMessage"/>.</returns>
         public virtual ResponseMessage EnsureSuccessStatusCode()
         {
             if (!this.IsSuccessStatusCode)
             {
-                this.EnsureErrorMessage();
-                string message = $"Response status code does not indicate success: {(int)this.StatusCode} Substatus: {(int)this.Headers.SubStatusCode} Reason: ({this.ErrorMessage}).";
-
-                throw new CosmosException(
-                        this,
-                        message,
-                        this.Error);
+                throw CosmosExceptionFactory.Create(this);
             }
 
             return this;
@@ -210,44 +207,5 @@ private void CheckDisposed()
                 throw new ObjectDisposedException(this.GetType().ToString());
             }
         }
-
-        private void EnsureErrorMessage()
-        {
-            if (this.Error != null
-                || !string.IsNullOrEmpty(this.ErrorMessage))
-            {
-                return;
-            }
-
-            if (this.content != null
-                && this.content.CanRead)
-            {
-                try
-                {
-                    Error error = Documents.Resource.LoadFrom<Error>(this.content);
-                    if (error != null)
-                    {
-                        // Error format is not consistent across modes
-                        if (!string.IsNullOrEmpty(error.Message))
-                        {
-                            this.ErrorMessage = error.Message;
-                        }
-                        else
-                        {
-                            this.ErrorMessage = error.ToString();
-                        }
-                    }
-                }
-                catch (Newtonsoft.Json.JsonReaderException)
-                {
-                    // Content is not Json
-                    this.content.Position = 0;
-                    using (StreamReader streamReader = new StreamReader(this.content))
-                    {
-                        this.ErrorMessage = streamReader.ReadToEnd();
-                    }
-                }
-            }
-        }
     }
 }

Microsoft.Azure.Cosmos/src/Query/Core/ExecutionContext/CosmosCrossPartitionQueryExecutionContext.cs

@@ -401,12 +401,7 @@ protected async Task<TryCatch> TryInitializeAsync(
                         if (failureResponse.HasValue)
                         {
                             return TryCatch.FromException(
-                                new CosmosException(
-                                    statusCode: failureResponse.Value.StatusCode,
-                                    subStatusCode: (int)failureResponse.Value.SubStatusCode.GetValueOrDefault(0),
-                                    message: failureResponse.Value.ErrorMessage,
-                                    activityId: failureResponse.Value.ActivityId,
-                                    requestCharge: failureResponse.Value.RequestCharge));
+                                failureResponse.Value.CosmosException);
                         }
 
                         if (!movedToNextPage)

Microsoft.Azure.Cosmos/src/Query/Core/ExecutionContext/ItemProducers/ItemProducer.cs

@@ -14,6 +14,8 @@ namespace Microsoft.Azure.Cosmos.Query.Core.ExecutionContext.ItemProducers
     using Microsoft.Azure.Cosmos.Query.Core.Collections;
     using Microsoft.Azure.Cosmos.Query.Core.Metrics;
     using Microsoft.Azure.Cosmos.Query.Core.QueryClient;
+    using Microsoft.Azure.Cosmos.Resource.CosmosExceptions;
+    using Microsoft.Azure.Documents;
     using PartitionKeyRange = Documents.PartitionKeyRange;
     using PartitionKeyRangeIdentity = Documents.PartitionKeyRangeIdentity;
 
@@ -289,7 +291,7 @@ public async Task BufferMoreDocumentsAsync(CancellationToken token)
                         feedResponse = QueryResponseCore.CreateFailure(
                             statusCode: (System.Net.HttpStatusCode)429,
                             subStatusCodes: null,
-                            errorMessage: "Request Rate Too Large",
+                            cosmosException: new CosmosThrottledException("Request Rate Too Large"),
                             requestCharge: 0,
                             activityId: QueryResponseCore.EmptyGuidString,
                             diagnostics: QueryResponseCore.EmptyDiagnostics);

Microsoft.Azure.Cosmos/src/Query/Core/ExecutionContext/OrderBy/CosmosOrderByItemQueryExecutionContext.cs

@@ -641,12 +641,7 @@ private async Task<TryCatch> TryFilterAsync(
                                 if (failureResponse.HasValue)
                                 {
                                     return TryCatch.FromException(
-                                        new CosmosException(
-                                            statusCode: failureResponse.Value.StatusCode,
-                                            subStatusCode: (int)failureResponse.Value.SubStatusCode.GetValueOrDefault(0),
-                                            message: failureResponse.Value.ErrorMessage,
-                                            activityId: failureResponse.Value.ActivityId,
-                                            requestCharge: 0));
+                                        failureResponse.Value.CosmosException);
                                 }
 
                                 break;

Microsoft.Azure.Cosmos/src/Query/Core/QueryClient/QueryResponseCore.cs

@@ -35,7 +35,7 @@ private QueryResponseCore(
             long responseLengthBytes,
             string disallowContinuationTokenMessage,
             string continuationToken,
-            string errorMessage,
+            CosmosException cosmosException,
             SubStatusCodes? subStatusCode)
         {
             this.IsSuccess = isSuccess;
@@ -47,13 +47,13 @@ private QueryResponseCore(
             this.RequestCharge = requestCharge;
             this.DisallowContinuationTokenMessage = disallowContinuationTokenMessage;
             this.ContinuationToken = continuationToken;
-            this.ErrorMessage = errorMessage;
+            this.CosmosException = cosmosException;
             this.SubStatusCode = subStatusCode;
         }
 
         internal IReadOnlyList<CosmosElement> CosmosElements { get; }
 
-        internal string ErrorMessage { get; }
+        internal CosmosException CosmosException { get; }
 
         internal SubStatusCodes? SubStatusCode { get; }
 
@@ -92,7 +92,7 @@ internal static QueryResponseCore CreateSuccess(
                responseLengthBytes: responseLengthBytes,
                disallowContinuationTokenMessage: disallowContinuationTokenMessage,
                continuationToken: continuationToken,
-               errorMessage: null,
+               cosmosException: null,
                subStatusCode: null);
 
             return cosmosQueryResponse;
@@ -101,7 +101,7 @@ internal static QueryResponseCore CreateSuccess(
         internal static QueryResponseCore CreateFailure(
             HttpStatusCode statusCode,
             SubStatusCodes? subStatusCodes,
-            string errorMessage,
+            CosmosException cosmosException,
             double requestCharge,
             string activityId,
             IReadOnlyCollection<QueryPageDiagnostics> diagnostics)
@@ -116,7 +116,7 @@ internal static QueryResponseCore CreateFailure(
                 responseLengthBytes: 0,
                 disallowContinuationTokenMessage: null,
                 continuationToken: null,
-                errorMessage: errorMessage,
+                cosmosException: cosmosException,
                 subStatusCode: subStatusCodes);
 
             return cosmosQueryResponse;

Microsoft.Azure.Cosmos/src/Query/Core/QueryPlan/QueryPlanRetriever.cs

@@ -9,6 +9,7 @@ namespace Microsoft.Azure.Cosmos.Query.Core.QueryPlan
     using System.Threading.Tasks;
     using Microsoft.Azure.Cosmos.Query.Core.Monads;
     using Microsoft.Azure.Cosmos.Query.Core.QueryClient;
+    using Microsoft.Azure.Cosmos.Resource.CosmosExceptions;
     using OperationType = Documents.OperationType;
     using PartitionKeyDefinition = Documents.PartitionKeyDefinition;
     using ResourceType = Documents.ResourceType;
@@ -62,9 +63,22 @@ public static async Task<PartitionedQueryExecutionInfo> GetQueryPlanWithServiceI
 
             if (!tryGetQueryPlan.Succeeded)
             {
-                throw new CosmosException(
-                    System.Net.HttpStatusCode.BadRequest,
-                    tryGetQueryPlan.Exception.ToString());
+                if (tryGetQueryPlan.Exception is CosmosException)
+                {
+                    throw tryGetQueryPlan.Exception;
+                }
+
+                throw CosmosExceptionFactory.Create(
+                    statusCode: System.Net.HttpStatusCode.BadRequest,
+                    subStatusCode: default,
+                    message: tryGetQueryPlan.Exception.ToString(),
+                    stackTrace: tryGetQueryPlan.Exception.StackTrace,
+                    activityId: default,
+                    requestCharge: default,
+                    retryAfter: default,
+                    headers: default,
+                    diagnosticsContext: default,
+                    innerException: default);
             }
 
             return tryGetQueryPlan.Result;