Skip to content

Commit f6f50b2

Browse files
committed
formatting
Signed-off-by: Sai Shree Pradhan <saishree.pradhan@databricks.com>
1 parent 0fd46d4 commit f6f50b2

File tree

4 files changed

+30
-22
lines changed

4 files changed

+30
-22
lines changed

src/databricks/sql/client.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1650,4 +1650,3 @@ def map_col_type(type_):
16501650
(column.name, map_col_type(column.datatype), None, None, None, None, None)
16511651
for column in table_schema_message.columns
16521652
]
1653-

src/databricks/sql/telemetry/latency_logger.py

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,27 @@
1313
class TelemetryExtractor:
1414
def __init__(self, obj):
1515
self._obj = obj
16-
16+
1717
def __getattr__(self, name):
1818
return getattr(self._obj, name)
19-
20-
def get_session_id_hex(self): pass
21-
def get_statement_id(self): pass
22-
def get_statement_type(self): pass
23-
def get_is_compressed(self): pass
24-
def get_execution_result(self): pass
25-
def get_retry_count(self): pass
19+
20+
def get_session_id_hex(self):
21+
pass
22+
23+
def get_statement_id(self):
24+
pass
25+
26+
def get_statement_type(self):
27+
pass
28+
29+
def get_is_compressed(self):
30+
pass
31+
32+
def get_execution_result(self):
33+
pass
34+
35+
def get_retry_count(self):
36+
pass
2637

2738

2839
class CursorExtractor(TelemetryExtractor):
@@ -58,8 +69,8 @@ def get_retry_count(self) -> int:
5869
def get_statement_type(self: str) -> StatementType:
5970
# TODO: Implement this
6071
return StatementType.SQL
61-
62-
72+
73+
6374
class ResultSetExtractor(TelemetryExtractor):
6475
def get_statement_id(self) -> Optional[str]:
6576
if self.command_id:
@@ -95,9 +106,9 @@ def get_retry_count(self) -> int:
95106

96107

97108
def get_extractor(obj):
98-
if obj.__class__.__name__ == 'Cursor':
109+
if obj.__class__.__name__ == "Cursor":
99110
return CursorExtractor(obj)
100-
elif obj.__class__.__name__ == 'ResultSet':
111+
elif obj.__class__.__name__ == "ResultSet":
101112
return ResultSetExtractor(obj)
102113
else:
103114
return TelemetryExtractor(obj)

src/databricks/sql/telemetry/telemetry_client.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,7 @@ def export_initial_telemetry_log(self, driver_connection_params, user_agent):
140140
def export_failure_log(self, error_name, error_message):
141141
pass
142142

143-
def export_latency_log(
144-
self, latency_ms, sql_execution_event, sql_statement_id=None
145-
):
143+
def export_latency_log(self, latency_ms, sql_execution_event, sql_statement_id):
146144
pass
147145

148146
def close(self):
@@ -158,7 +156,6 @@ class TelemetryClient(BaseTelemetryClient):
158156
# Telemetry endpoint paths
159157
TELEMETRY_AUTHENTICATED_PATH = "/telemetry-ext"
160158
TELEMETRY_UNAUTHENTICATED_PATH = "/telemetry-unauth"
161-
DEFAULT_BATCH_SIZE = 10
162159

163160
def __init__(
164161
self,
@@ -170,7 +167,7 @@ def __init__(
170167
):
171168
logger.debug("Initializing TelemetryClient for connection: %s", session_id_hex)
172169
self._telemetry_enabled = telemetry_enabled
173-
self._batch_size = self.DEFAULT_BATCH_SIZE # TODO: Decide on batch size
170+
self._batch_size = 10 # TODO: Decide on batch size
174171
self._session_id_hex = session_id_hex
175172
self._auth_provider = auth_provider
176173
self._user_agent = None

tests/unit/test_telemetry.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,16 +229,17 @@ def test_export_event(self, telemetry_client_setup):
229229
client = telemetry_client_setup["client"]
230230
client._flush = MagicMock()
231231

232-
for i in range(TelemetryClient.DEFAULT_BATCH_SIZE-1):
232+
for i in range(5):
233233
client._export_event(f"event-{i}")
234234

235235
client._flush.assert_not_called()
236-
assert len(client._events_batch) == TelemetryClient.DEFAULT_BATCH_SIZE - 1
236+
assert len(client._events_batch) == 5
237237

238-
# Add one more event to reach batch size (this will trigger flush)
239-
client._export_event(f"event-{TelemetryClient.DEFAULT_BATCH_SIZE - 1}")
238+
for i in range(5):
239+
client._export_event(f"event-{i}")
240240

241241
client._flush.assert_called_once()
242+
assert len(client._events_batch) == 10
242243

243244
@patch("requests.post")
244245
def test_send_telemetry_authenticated(self, mock_post, telemetry_client_setup):

0 commit comments

Comments
 (0)