Move telemetry from auth request to in-band

Author: sfc-gh-turbaszek

src/snowflake/connector/auth/_auth.py

@@ -17,7 +17,7 @@
     load_pem_private_key,
 )
 
-from .._utils import _core_loader, get_application_path
+from .._utils import get_application_path
 from ..compat import urlencode
 from ..constants import (
     DAY_IN_SECONDS,
@@ -144,8 +144,6 @@ def base_auth_data(
                         platform_detection_timeout_seconds=platform_detection_timeout_seconds,
                         session_manager=session_manager.clone(max_retries=0),
                     ),
-                    "CORE_LOAD_ERROR": _core_loader.get_load_error(),
-                    "CORE_VERSION": _core_loader.get_core_version(),
                 },
             },
         }

src/snowflake/connector/connection.py

@@ -42,6 +42,7 @@
 from ._utils import (
     _DEFAULT_VALUE_SERVER_DOP_CAP_FOR_FILE_TRANSFER,
     _VARIABLE_NAME_SERVER_DOP_CAP_FOR_FILE_TRANSFER,
+    _core_loader,
 )
 from .auth import (
     FIRST_PARTY_AUTHENTICATORS,
@@ -681,6 +682,7 @@ def __init__(
 
         # get the imported modules from sys.modules
         self._log_telemetry_imported_packages()
+        self._log_minicore_import()
         # check SNOW-1218851 for long term improvement plan to refactor ocsp code
         atexit.register(self._close_at_exit)
 
@@ -2506,6 +2508,22 @@ def async_query_check_helper(
 
         return not found_unfinished_query
 
+    def _log_minicore_import(self):
+        ts = get_time_millis()
+        self._log_telemetry(
+            TelemetryData.from_telemetry_data_dict(
+                from_dict={
+                    TelemetryField.KEY_TYPE.value: TelemetryField.CORE_IMPORT.value,
+                    TelemetryField.KEY_VALUE: {
+                        "CORE_LOAD_ERROR": _core_loader.get_load_error(),
+                        "CORE_VERSION": _core_loader.get_core_version(),
+                    },
+                },
+                timestamp=ts,
+                connection=self,
+            )
+        )
+
     def _log_telemetry_imported_packages(self) -> None:
         if self._log_imported_packages_in_telemetry:
             # filter out duplicates caused by submodules

src/snowflake/connector/telemetry.py

@@ -39,6 +39,8 @@ class TelemetryField(Enum):
     PANDAS_WRITE = "client_write_pandas"
     # imported packages along with client
     IMPORTED_PACKAGES = "client_imported_packages"
+    # Core import
+    CORE_IMPORT = "mini_core_import"
     # multi-statement usage
     MULTI_STATEMENT = "client_multi_statement_query"
     # Keys for telemetry data sent through either in-band or out-of-band telemetry

test/integ/test_connection.py

@@ -1230,6 +1230,36 @@ def check_packages(message: str, expected_packages: list[str]) -> bool:
         assert len(telemetry_test.records) == 0
 
 
+@pytest.mark.skipolddriver
+def test_minicore_import_telemetry(conn_cnx, capture_sf_telemetry):
+    """Test that minicore import telemetry (CORE_LOAD_ERROR and CORE_VERSION) is logged."""
+    with (
+        conn_cnx() as conn,
+        capture_sf_telemetry.patch_connection(conn, False) as telemetry_test,
+    ):
+        conn._log_minicore_import()
+        assert len(telemetry_test.records) > 0
+        # Check that the telemetry record contains the proper structure
+        found_minicore_telemetry = False
+        for t in telemetry_test.records:
+            if (
+                t.message.get(TelemetryField.KEY_TYPE.value)
+                == TelemetryField.CORE_IMPORT.value
+                and TelemetryField.KEY_VALUE.value in t.message
+            ):
+                found_minicore_telemetry = True
+                # Verify that the value contains CORE_LOAD_ERROR and CORE_VERSION
+                value = t.message[TelemetryField.KEY_VALUE.value]
+                assert (
+                    "CORE_LOAD_ERROR" in value
+                ), "CORE_LOAD_ERROR not in telemetry value"
+                assert "CORE_VERSION" in value, "CORE_VERSION not in telemetry value"
+                break
+        assert (
+            found_minicore_telemetry
+        ), "Minicore telemetry not found in telemetry records"
+
+
 @pytest.mark.skipolddriver
 def test_disable_query_context_cache(conn_cnx) -> None:
     with conn_cnx(disable_query_context_cache=True) as conn: