Skip to content

Commit 8394fab

Browse files
committed
fix broken test case for default enable telemetry
Signed-off-by: Nikhil Suri <nikhil.suri@databricks.com>
1 parent e64db50 commit 8394fab

File tree

1 file changed

+12
-98
lines changed

1 file changed

+12
-98
lines changed

tests/e2e/test_telemetry_e2e.py

Lines changed: 12 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,6 @@ def test_enable_telemetry_on_with_server_on_sends_events(
278278
Scenario: enable_telemetry=ON, force_enable_telemetry=OFF, server=ON
279279
Expected: 2 events (initial_log + latency_log)
280280
"""
281-
from databricks.sql.telemetry.telemetry_client import TelemetryHelper
282-
283-
print(f"\n{'='*80}")
284-
print(f"TEST: test_enable_telemetry_on_with_server_on_sends_events")
285-
print(
286-
f"Feature flag being checked: {TelemetryHelper.TELEMETRY_FEATURE_FLAG_NAME}"
287-
)
288-
print(f"{'='*80}\n")
289-
290281
(
291282
captured_events,
292283
captured_futures,
@@ -306,13 +297,6 @@ def test_enable_telemetry_on_with_server_on_sends_events(
306297
"telemetry_batch_size": 1,
307298
}
308299
) as conn:
309-
print(f"\nConnection created:")
310-
print(f" enable_telemetry: {conn.enable_telemetry}")
311-
print(f" force_enable_telemetry: {conn.force_enable_telemetry}")
312-
print(f" telemetry_enabled (computed): {conn.telemetry_enabled}")
313-
print(
314-
f" telemetry_client type: {type(conn._telemetry_client).__name__}\n"
315-
)
316300
with conn.cursor() as cursor:
317301
cursor.execute("SELECT 1")
318302
cursor.fetchone()
@@ -342,8 +326,6 @@ def test_enable_telemetry_on_with_server_on_sends_events(
342326
# Assert latency event (second event)
343327
self.assertStatementExecution(captured_events[1])
344328

345-
print(f"\nStatement ID: {statement_id}")
346-
347329
def test_force_enable_on_with_enable_off_sends_events(self, telemetry_interceptors):
348330
"""
349331
Scenario: enable_telemetry=OFF, force_enable_telemetry=ON, server=ON
@@ -396,7 +378,6 @@ def test_force_enable_on_with_enable_off_sends_events(self, telemetry_intercepto
396378

397379
self.assertStatementExecution(captured_events[1])
398380

399-
print(f"\nStatement ID: {statement_id}")
400381

401382
def test_both_flags_off_does_not_send_events(self, telemetry_interceptors):
402383
"""
@@ -437,30 +418,19 @@ def test_both_flags_off_does_not_send_events(self, telemetry_interceptors):
437418
len(captured_futures) == 0
438419
), f"Expected 0 responses, got {len(captured_futures)}"
439420

440-
print(f"\nStatement ID: {statement_id}")
441421

442-
def test_default_behavior_sends_events_with_server_flag_on(
422+
def test_default_behavior_does_not_send_events(
443423
self, telemetry_interceptors
444424
):
445425
"""
446426
Scenario: Neither enable_telemetry nor force_enable_telemetry passed (uses defaults)
447-
Expected: 2 events (initial_log + latency_log) when server feature flag is ON
427+
Expected: 0 events (telemetry disabled by default)
448428
449429
Default behavior:
450-
- enable_telemetry defaults to True
430+
- enable_telemetry defaults to False
451431
- force_enable_telemetry defaults to False
452-
- Telemetry will be sent if server feature flag is enabled
432+
- Telemetry will NOT be sent (NoopTelemetryClient used)
453433
"""
454-
from databricks.sql.telemetry.telemetry_client import TelemetryHelper
455-
456-
print(f"\n{'='*80}")
457-
print(f"TEST: test_default_behavior_sends_events_with_server_flag_on")
458-
print(
459-
f"Feature flag being checked: {TelemetryHelper.TELEMETRY_FEATURE_FLAG_NAME}"
460-
)
461-
print(f"Testing DEFAULT behavior (no flags passed explicitly)")
462-
print(f"{'='*80}\n")
463-
464434
(
465435
captured_events,
466436
captured_futures,
@@ -479,47 +449,19 @@ def test_default_behavior_sends_events_with_server_flag_on(
479449
"telemetry_batch_size": 1,
480450
}
481451
) as conn:
482-
# Verify defaults are as expected
483-
print(f"\nConnection created with DEFAULT settings:")
484-
print(f" enable_telemetry (default): {conn.enable_telemetry}")
485-
print(
486-
f" force_enable_telemetry (default): {conn.force_enable_telemetry}"
487-
)
488-
print(f" telemetry_enabled (computed): {conn.telemetry_enabled}")
489-
print(
490-
f" telemetry_client type: {type(conn._telemetry_client).__name__}\n"
491-
)
492-
493452
with conn.cursor() as cursor:
494453
cursor.execute("SELECT 99")
495454
cursor.fetchone()
496-
statement_id = cursor.query_id
497455

498456
time.sleep(2)
499-
done, not_done = wait(captured_futures, timeout=10)
500457

501-
# With default enable_telemetry=True and server flag ON, expect 2 events
458+
# With default enable_telemetry=False, expect 0 events
502459
assert (
503-
len(captured_events) == 2
504-
), f"Expected exactly 2 events with default settings, got {len(captured_events)}"
505-
assert len(done) == 2, f"Expected exactly 2 responses, got {len(done)}"
506-
507-
# Verify HTTP responses
508-
for future in done:
509-
response = future.result()
510-
assert 200 <= response.status < 300
511-
512-
# Assert payload for all events
513-
for event in captured_events:
514-
self.assertSystemConfiguration(event)
515-
self.assertConnectionParams(
516-
event, expected_http_path=self.arguments["http_path"]
517-
)
518-
519-
# Assert latency event (second event)
520-
self.assertStatementExecution(captured_events[1])
521-
522-
print(f"\nStatement ID: {statement_id}")
460+
len(captured_events) == 0
461+
), f"Expected 0 events with default settings, got {len(captured_events)}"
462+
assert (
463+
len(captured_futures) == 0
464+
), f"Expected 0 responses with default settings, got {len(captured_futures)}"
523465

524466
def test_sql_error_sends_telemetry_with_error_info(self, telemetry_interceptors):
525467
"""
@@ -552,7 +494,7 @@ def test_sql_error_sends_telemetry_with_error_info(self, telemetry_interceptors)
552494
assert False, "Query should have failed"
553495
except Exception as e:
554496
# Expected to fail
555-
print(f"\nExpected error occurred: {type(e).__name__}")
497+
pass
556498

557499
time.sleep(2)
558500
done, not_done = wait(captured_futures, timeout=10)
@@ -562,15 +504,13 @@ def test_sql_error_sends_telemetry_with_error_info(self, telemetry_interceptors)
562504
len(captured_events) >= 1
563505
), f"Expected at least 1 event, got {len(captured_events)}"
564506

565-
print(f"\nCaptured {len(captured_events)} events")
566507

567508
# Find event with error_info (typically the middle event)
568509
error_event = None
569510
for idx, event in enumerate(captured_events):
570511
error_info = event.entry.sql_driver_log.error_info
571512
if error_info:
572513
error_event = event
573-
print(f"\nFound error_info in event {idx}")
574514
break
575515

576516
assert (
@@ -590,9 +530,6 @@ def test_sql_error_sends_telemetry_with_error_info(self, telemetry_interceptors)
590530
error_event, expected_error_name="ServerOperationError"
591531
)
592532

593-
print(
594-
f"✅ Error telemetry successfully captured with error_name and stack_trace"
595-
)
596533

597534
def test_non_existent_table_error_sends_telemetry(self, telemetry_interceptors):
598535
"""
@@ -626,7 +563,7 @@ def test_non_existent_table_error_sends_telemetry(self, telemetry_interceptors):
626563
assert False, "Query should have failed"
627564
except Exception as e:
628565
# Expected to fail
629-
print(f"\nExpected error occurred: {type(e).__name__}")
566+
pass
630567

631568
time.sleep(2)
632569
done, not_done = wait(captured_futures, timeout=10)
@@ -636,15 +573,13 @@ def test_non_existent_table_error_sends_telemetry(self, telemetry_interceptors):
636573
len(captured_events) >= 1
637574
), f"Expected at least 1 event, got {len(captured_events)}"
638575

639-
print(f"\nCaptured {len(captured_events)} events")
640576

641577
# Find event with error_info
642578
error_event = None
643579
for idx, event in enumerate(captured_events):
644580
error_info = event.entry.sql_driver_log.error_info
645581
if error_info:
646582
error_event = event
647-
print(f"\nFound error_info in event {idx}")
648583
break
649584

650585
assert (
@@ -662,7 +597,6 @@ def test_non_existent_table_error_sends_telemetry(self, telemetry_interceptors):
662597
# Assert error info exists
663598
self.assertErrorInfo(error_event)
664599

665-
print(f"✅ Non-existent table error telemetry captured")
666600

667601
def test_metadata_get_catalogs_sends_telemetry(self, telemetry_interceptors):
668602
"""
@@ -700,7 +634,6 @@ def test_metadata_get_catalogs_sends_telemetry(self, telemetry_interceptors):
700634
len(captured_events) >= 1
701635
), f"Expected at least 1 event, got {len(captured_events)}"
702636

