Skip to content

Commit 08c0bd8

Browse files
committed
force enable telemetry
Signed-off-by: Sai Shree Pradhan <saishree.pradhan@databricks.com>
1 parent f0cdfab commit 08c0bd8

File tree

3 files changed

+15
-21
lines changed

3 files changed

+15
-21
lines changed

src/databricks/sql/client.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -262,16 +262,9 @@ def read(self) -> Optional[OAuthToken]:
262262
)
263263
self.staging_allowed_local_path = kwargs.get("staging_allowed_local_path", None)
264264

265-
self.client_telemetry_enabled = kwargs.get("enable_telemetry", False)
266-
if self.client_telemetry_enabled:
267-
self.server_telemetry_enabled = TelemetryHelper.is_server_telemetry_enabled(
268-
self
269-
)
270-
self.telemetry_enabled = (
271-
self.client_telemetry_enabled and self.server_telemetry_enabled
272-
)
273-
else:
274-
self.telemetry_enabled = False
265+
self.force_enable_telemetry = kwargs.get("force_enable_telemetry", False)
266+
self.enable_telemetry = kwargs.get("enable_telemetry", False)
267+
self.telemetry_enabled = TelemetryHelper.is_telemetry_enabled(self)
275268

276269
TelemetryClientFactory.initialize_telemetry_client(
277270
telemetry_enabled=self.telemetry_enabled,

src/databricks/sql/common/feature_flag.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# databricks/sql/common/feature_flags.py
1+
# TODO: Test this when server-side feature flag is available
22

33
import threading
44
import time

src/databricks/sql/telemetry/telemetry_client.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,17 @@ def get_auth_flow(auth_provider):
100100
return None
101101

102102
@staticmethod
103-
def is_server_telemetry_enabled(connection: "Connection") -> bool:
104-
"""
105-
Checks if the server-side feature flag for telemetry is enabled.
106-
This is a BLOCKING call on the first check per connection.
107-
"""
108-
context = FeatureFlagsContextFactory.get_instance(connection)
109-
110-
return context.is_feature_enabled(
111-
TelemetryHelper.TELEMETRY_FEATURE_FLAG_NAME, default_value=False
112-
)
103+
def is_telemetry_enabled(connection: "Connection") -> bool:
104+
if connection.force_enable_telemetry:
105+
return True
106+
107+
if connection.enable_telemetry:
108+
context = FeatureFlagsContextFactory.get_instance(connection)
109+
return context.is_feature_enabled(
110+
TelemetryHelper.TELEMETRY_FEATURE_FLAG_NAME, default_value=False
111+
)
112+
else:
113+
return False
113114

114115

115116
class NoopTelemetryClient(BaseTelemetryClient):

0 commit comments

Comments
 (0)