Skip to content

Commit 34b1600

Browse files
committed
removed dup import, renamed func, changed a filter_null_values to lamda
Signed-off-by: Sai Shree Pradhan <saishree.pradhan@databricks.com>
1 parent 997af26 commit 34b1600

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

src/databricks/sql/telemetry/telemetry_client.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class TelemetryHelper:
3737
_DRIVER_SYSTEM_CONFIGURATION = None
3838

3939
@classmethod
40-
def getDriverSystemConfiguration(cls) -> DriverSystemConfiguration:
40+
def get_driver_system_configuration(cls) -> DriverSystemConfiguration:
4141
if cls._DRIVER_SYSTEM_CONFIGURATION is None:
4242
from databricks.sql import __version__
4343

@@ -259,7 +259,7 @@ def export_initial_telemetry_log(self, driver_connection_params, user_agent):
259259
entry=FrontendLogEntry(
260260
sql_driver_log=TelemetryEvent(
261261
session_id=self._connection_uuid,
262-
system_configuration=TelemetryHelper.getDriverSystemConfiguration(),
262+
system_configuration=TelemetryHelper.get_driver_system_configuration(),
263263
driver_connection_params=self._driver_connection_params,
264264
)
265265
),
@@ -286,7 +286,7 @@ def export_failure_log(self, error_name, error_message):
286286
entry=FrontendLogEntry(
287287
sql_driver_log=TelemetryEvent(
288288
session_id=self._connection_uuid,
289-
system_configuration=TelemetryHelper.getDriverSystemConfiguration(),
289+
system_configuration=TelemetryHelper.get_driver_system_configuration(),
290290
driver_connection_params=self._driver_connection_params,
291291
error_info=error_info,
292292
)
@@ -340,8 +340,6 @@ def _initialize(cls):
340340
def _install_exception_hook(cls):
341341
"""Install global exception handler for unhandled exceptions"""
342342
if not cls._excepthook_installed:
343-
import sys
344-
345343
cls._original_excepthook = sys.excepthook
346344
sys.excepthook = cls._handle_unhandled_exception
347345
cls._excepthook_installed = True

src/databricks/sql/telemetry/utils.py

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,14 @@ def default(self, obj):
1616
return super().default(obj)
1717

1818

19-
def filter_none_values(data):
20-
"""
21-
Recursively remove None values from dictionaries.
22-
This reduces telemetry payload size by excluding null fields.
23-
"""
24-
if isinstance(data, dict):
25-
return {k: filter_none_values(v) for k, v in data.items() if v is not None}
26-
else:
27-
return data
28-
29-
3019
def to_json_compact(dataclass_obj):
3120
"""
3221
Convert a dataclass to JSON string, excluding None values.
3322
"""
34-
data_dict = asdict(dataclass_obj)
35-
filtered_dict = filter_none_values(data_dict)
36-
return json.dumps(filtered_dict, cls=EnumEncoder)
23+
return json.dumps(
24+
asdict(
25+
dataclass_obj,
26+
dict_factory=lambda data: {k: v for k, v in data if v is not None},
27+
),
28+
cls=EnumEncoder,
29+
)

tests/unit/test_telemetry.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class TestTelemetryClient:
9898
"""Tests for the TelemetryClient class."""
9999

100100
@patch("databricks.sql.telemetry.telemetry_client.TelemetryFrontendLog")
101-
@patch("databricks.sql.telemetry.telemetry_client.TelemetryHelper.getDriverSystemConfiguration")
101+
@patch("databricks.sql.telemetry.telemetry_client.TelemetryHelper.get_driver_system_configuration")
102102
@patch("databricks.sql.telemetry.telemetry_client.uuid.uuid4")
103103
@patch("databricks.sql.telemetry.telemetry_client.time.time")
104104
def test_export_initial_telemetry_log(
@@ -134,7 +134,7 @@ def test_export_initial_telemetry_log(
134134
client.export_event.assert_called_once_with(mock_frontend_log.return_value)
135135

136136
@patch("databricks.sql.telemetry.telemetry_client.TelemetryFrontendLog")
137-
@patch("databricks.sql.telemetry.telemetry_client.TelemetryHelper.getDriverSystemConfiguration")
137+
@patch("databricks.sql.telemetry.telemetry_client.TelemetryHelper.get_driver_system_configuration")
138138
@patch("databricks.sql.telemetry.telemetry_client.DriverErrorInfo")
139139
@patch("databricks.sql.telemetry.telemetry_client.uuid.uuid4")
140140
@patch("databricks.sql.telemetry.telemetry_client.time.time")

0 commit comments

Comments
 (0)