Skip to content

Commit 4d49b11

Browse files
NO-SNOW: Remove aio usage from eror telemetry
1 parent 012eed6 commit 4d49b11

File tree

4 files changed

+2
-20
lines changed

4 files changed

+2
-20
lines changed

src/snowflake/connector/errors.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,6 @@ def send_exception_telemetry(
161161
telemetry_data[TelemetryField.KEY_TYPE.value] = self.errtype.value
162162
telemetry_data[TelemetryField.KEY_SOURCE.value] = connection.application
163163
telemetry_data[TelemetryField.KEY_EXCEPTION.value] = self.__class__.__name__
164-
telemetry_data[TelemetryField.KEY_USES_AIO.value] = str(
165-
self._is_aio_connection(connection)
166-
).lower()
167164
ts = get_time_millis()
168165
try:
169166
result = connection._log_telemetry(
@@ -175,7 +172,7 @@ def send_exception_telemetry(
175172
try:
176173
import asyncio
177174

178-
asyncio.get_running_loop().create_task(result)
175+
asyncio.get_running_loop().run_until_complete(result)
179176
except Exception:
180177
logger.debug(
181178
"Failed to schedule async telemetry logging.",
@@ -385,18 +382,6 @@ def errorhandler_make_exception(
385382
)
386383
return error_class(error_value)
387384

388-
@staticmethod
389-
def _is_aio_connection(
390-
connection: SnowflakeConnection | AsyncSnowflakeConnection,
391-
) -> bool:
392-
try:
393-
# Try import async connection. The import may fail if aio is not installed.
394-
from .aio._connection import SnowflakeConnection as AsyncSnowflakeConnection
395-
396-
return isinstance(connection, AsyncSnowflakeConnection)
397-
except ImportError:
398-
return False
399-
400385

401386
class _Warning(Exception):
402387
"""Exception for important warnings."""

src/snowflake/connector/telemetry.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ class TelemetryField(Enum):
5151
KEY_REASON = "reason"
5252
KEY_VALUE = "value"
5353
KEY_EXCEPTION = "exception"
54-
KEY_USES_AIO = "uses_aio"
5554
# Reserved UpperCamelName keys
5655
KEY_ERROR_NUMBER = "ErrorNumber"
5756
KEY_ERROR_MESSAGE = "ErrorMessage"

test/unit/aio/test_errors_telemetry.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@ async def test_error_telemetry_async_connection():
2424

2525
with patch("asyncio.get_running_loop") as loop_mock:
2626
Error(msg="kaboom", errno=654321, sqlstate="00000", connection=conn)
27-
loop_mock.return_value.create_task.assert_called_once()
27+
loop_mock.return_value.run_until_complete.assert_called_once()
2828

2929
msg = _extract_message_from_log_call(conn)
3030
assert msg[TelemetryField.KEY_TYPE.value] == TelemetryField.SQL_EXCEPTION.value
3131
assert msg[TelemetryField.KEY_SOURCE.value] == conn.application
3232
assert msg[TelemetryField.KEY_EXCEPTION.value] == "Error"
33-
assert msg[TelemetryField.KEY_USES_AIO.value] == "true"
3433
assert TelemetryField.KEY_DRIVER_TYPE.value in msg
3534
assert TelemetryField.KEY_DRIVER_VERSION.value in msg

test/unit/test_errors_telemetry.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@ def test_error_telemetry_sync_connection():
2828
assert msg[TelemetryField.KEY_TYPE.value] == TelemetryField.SQL_EXCEPTION.value
2929
assert msg[TelemetryField.KEY_SOURCE.value] == conn.application
3030
assert msg[TelemetryField.KEY_EXCEPTION.value] == "Error"
31-
assert msg[TelemetryField.KEY_USES_AIO.value] == "false"
3231
assert TelemetryField.KEY_DRIVER_TYPE.value in msg
3332
assert TelemetryField.KEY_DRIVER_VERSION.value in msg

0 commit comments

Comments
 (0)