703-
print(f"\nCaptured {len(captured_events)} events for getCatalogs")
704637

705638
# Assert system configuration and connection params for all events
706639
for event in captured_events:
@@ -709,7 +642,6 @@ def test_metadata_get_catalogs_sends_telemetry(self, telemetry_interceptors):
709642
event, expected_http_path=self.arguments["http_path"]
710643
)
711644

712-
print(f"✅ Metadata getCatalogs telemetry captured")
713645

714646
def test_direct_results_sends_telemetry(self, telemetry_interceptors):
715647
"""
@@ -749,7 +681,6 @@ def test_direct_results_sends_telemetry(self, telemetry_interceptors):
749681
len(captured_events) >= 2
750682
), f"Expected at least 2 events, got {len(captured_events)}"
751683

752-
print(f"\nCaptured {len(captured_events)} events for direct results")
753684

754685
# Assert system configuration and connection params for all events
755686
for event in captured_events:
@@ -762,7 +693,6 @@ def test_direct_results_sends_telemetry(self, telemetry_interceptors):
762693
latency_event = captured_events[-1]
763694
self.assertStatementExecution(latency_event)
764695

765-
print(f"✅ Direct results telemetry captured")
766696

767697
def test_cloudfetch_no_explicit_close_sends_telemetry(self, telemetry_interceptors):
768698
"""
@@ -802,9 +732,6 @@ def test_cloudfetch_no_explicit_close_sends_telemetry(self, telemetry_intercepto
802732
len(captured_events) >= 2
803733
), f"Expected at least 2 events, got {len(captured_events)}"
804734

