small fixes

Signed-off-by: Sai Shree Pradhan <[email protected]>

Author: saishreeeee

src/databricks/sql/telemetry/telemetry_client.py

@@ -429,7 +429,7 @@ def close(session_id_hex):
                 )
                 try:
                     TelemetryClientFactory._executor.shutdown(wait=True)
-                    TelemetryHttpClient.get_instance().close()
+                    TelemetryHttpClient.close()
                 except Exception as e:
                     logger.debug("Failed to shutdown thread pool executor: %s", e)
                 TelemetryClientFactory._executor = None

tests/e2e/test_telemetry_retry.py

@@ -61,7 +61,7 @@ def get_client(self, session_id, num_retries=3):
         )
         adapter = client._http_client.session.adapters.get("https://")
         adapter.max_retries = retry_policy
-        return client, adapter
+        return client
 
     @pytest.mark.parametrize(
     "status_code, description",
@@ -77,7 +77,7 @@ def test_non_retryable_status_codes_are_not_retried(self, status_code, descripti
         Verifies that terminal error codes (401, 403, 501) and success codes (200) are not retried.
         """
         # Use the status code in the session ID for easier debugging if it fails
-        client, _ = self.get_client(f"session-{status_code}")
+        client = self.get_client(f"session-{status_code}")
         mock_responses = [{"status": status_code}]
 
         with patch(PATCH_TARGET, return_value=create_mock_conn(mock_responses)) as mock_get_conn:
@@ -94,7 +94,7 @@ def test_exceeds_retry_count_limit(self):
         num_retries = 3
         expected_total_calls = num_retries + 1 
         retry_after = 1
-        client, _ = self.get_client("session-exceed-limit", num_retries=num_retries)
+        client = self.get_client("session-exceed-limit", num_retries=num_retries)
         mock_responses = [{"status": 503, "headers": {"Retry-After": str(retry_after)}}, {"status": 429}, {"status": 502}, {"status": 503}]
 
         with patch(PATCH_TARGET, return_value=create_mock_conn(mock_responses)) as mock_get_conn: