Skip to content

Commit 54cad0e

Browse files
authored
NO-SNOW: Disable Stored Proc telemetry by default (#3701)
1 parent 2ffa31e commit 54cad0e

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

src/snowflake/snowpark/_internal/telemetry.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -482,19 +482,17 @@ def __init__(self, conn: SnowflakeConnection) -> None:
482482

483483
# Initializing telemetry client for stored procedures
484484
# In stored procs, we can't import this package at the top level, so we need to do it here
485-
internal_metrics_available = None
486-
if is_in_stored_procedure():
487-
try:
488-
from _snowflake import internal_metrics
489-
490-
internal_metrics_available = True
491-
except ImportError:
492-
internal_metrics_available = False
493-
self.stored_proc_meter = (
494-
internal_metrics.get_meter("snowpark-python-client")
495-
if internal_metrics_available
496-
else None
497-
)
485+
# internal_metrics_available = None
486+
# if is_in_stored_procedure():
487+
# try:
488+
# from _snowflake import internal_metrics
489+
490+
# internal_metrics_available = True
491+
# except ImportError:
492+
# internal_metrics_available = False
493+
494+
# SNOW-2321754: Enable this once we have re-factored the telemetry to use otel metrics
495+
self.stored_proc_meter = None
498496
# We periodically clean out the stored procedure meter of unused gauges
499497
self.clean_up_stored_proc_meter_interval = 1000
500498

src/snowflake/snowpark/session.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4149,7 +4149,7 @@ def telemetry_enabled(self, value):
41494149
# Set both in-band and out-of-band telemetry to True/False
41504150
if value:
41514151
self._conn._telemetry_client._enabled = True
4152-
if is_in_stored_procedure() and not self._stored_proc_telemetry_enabled:
4152+
if is_in_stored_procedure() and not self._internal_telemetry_enabled:
41534153
_logger.debug(
41544154
"Client side parameter ENABLE_SNOWPARK_FIRST_PARTY_TELEMETRY is set to False, telemetry could not be enabled"
41554155
)

tests/unit/test_stored_proc_telemetry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def test_internal_telemetry_disabled(mock_logger, mock_is_in_stored_proc):
110110
"""Test that Session logs debug message when telemetry is enabled but stored proc telemetry is disabled"""
111111
mock_is_in_stored_proc.return_value = True
112112
mock_session = MagicMock(spec=Session)
113-
mock_session._stored_proc_telemetry_enabled = False
113+
mock_session._internal_telemetry_enabled = False
114114
mock_session._conn = MagicMock()
115115
mock_session._conn._conn = MagicMock()
116116
mock_session._conn._telemetry_client = MagicMock()

0 commit comments

Comments
 (0)