805-
print(
806-
f"\nCaptured {len(captured_events)} events for cloudfetch (auto close)"
807-
)
808735

809736
# Assert system configuration and connection params for all events
810737
for event in captured_events:
@@ -817,7 +744,6 @@ def test_cloudfetch_no_explicit_close_sends_telemetry(self, telemetry_intercepto
817744
latency_event = captured_events[-1]
818745
self.assertStatementExecution(latency_event)
819746

820-
print(f"✅ Cloudfetch (auto close) telemetry captured")
821747

822748
def test_cloudfetch_statement_closed_sends_telemetry(self, telemetry_interceptors):
823749
"""
@@ -858,9 +784,6 @@ def test_cloudfetch_statement_closed_sends_telemetry(self, telemetry_interceptor
858784
len(captured_events) >= 2
859785
), f"Expected at least 2 events, got {len(captured_events)}"
860786

861-
print(
862-
f"\nCaptured {len(captured_events)} events for cloudfetch (statement close)"
863-
)
864787

865788
# Assert system configuration and connection params for all events
866789
for event in captured_events:
@@ -873,7 +796,6 @@ def test_cloudfetch_statement_closed_sends_telemetry(self, telemetry_interceptor
873796
latency_event = captured_events[-1]
874797
self.assertStatementExecution(latency_event)
875798

876-
print(f"✅ Cloudfetch (statement close) telemetry captured")
877799

878800
def test_cloudfetch_connection_closed_sends_telemetry(self, telemetry_interceptors):
879801
"""
@@ -913,9 +835,6 @@ def test_cloudfetch_connection_closed_sends_telemetry(self, telemetry_intercepto
913835
len(captured_events) >= 2
914836
), f"Expected at least 2 events, got {len(captured_events)}"
915837

916-
print(
917-
f"\nCaptured {len(captured_events)} events for cloudfetch (connection close)"
918-
)
919838

920839
# Assert system configuration and connection params for all events
921840
for event in captured_events:
@@ -928,7 +847,6 @@ def test_cloudfetch_connection_closed_sends_telemetry(self, telemetry_intercepto
928847
latency_event = captured_events[-1]
929848
self.assertStatementExecution(latency_event)
930849

931-
print(f"✅ Cloudfetch (connection close) telemetry captured")
932850

933851
def test_cloudfetch_only_resultset_closed_sends_telemetry(
934852
self, telemetry_interceptors
@@ -971,9 +889,6 @@ def test_cloudfetch_only_resultset_closed_sends_telemetry(
971889
len(captured_events) >= 2
972890
), f"Expected at least 2 events, got {len(captured_events)}"
973891

974-
print(
975-
f"\nCaptured {len(captured_events)} events for cloudfetch (resultset close)"
976-
)
977892

978893
# Assert system configuration and connection params for all events
979894
for event in captured_events:
@@ -986,4 +901,3 @@ def test_cloudfetch_only_resultset_closed_sends_telemetry(
986901
latency_event = captured_events[-1]
987902
self.assertStatementExecution(latency_event)
988903

989-
print(f"✅ Cloudfetch (resultset close) telemetry captured")

0 commit comments

Comments
 (0)