From 075e0890aeb5d2fb6ac24cf4295f82167b17fe1a Mon Sep 17 00:00:00 2001 From: Tanmay Rustagi Date: Wed, 22 Oct 2025 17:19:49 +0530 Subject: [PATCH 1/7] [Bug Fix] Return error message when body has no length when logging error --- NEXT_CHANGELOG.md | 1 + databricks/sdk/logger/round_trip_logger.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index a359f03d2..aa902ade0 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -6,6 +6,7 @@ ### Bug Fixes - Improving the error message that is shown when the unsupported `dbutils.credentials.getServiceCredentialsProvider` method is used. This method can only be used inside of a notebook. +- Return error message when body has no length when logging error. ### Documentation diff --git a/databricks/sdk/logger/round_trip_logger.py b/databricks/sdk/logger/round_trip_logger.py index 7ff9d55c9..483c55d82 100644 --- a/databricks/sdk/logger/round_trip_logger.py +++ b/databricks/sdk/logger/round_trip_logger.py @@ -111,7 +111,7 @@ def _recursive_marshal(self, v: Any, budget: int) -> Any: def _redacted_dump(self, prefix: str, body: str) -> str: if len(body) == 0: - return "" + return "body has no length" try: # Unmarshal body into primitive types. tmp = json.loads(body) From 6f11310d4e192cecc7f2992c37c05a65c4b79f9c Mon Sep 17 00:00:00 2001 From: Tanmay Rustagi Date: Wed, 22 Oct 2025 17:28:31 +0530 Subject: [PATCH 2/7] - --- databricks/sdk/logger/round_trip_logger.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/databricks/sdk/logger/round_trip_logger.py b/databricks/sdk/logger/round_trip_logger.py index 483c55d82..6766f24ce 100644 --- a/databricks/sdk/logger/round_trip_logger.py +++ b/databricks/sdk/logger/round_trip_logger.py @@ -110,8 +110,11 @@ def _recursive_marshal(self, v: Any, budget: int) -> Any: return v def _redacted_dump(self, prefix: str, body: str) -> str: - if len(body) == 0: - return "body has no length" + try: + if len(body) == 0: + return "body has no length" + except TypeError: + return "unsupported body type" try: # Unmarshal body into primitive types. tmp = json.loads(body) From fe89a7f35caa5b6e50d3658395b72f796e0fab69 Mon Sep 17 00:00:00 2001 From: Tanmay Rustagi Date: Wed, 22 Oct 2025 17:33:42 +0530 Subject: [PATCH 3/7] - --- NEXT_CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index aa902ade0..da13bc51a 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -6,7 +6,7 @@ ### Bug Fixes - Improving the error message that is shown when the unsupported `dbutils.credentials.getServiceCredentialsProvider` method is used. This method can only be used inside of a notebook. -- Return error message when body has no length when logging error. +- Return error message when body doesn't support `len()` while logging error. ### Documentation From 7faa7ee7a55f574f0c1619ec582c2efa6ec36578 Mon Sep 17 00:00:00 2001 From: Tanmay Rustagi Date: Wed, 22 Oct 2025 17:36:53 +0530 Subject: [PATCH 4/7] - --- databricks/sdk/logger/round_trip_logger.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/databricks/sdk/logger/round_trip_logger.py b/databricks/sdk/logger/round_trip_logger.py index 6766f24ce..eb9c98a31 100644 --- a/databricks/sdk/logger/round_trip_logger.py +++ b/databricks/sdk/logger/round_trip_logger.py @@ -112,9 +112,10 @@ def _recursive_marshal(self, v: Any, budget: int) -> Any: def _redacted_dump(self, prefix: str, body: str) -> str: try: if len(body) == 0: - return "body has no length" + return "" except TypeError: return "unsupported body type" + try: # Unmarshal body into primitive types. tmp = json.loads(body) From 0152cfc3f42f2be6efbfaac81a92ef3b30046126 Mon Sep 17 00:00:00 2001 From: Tanmay Rustagi Date: Wed, 22 Oct 2025 17:59:50 +0530 Subject: [PATCH 5/7] comments --- databricks/sdk/logger/round_trip_logger.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/databricks/sdk/logger/round_trip_logger.py b/databricks/sdk/logger/round_trip_logger.py index eb9c98a31..fa829888a 100644 --- a/databricks/sdk/logger/round_trip_logger.py +++ b/databricks/sdk/logger/round_trip_logger.py @@ -110,12 +110,10 @@ def _recursive_marshal(self, v: Any, budget: int) -> Any: return v def _redacted_dump(self, prefix: str, body: str) -> str: - try: - if len(body) == 0: - return "" - except TypeError: + if not isinstance(body, str): return "unsupported body type" - + if len(body) == 0: + return "" try: # Unmarshal body into primitive types. tmp = json.loads(body) From f4b4a32a0a805d4204f842fc75d81839e29de482 Mon Sep 17 00:00:00 2001 From: Tanmay Rustagi Date: Wed, 22 Oct 2025 18:00:54 +0530 Subject: [PATCH 6/7] comments --- databricks/sdk/logger/round_trip_logger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databricks/sdk/logger/round_trip_logger.py b/databricks/sdk/logger/round_trip_logger.py index fa829888a..74c619fd8 100644 --- a/databricks/sdk/logger/round_trip_logger.py +++ b/databricks/sdk/logger/round_trip_logger.py @@ -113,7 +113,7 @@ def _redacted_dump(self, prefix: str, body: str) -> str: if not isinstance(body, str): return "unsupported body type" if len(body) == 0: - return "" + return "" try: # Unmarshal body into primitive types. tmp = json.loads(body) From bcf1897007acafa8cb15d594b94dce4a7db15ea4 Mon Sep 17 00:00:00 2001 From: Tanmay Rustagi Date: Wed, 22 Oct 2025 18:01:51 +0530 Subject: [PATCH 7/7] - --- NEXT_CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index da13bc51a..556f607d1 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -6,7 +6,7 @@ ### Bug Fixes - Improving the error message that is shown when the unsupported `dbutils.credentials.getServiceCredentialsProvider` method is used. This method can only be used inside of a notebook. -- Return error message when body doesn't support `len()` while logging error. +- Check for string body type while logging error message. ### Documentation