diff --git a/Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj b/Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj
index ffc350141f..a9d6be5f76 100644
--- a/Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj
+++ b/Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj
@@ -59,11 +59,9 @@
-
-
-
+
diff --git a/Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj b/Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj
index 65bc009f36..be4c854f0b 100644
--- a/Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj
+++ b/Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj
@@ -54,11 +54,9 @@
-
-
-
+
diff --git a/Microsoft.Azure.Cosmos/FaultInjection/src/FaultInjection.csproj b/Microsoft.Azure.Cosmos/FaultInjection/src/FaultInjection.csproj
index f917de0a76..e2c985fbdc 100644
--- a/Microsoft.Azure.Cosmos/FaultInjection/src/FaultInjection.csproj
+++ b/Microsoft.Azure.Cosmos/FaultInjection/src/FaultInjection.csproj
@@ -67,11 +67,6 @@
-
-
-
-
-
true
true
diff --git a/Microsoft.Azure.Cosmos/src/Authorization/TokenCredentialCache.cs b/Microsoft.Azure.Cosmos/src/Authorization/TokenCredentialCache.cs
index ca4eeeb5ed..588a2814db 100644
--- a/Microsoft.Azure.Cosmos/src/Authorization/TokenCredentialCache.cs
+++ b/Microsoft.Azure.Cosmos/src/Authorization/TokenCredentialCache.cs
@@ -219,9 +219,9 @@ private async ValueTask RefreshCachedTokenWithRetryHelperAsync(
lastException = requestFailedException;
getTokenTrace.AddDatum(
$"RequestFailedException at {DateTime.UtcNow.ToString(CultureInfo.InvariantCulture)}",
- requestFailedException);
+ requestFailedException.Message);
- DefaultTrace.TraceError($"TokenCredential.GetToken() failed with RequestFailedException. scope = {string.Join(";", this.tokenRequestContext.Scopes)}, retry = {retry}, Exception = {lastException}");
+ DefaultTrace.TraceError($"TokenCredential.GetToken() failed with RequestFailedException. scope = {string.Join(";", this.tokenRequestContext.Scopes)}, retry = {retry}, Exception = {lastException.Message}");
// Don't retry on auth failures
if (requestFailedException.Status == (int)HttpStatusCode.Unauthorized ||
@@ -236,10 +236,10 @@ private async ValueTask RefreshCachedTokenWithRetryHelperAsync(
lastException = operationCancelled;
getTokenTrace.AddDatum(
$"OperationCanceledException at {DateTime.UtcNow.ToString(CultureInfo.InvariantCulture)}",
- operationCancelled);
+ operationCancelled.Message);
DefaultTrace.TraceError(
- $"TokenCredential.GetTokenAsync() failed. scope = {string.Join(";", this.tokenRequestContext.Scopes)}, retry = {retry}, Exception = {lastException}");
+ $"TokenCredential.GetTokenAsync() failed. scope = {string.Join(";", this.tokenRequestContext.Scopes)}, retry = {retry}, Exception = {lastException.Message}");
throw CosmosExceptionFactory.CreateRequestTimeoutException(
message: ClientResources.FailedToGetAadToken,
@@ -255,10 +255,10 @@ private async ValueTask RefreshCachedTokenWithRetryHelperAsync(
lastException = exception;
getTokenTrace.AddDatum(
$"Exception at {DateTime.UtcNow.ToString(CultureInfo.InvariantCulture)}",
- exception);
+ exception.Message);
DefaultTrace.TraceError(
- $"TokenCredential.GetTokenAsync() failed. scope = {string.Join(";", this.tokenRequestContext.Scopes)}, retry = {retry}, Exception = {lastException}");
+ $"TokenCredential.GetTokenAsync() failed. scope = {string.Join(";", this.tokenRequestContext.Scopes)}, retry = {retry}, Exception = {lastException.Message}");
}
}
}
@@ -339,7 +339,7 @@ private async void StartBackgroundTokenRefreshLoop()
DefaultTrace.TraceWarning(
"BackgroundTokenRefreshLoop() - Unable to refresh token credential cache. Exception: {0}",
- ex.ToString());
+ ex.Message);
// Since it failed retry again in with half the token life span again.
if (!this.userDefinedBackgroundTokenCredentialRefreshInterval.HasValue && this.cachedAccessToken.HasValue)
diff --git a/Microsoft.Azure.Cosmos/src/DocumentClient.cs b/Microsoft.Azure.Cosmos/src/DocumentClient.cs
index 36f2a2dcff..00fb2228c1 100644
--- a/Microsoft.Azure.Cosmos/src/DocumentClient.cs
+++ b/Microsoft.Azure.Cosmos/src/DocumentClient.cs
@@ -687,7 +687,7 @@ private async Task OpenPrivateAsync(CancellationToken cancellationToken)
enableAsyncCacheExceptionNoSharing: this.enableAsyncCacheExceptionNoSharing);
this.partitionKeyRangeCache = new PartitionKeyRangeCache(this, this.GatewayStoreModel, this.collectionCache, this.GlobalEndpointManager, this.enableAsyncCacheExceptionNoSharing);
- DefaultTrace.TraceWarning("{0} occurred while OpenAsync. Exception Message: {1}", ex.ToString(), ex.Message);
+ DefaultTrace.TraceWarning("Exception occurred while OpenAsync. Exception Message: {0}", ex.Message);
}
}
@@ -1030,7 +1030,9 @@ internal virtual void Initialize(Uri serviceEndpoint,
// UnobservedTaskException by using ContinueWith method w/ TaskContinuationOptions.OnlyOnFaulted
// and accessing the Exception property on the target task.
#pragma warning disable VSTHRD110 // Observe result of async calls
+#pragma warning disable CDX1000 // DontConvertExceptionToObject
initTask.ContinueWith(t => DefaultTrace.TraceWarning("initializeTask failed {0}", t.Exception), TaskContinuationOptions.OnlyOnFaulted);
+#pragma warning restore CDX1000 // DontConvertExceptionToObject
#pragma warning restore VSTHRD110 // Observe result of async calls
this.traceId = Interlocked.Increment(ref DocumentClient.idCounter);
@@ -1355,7 +1357,7 @@ public void Dispose()
catch (Exception exception)
{
DefaultTrace.TraceWarning("Exception {0} thrown during dispose of HttpClient, this could happen if there are inflight request during the dispose of client",
- exception);
+ exception.Message);
}
this.httpClient = null;
@@ -1623,8 +1625,8 @@ internal virtual async Task EnsureValidClientAsync(ITrace trace)
}
catch (Exception e)
{
- DefaultTrace.TraceWarning("EnsureValidClientAsync initializeTask failed {0}", e);
- childTrace.AddDatum("initializeTask failed", e);
+ DefaultTrace.TraceWarning("EnsureValidClientAsync initializeTask failed {0}", e.Message);
+ childTrace.AddDatum("initializeTask failed", e.Message);
throw;
}
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetry.cs b/Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetry.cs
index a56bc1b0b2..1c4b780fbe 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetry.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetry.cs
@@ -200,7 +200,7 @@ ConcurrentDictionary cacheRefreshInfo
}
catch (Exception ex)
{
- DefaultTrace.TraceError("Exception in EnrichAndSendAsync() : {0}", ex);
+ DefaultTrace.TraceError("Exception in EnrichAndSendAsync() : {0}", ex.Message);
}
DefaultTrace.TraceInformation("Telemetry Job Stopped.");
@@ -275,7 +275,7 @@ internal void PushCacheDatapoint(string cacheName, TelemetryInformation data)
}
catch (Exception ex)
{
- DefaultTrace.TraceError("Latency Recording Failed by Telemetry. Exception : {0}", ex);
+ DefaultTrace.TraceError("Latency Recording Failed by Telemetry. Exception : {0}", ex.Message);
}
}
@@ -316,7 +316,7 @@ internal void PushOperationDatapoint(TelemetryInformation data)
}
catch (Exception ex)
{
- DefaultTrace.TraceError("Latency Recording Failed by Telemetry. Exception : {0}", ex);
+ DefaultTrace.TraceError("Latency Recording Failed by Telemetry. Exception : {0}", ex.Message);
}
}
@@ -332,7 +332,7 @@ internal void PushOperationDatapoint(TelemetryInformation data)
}
catch (Exception ex)
{
- DefaultTrace.TraceError("Request Charge Recording Failed by Telemetry. Request Charge Value : {0} Exception : {1} ", requestChargeToRecord, ex);
+ DefaultTrace.TraceError("Request Charge Recording Failed by Telemetry. Request Charge Value : {0} Exception : {1} ", requestChargeToRecord, ex.Message);
}
}
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetryHelper.cs b/Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetryHelper.cs
index 2399bcb9fb..7b852703a0 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetryHelper.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetryHelper.cs
@@ -99,7 +99,7 @@ internal static List RecordSystemUtilization(DiagnosticsHandlerHelpe
}
catch (Exception ex)
{
- DefaultTrace.TraceError("System Usage Recording Error : {0} ", ex);
+ DefaultTrace.TraceError("System Usage Recording Error : {0} ", ex.Message);
}
return null;
}
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetryProcessor.cs b/Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetryProcessor.cs
index fbbfb68c45..48ebe68e36 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetryProcessor.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetryProcessor.cs
@@ -51,7 +51,7 @@ await ClientTelemetryPayloadWriter.SerializedPayloadChunksAsync(
}
catch (Exception ex)
{
- DefaultTrace.TraceError("Exception while serializing telemetry payload or sending data to service: {0}", ex);
+ DefaultTrace.TraceError("Exception while serializing telemetry payload or sending data to service: {0}", ex.Message);
}
}
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/Collector/TelemetryCollector.cs b/Microsoft.Azure.Cosmos/src/Telemetry/Collector/TelemetryCollector.cs
index 9f2161469a..4d81ea3f50 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/Collector/TelemetryCollector.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/Collector/TelemetryCollector.cs
@@ -44,7 +44,7 @@ public void CollectCacheInfo(string cacheName, Func functi
}
catch (Exception ex)
{
- DefaultTrace.TraceError("Error while collecting cache {0} telemetry. Exception : {1}", cacheName, ex);
+ DefaultTrace.TraceError("Error while collecting cache {0} telemetry. Exception : {1}", cacheName, ex.Message);
}
}
@@ -65,7 +65,7 @@ public void CollectOperationAndNetworkInfo(Func functionFo
}
catch (Exception ex)
{
- DefaultTrace.TraceError("Error while collecting operation telemetry. Exception : {0}", ex);
+ DefaultTrace.TraceError("Error while collecting operation telemetry. Exception : {0}", ex.Message);
}
}
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/AppInsightClassicAttributeKeys.cs b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/AppInsightClassicAttributeKeys.cs
index 942ece28db..dc1251169f 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/AppInsightClassicAttributeKeys.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/AppInsightClassicAttributeKeys.cs
@@ -140,7 +140,9 @@ public void PopulateAttributes(DiagnosticScope scope,
public void PopulateAttributes(DiagnosticScope scope, Exception exception)
{
+#pragma warning disable CDX1002 // DontUseExceptionStackTrace
scope.AddAttribute(AppInsightClassicAttributeKeys.ExceptionStacktrace, exception.StackTrace);
+#pragma warning restore CDX1002 // DontUseExceptionStackTrace
scope.AddAttribute(AppInsightClassicAttributeKeys.ExceptionType, exception.GetType().Name);
// If Exception is not registered with open Telemetry
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/CosmosDbMeterUtil.cs b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/CosmosDbMeterUtil.cs
index 920f7f3d90..a5cd04c853 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/CosmosDbMeterUtil.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/CosmosDbMeterUtil.cs
@@ -35,7 +35,7 @@ internal static void RecordHistogramMetric(
}
catch (Exception ex)
{
- DefaultTrace.TraceWarning($"Failed to record metric. {ex}");
+ DefaultTrace.TraceWarning($"Failed to record metric. {ex.Message}");
}
}
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/CosmosDbOperationMeter.cs b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/CosmosDbOperationMeter.cs
index 2f214f5246..7f0063cd7f 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/CosmosDbOperationMeter.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/CosmosDbOperationMeter.cs
@@ -144,7 +144,7 @@ internal static void AdjustInstanceCount(Uri accountEndpoint, int adjustment)
}
catch (Exception ex)
{
- DefaultTrace.TraceWarning($"Failed to adjust instance count. {ex.StackTrace}");
+ DefaultTrace.TraceWarning($"Failed to adjust instance count. {ex.Message}");
}
}
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryAttributeKeys.cs b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryAttributeKeys.cs
index d315f03577..e0db3e9c1f 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryAttributeKeys.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryAttributeKeys.cs
@@ -225,7 +225,9 @@ public void PopulateAttributes(DiagnosticScope scope,
public void PopulateAttributes(DiagnosticScope scope, Exception exception)
{
+#pragma warning disable CDX1002 // DontUseExceptionStackTrace
scope.AddAttribute(OpenTelemetryAttributeKeys.ExceptionStacktrace, exception.StackTrace);
+#pragma warning restore CDX1002 // DontUseExceptionStackTrace
scope.AddAttribute(OpenTelemetryAttributeKeys.ExceptionType, exception.GetType().Name);
// If Exception is not registered with open Telemetry
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryResponse.cs b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryResponse.cs
index e22c836a51..d74a5462cf 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryResponse.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryResponse.cs
@@ -92,7 +92,7 @@ private static Headers GetHeader(TransactionalBatchResponse responseMessage)
}
catch (NotImplementedException ex)
{
- DefaultTrace.TraceVerbose("Failed to get headers from TransactionalBatchResponse. Exception: {0}", ex);
+ DefaultTrace.TraceVerbose("Failed to get headers from TransactionalBatchResponse. Exception: {0}", ex.Message);
return null;
}
}
@@ -105,7 +105,7 @@ private static Headers GetHeader(ResponseMessage responseMessage)
}
catch (NotImplementedException ex)
{
- DefaultTrace.TraceVerbose("Failed to get headers from ResponseMessage. Exception: {0}", ex);
+ DefaultTrace.TraceVerbose("Failed to get headers from ResponseMessage. Exception: {0}", ex.Message);
return null;
}
}
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryResponse{T}.cs b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryResponse{T}.cs
index a6f3e73380..45ab965bf3 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryResponse{T}.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryResponse{T}.cs
@@ -74,7 +74,7 @@ private static Headers GetHeader(FeedResponse responseMessage)
}
catch (NotImplementedException ex)
{
- DefaultTrace.TraceWarning("Failed to get headers from FeedResponse. Exception: {0}", ex);
+ DefaultTrace.TraceWarning("Failed to get headers from FeedResponse. Exception: {0}", ex.Message);
return null;
}
}
@@ -87,7 +87,7 @@ private static Headers GetHeader(Response responseMessage)
}
catch (NotImplementedException ex)
{
- DefaultTrace.TraceWarning("Failed to get headers from Response. Exception: {0}", ex);
+ DefaultTrace.TraceWarning("Failed to get headers from Response. Exception: {0}", ex.Message);
return null;
}
}
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/TelemetryToServiceHelper.cs b/Microsoft.Azure.Cosmos/src/Telemetry/TelemetryToServiceHelper.cs
index 13092d9d59..421e3006fb 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/TelemetryToServiceHelper.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/TelemetryToServiceHelper.cs
@@ -115,7 +115,7 @@ private async Task RetrieveConfigAndInitiateTelemetryAsync(bool faultInjectionCl
}
else if (!this.cancellationTokenSource.IsCancellationRequested)
{
- DefaultTrace.TraceWarning("Exception while calling client config {0} ", databaseAccountClientConfigs.Exception);
+ DefaultTrace.TraceWarning("Exception while calling client config {0} ", databaseAccountClientConfigs.Exception?.Message);
}
await Task.Delay(
@@ -125,7 +125,7 @@ await Task.Delay(
}
catch (Exception ex)
{
- DefaultTrace.TraceWarning("Exception while running client config job: {0}", ex);
+ DefaultTrace.TraceWarning("Exception while running client config job: {0}", ex.Message);
}
}
@@ -267,7 +267,7 @@ private void InitializeClientTelemetry(AccountClientConfiguration clientConfig)
}
catch (Exception ex)
{
- DefaultTrace.TraceWarning($"Error While starting Telemetry Job : {0}. Hence disabling Client Telemetry", ex);
+ DefaultTrace.TraceWarning($"Error While starting Telemetry Job : {0}. Hence disabling Client Telemetry", ex.Message);
this.connectionPolicy.CosmosClientTelemetryOptions.DisableSendingMetricsToService = true;
}
}
@@ -300,7 +300,7 @@ private void StopClientTelemetry()
}
catch (Exception ex)
{
- DefaultTrace.TraceWarning("Error While stopping Telemetry Job : {0}", ex);
+ DefaultTrace.TraceWarning("Error While stopping Telemetry Job : {0}", ex.Message);
}
}
}
diff --git a/Microsoft.Azure.Cosmos/src/ThinClientStoreModel.cs b/Microsoft.Azure.Cosmos/src/ThinClientStoreModel.cs
index 53a9ee77e8..b8ae6d4c3e 100644
--- a/Microsoft.Azure.Cosmos/src/ThinClientStoreModel.cs
+++ b/Microsoft.Azure.Cosmos/src/ThinClientStoreModel.cs
@@ -132,7 +132,7 @@ protected override void Dispose(bool disposing)
catch (Exception exception)
{
DefaultTrace.TraceWarning("Exception {0} thrown during dispose of HttpClient, this could happen if there are inflight request during the dispose of client",
- exception);
+ exception.Message);
}
this.thinClientStoreClient = null;
}
diff --git a/Microsoft.Azure.Cosmos/src/Util/Extensions.cs b/Microsoft.Azure.Cosmos/src/Util/Extensions.cs
index aaeaaecba7..244fb0d8a1 100644
--- a/Microsoft.Azure.Cosmos/src/Util/Extensions.cs
+++ b/Microsoft.Azure.Cosmos/src/Util/Extensions.cs
@@ -138,7 +138,7 @@ internal static ResponseMessage ToCosmosResponseMessage(this DocumentClientExcep
subStatusCode: cosmosException.Headers.SubStatusCode,
responseTimeUtc: DateTime.UtcNow,
requestCharge: cosmosException.Headers.RequestCharge,
- errorMessage: documentClientException.ToString(),
+ errorMessage: documentClientException?.Message,
method: requestMessage?.Method,
requestUri: requestMessage?.RequestUriString,
requestSessionToken: requestMessage?.Headers?.Session,
@@ -160,7 +160,9 @@ internal static ResponseMessage ToCosmosResponseMessage(this DocumentClientExcep
if (requestMessage != null)
{
requestMessage.Properties.Remove(nameof(DocumentClientException));
+#pragma warning disable CDX1000 // DontConvertExceptionToObject
requestMessage.Properties.Add(nameof(DocumentClientException), documentClientException);
+#pragma warning restore CDX1000 // DontConvertExceptionToObject
}
return responseMessage;
@@ -202,21 +204,19 @@ private static void TraceExceptionInternal(Exception exception)
if (exception is SocketException socketException)
{
DefaultTrace.TraceWarning(
- "Exception {0}: RequesteUri: {1}, SocketErrorCode: {2}, {3}, {4}",
+ "Exception {0}: RequesteUri: {1}, SocketErrorCode: {2}, {3}",
exception.GetType(),
requestUri,
socketException.SocketErrorCode,
- exception.Message,
- exception.StackTrace);
+ exception.Message);
}
else
{
DefaultTrace.TraceWarning(
- "Exception {0}: RequestUri: {1}, {2}, {3}",
+ "Exception {0}: RequestUri: {1}, {2}",
exception.GetType(),
requestUri,
- exception.Message,
- exception.StackTrace);
+ exception.Message);
}
exception = exception.InnerException;
diff --git a/Microsoft.Azure.Cosmos/src/WebExceptionRetryPolicy.cs b/Microsoft.Azure.Cosmos/src/WebExceptionRetryPolicy.cs
index be02f3391f..1c65c9310d 100644
--- a/Microsoft.Azure.Cosmos/src/WebExceptionRetryPolicy.cs
+++ b/Microsoft.Azure.Cosmos/src/WebExceptionRetryPolicy.cs
@@ -56,7 +56,7 @@ public Task ShouldRetryAsync(
this.currentBackoffSeconds *= WebExceptionRetryPolicy.backoffMultiplier;
}
- DefaultTrace.TraceWarning("Received retriable web exception, will retry, {0}", exception);
+ DefaultTrace.TraceWarning("Received retriable web exception, will retry, {0}", exception.Message);
return Task.FromResult(ShouldRetryResult.RetryAfter(backoffTime));
}
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/TransportWrapperTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/TransportWrapperTests.cs
index 9e7394bf21..a5c61a66bc 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/TransportWrapperTests.cs
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/TransportWrapperTests.cs
@@ -92,7 +92,7 @@ private void ValidateTransportException(CosmosException cosmosException)
Assert.IsTrue(message.Contains("TransportException: A client transport error occurred: The connection failed"), "StoreResult Exception is missing");
string diagnostics = cosmosException.Diagnostics.ToString();
Assert.IsNotNull(diagnostics);
- Assert.IsTrue(diagnostics.Contains("TransportException: A client transport error occurred: The connection failed"));
+ Assert.IsTrue(diagnostics.Contains("A client transport error occurred: The connection failed"));
}
private void ValidateTransportException(ResponseMessage responseMessage)
@@ -104,7 +104,7 @@ private void ValidateTransportException(ResponseMessage responseMessage)
Assert.IsTrue(message.Contains("Reason: (Channel is closed"), "Should contain exception message");
string diagnostics = responseMessage.Diagnostics.ToString();
Assert.IsNotNull(diagnostics);
- Assert.IsTrue(diagnostics.Contains("TransportException: A client transport error occurred: The connection failed"));
+ Assert.IsTrue(diagnostics.Contains("A client transport error occurred: The connection failed"));
}
private static void Interceptor(