From dcf09ab5de8e487c0c3068ff59f2ac942ae4ce9f Mon Sep 17 00:00:00 2001 From: Fabian Meiswinkel Date: Tue, 15 Nov 2022 22:09:10 +0000 Subject: [PATCH 1/2] Suppress error report for CancellationException --- .../directconnectivity/RntbdTransportClient.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/RntbdTransportClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/RntbdTransportClient.java index d139c6a92332..7d5ce678f510 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/RntbdTransportClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/RntbdTransportClient.java @@ -39,6 +39,7 @@ import java.time.Duration; import java.util.Iterator; import java.util.Locale; +import java.util.concurrent.CancellationException; import java.util.concurrent.CompletionException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; @@ -259,11 +260,13 @@ public Mono invokeStoreAsync(final Uri addressUri, final RxDocume String unexpectedError = RntbdObjectMapper.toJson(error); - reportIssue(logger, endpoint, - "request completed with an unexpected {}: \\{\"record\":{},\"error\":{}}", - error.getClass(), - record, - unexpectedError); + if (!(error instanceof CancellationException)) { + reportIssue(logger, endpoint, + "request completed with an unexpected {}: \\{\"record\":{},\"error\":{}}", + error.getClass(), + record, + unexpectedError); + } error = new GoneException( lenientFormat("an unexpected %s occurred: %s", unexpectedError), From 325a379337da567a127b1b4ff31d62979552637c Mon Sep 17 00:00:00 2001 From: Fabian Meiswinkel Date: Tue, 15 Nov 2022 22:35:28 +0000 Subject: [PATCH 2/2] Added changelos --- sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md | 1 + sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md | 1 + sdk/cosmos/azure-cosmos-spark_3-3_2-12/CHANGELOG.md | 2 ++ sdk/cosmos/azure-cosmos/CHANGELOG.md | 1 + 4 files changed, 5 insertions(+) diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md index 2c5aeca2f256..2237e2b8fd80 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md @@ -10,6 +10,7 @@ #### Other Changes * Fixed shading instructions to correct dependency issues in Azure Synapse with version 4.14.0 and 4.14.1. - See [PR 31980](https://github.com/Azure/azure-sdk-for-java/pull/31980) +* Reduced the logging noise level on CancellationExceptions from `RntbdReporter.reportIssue`. - See [PR 32175](https://github.com/Azure/azure-sdk-for-java/pull/32175) ### 4.14.1 (2022-10-07) > [!IMPORTANT] diff --git a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md index 0320b18e3434..5a9f958133ff 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md @@ -10,6 +10,7 @@ #### Other Changes * Fixed shading instructions to correct dependency issues in Azure Synapse with version 4.14.0 and 4.14.1. - See [PR 31980](https://github.com/Azure/azure-sdk-for-java/pull/31980) +* Reduced the logging noise level on CancellationExceptions from `RntbdReporter.reportIssue`. - See [PR 32175](https://github.com/Azure/azure-sdk-for-java/pull/32175) ### 4.14.1 (2022-10-07) > [!IMPORTANT] diff --git a/sdk/cosmos/azure-cosmos-spark_3-3_2-12/CHANGELOG.md b/sdk/cosmos/azure-cosmos-spark_3-3_2-12/CHANGELOG.md index 592534ff3903..c26541f60906 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-3_2-12/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos-spark_3-3_2-12/CHANGELOG.md @@ -10,5 +10,7 @@ Spark 3.3 support: - See [PR 31666](https://github.com/Azure/azure-sdk-for-java/ #### Bugs Fixed #### Other Changes +* Fixed shading instructions to correct dependency issues in Azure Synapse with version 4.14.0 and 4.14.1. - See [PR 31980](https://github.com/Azure/azure-sdk-for-java/pull/31980) +* Reduced the logging noise level on CancellationExceptions from `RntbdReporter.reportIssue`. - See [PR 32175](https://github.com/Azure/azure-sdk-for-java/pull/32175) ### NOTE: See CHANGELOG.md in 3.1 and 3.2 projects for changes prior to 4.15.0 \ No newline at end of file diff --git a/sdk/cosmos/azure-cosmos/CHANGELOG.md b/sdk/cosmos/azure-cosmos/CHANGELOG.md index 10efb0c3d469..6152544694aa 100644 --- a/sdk/cosmos/azure-cosmos/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos/CHANGELOG.md @@ -15,6 +15,7 @@ #### Other Changes * Shaded `MurmurHash3` of apache `commons-codec` to enable removing of the `guava` dependency - CVE-2020-8908 - See [PR 31761](https://github.com/Azure/azure-sdk-for-java/pull/31761) * Updated test dependency of `testng` to version 7.5 - See [PR 31761](https://github.com/Azure/azure-sdk-for-java/pull/31761) +* Reduced the logging noise level on CancellationExceptions from `RntbdReporter.reportIssue`. - See [PR 32175](https://github.com/Azure/azure-sdk-for-java/pull/32175) ### 4.38.1 (2022-10-21) #### Other Changes