diff --git a/src/snowflake/connector/errors.py b/src/snowflake/connector/errors.py index 0c7ab68f5d..0bb12b593a 100644 --- a/src/snowflake/connector/errors.py +++ b/src/snowflake/connector/errors.py @@ -161,9 +161,6 @@ def send_exception_telemetry( telemetry_data[TelemetryField.KEY_TYPE.value] = self.errtype.value telemetry_data[TelemetryField.KEY_SOURCE.value] = connection.application telemetry_data[TelemetryField.KEY_EXCEPTION.value] = self.__class__.__name__ - telemetry_data[TelemetryField.KEY_USES_AIO.value] = str( - self._is_aio_connection(connection) - ).lower() ts = get_time_millis() try: result = connection._log_telemetry( @@ -175,7 +172,7 @@ def send_exception_telemetry( try: import asyncio - asyncio.get_running_loop().create_task(result) + asyncio.get_running_loop().run_until_complete(result) except Exception: logger.debug( "Failed to schedule async telemetry logging.", @@ -385,18 +382,6 @@ def errorhandler_make_exception( ) return error_class(error_value) - @staticmethod - def _is_aio_connection( - connection: SnowflakeConnection | AsyncSnowflakeConnection, - ) -> bool: - try: - # Try import async connection. The import may fail if aio is not installed. - from .aio._connection import SnowflakeConnection as AsyncSnowflakeConnection - - return isinstance(connection, AsyncSnowflakeConnection) - except ImportError: - return False - class _Warning(Exception): """Exception for important warnings.""" diff --git a/src/snowflake/connector/telemetry.py b/src/snowflake/connector/telemetry.py index e5044fa00c..a22cbdfbb6 100644 --- a/src/snowflake/connector/telemetry.py +++ b/src/snowflake/connector/telemetry.py @@ -51,7 +51,6 @@ class TelemetryField(Enum): KEY_REASON = "reason" KEY_VALUE = "value" KEY_EXCEPTION = "exception" - KEY_USES_AIO = "uses_aio" # Reserved UpperCamelName keys KEY_ERROR_NUMBER = "ErrorNumber" KEY_ERROR_MESSAGE = "ErrorMessage" diff --git a/test/unit/aio/test_errors_telemetry.py b/test/unit/aio/test_errors_telemetry.py index 3e5bef848d..5c98379699 100644 --- a/test/unit/aio/test_errors_telemetry.py +++ b/test/unit/aio/test_errors_telemetry.py @@ -24,12 +24,11 @@ async def test_error_telemetry_async_connection(): with patch("asyncio.get_running_loop") as loop_mock: Error(msg="kaboom", errno=654321, sqlstate="00000", connection=conn) - loop_mock.return_value.create_task.assert_called_once() + loop_mock.return_value.run_until_complete.assert_called_once() msg = _extract_message_from_log_call(conn) assert msg[TelemetryField.KEY_TYPE.value] == TelemetryField.SQL_EXCEPTION.value assert msg[TelemetryField.KEY_SOURCE.value] == conn.application assert msg[TelemetryField.KEY_EXCEPTION.value] == "Error" - assert msg[TelemetryField.KEY_USES_AIO.value] == "true" assert TelemetryField.KEY_DRIVER_TYPE.value in msg assert TelemetryField.KEY_DRIVER_VERSION.value in msg diff --git a/test/unit/test_errors_telemetry.py b/test/unit/test_errors_telemetry.py index 2857f63a46..2c6cc665a1 100644 --- a/test/unit/test_errors_telemetry.py +++ b/test/unit/test_errors_telemetry.py @@ -28,6 +28,5 @@ def test_error_telemetry_sync_connection(): assert msg[TelemetryField.KEY_TYPE.value] == TelemetryField.SQL_EXCEPTION.value assert msg[TelemetryField.KEY_SOURCE.value] == conn.application assert msg[TelemetryField.KEY_EXCEPTION.value] == "Error" - assert msg[TelemetryField.KEY_USES_AIO.value] == "false" assert TelemetryField.KEY_DRIVER_TYPE.value in msg assert TelemetryField.KEY_DRIVER_VERSION.value in msg