File tree Expand file tree Collapse file tree 3 files changed +15
-21
lines changed Expand file tree Collapse file tree 3 files changed +15
-21
lines changed Original file line number Diff line number Diff line change @@ -262,16 +262,9 @@ def read(self) -> Optional[OAuthToken]:
262
262
)
263
263
self .staging_allowed_local_path = kwargs .get ("staging_allowed_local_path" , None )
264
264
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 )
275
268
276
269
TelemetryClientFactory .initialize_telemetry_client (
277
270
telemetry_enabled = self .telemetry_enabled ,
Original file line number Diff line number Diff line change 1
- # databricks/sql/common/feature_flags.py
1
+ # TODO: Test this when server-side feature flag is available
2
2
3
3
import threading
4
4
import time
Original file line number Diff line number Diff line change @@ -100,16 +100,17 @@ def get_auth_flow(auth_provider):
100
100
return None
101
101
102
102
@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
113
114
114
115
115
116
class NoopTelemetryClient (BaseTelemetryClient ):
You can’t perform that action at this time.
0 commit comments