@@ -365,27 +365,28 @@ func TestReportDisabledIfNeeded(t *testing.T) {
365
365
t .Parallel ()
366
366
db , _ := dbtestutil .NewDB (t )
367
367
ctx := testutil .Context (t , testutil .WaitMedium )
368
- serverURL , _ , snapshotChan := setupTelemetryServer (t )
368
+ serverURL , _ , snapshotChan := mockTelemetryServer (t )
369
369
370
370
options := telemetry.Options {
371
- Database : db ,
372
- Logger : testutil .Logger (t ),
373
- URL : serverURL ,
374
- DeploymentID : uuid .NewString (),
371
+ Database : db ,
372
+ Logger : testutil .Logger (t ),
373
+ URL : serverURL ,
374
+ DeploymentID : uuid .NewString (),
375
+ DisableReportOnClose : true ,
375
376
}
376
377
377
378
reporter , err := telemetry .New (options )
378
379
require .NoError (t , err )
379
380
t .Cleanup (reporter .Close )
380
381
381
- // No telemetry updated item, so no report should be sent
382
+ // No telemetry enabled item, so no report should be sent
382
383
require .NoError (t , reporter .ReportDisabledIfNeeded ())
383
384
require .Empty (t , snapshotChan )
384
385
385
- // Telemetry disabled item not present, and a telemetry update item present
386
+ // Telemetry enabled item present, and a telemetry disabled item not present
386
387
// Report should be sent
387
388
_ = dbgen .TelemetryItem (t , db , database.TelemetryItem {
388
- Key : string (telemetry .TelemetryItemKeyLastTelemetryUpdate ),
389
+ Key : string (telemetry .TelemetryItemKeyTelemetryEnabled ),
389
390
Value : "" ,
390
391
})
391
392
require .NoError (t , reporter .ReportDisabledIfNeeded ())
@@ -397,19 +398,17 @@ func TestReportDisabledIfNeeded(t *testing.T) {
397
398
t .Fatal ("timeout waiting for snapshot" )
398
399
}
399
400
400
- // Telemetry disabled item present, and a telemetry update item present
401
- // with an updated at time equal to or after the telemetry disabled item
401
+ // Telemetry enabled item present, and a more recent telemetry disabled item present
402
402
// Report should not be sent
403
403
require .NoError (t , reporter .ReportDisabledIfNeeded ())
404
404
require .Empty (t , snapshotChan )
405
405
406
- // Telemetry disabled item present, and a telemetry update item present
407
- // with an updated at time before the telemetry disabled item
406
+ // Telemetry enabled item present, and a less recent telemetry disabled item present
408
407
// Report should be sent
409
- // Wait a bit to ensure UpdatedAt is bigger when we upsert the telemetry disabled item
408
+ // Wait a bit to ensure UpdatedAt is bigger when we upsert the telemetry enabled item
410
409
time .Sleep (100 * time .Millisecond )
411
410
require .NoError (t , db .UpsertTelemetryItem (ctx , database.UpsertTelemetryItemParams {
412
- Key : string (telemetry .TelemetryItemKeyTelemetryDisabled ),
411
+ Key : string (telemetry .TelemetryItemKeyTelemetryEnabled ),
413
412
Value : "" ,
414
413
}))
415
414
require .NoError (t , reporter .ReportDisabledIfNeeded ())
@@ -422,7 +421,7 @@ func TestReportDisabledIfNeeded(t *testing.T) {
422
421
}
423
422
}
424
423
425
- func setupTelemetryServer (t * testing.T ) (* url.URL , chan * telemetry.Deployment , chan * telemetry.Snapshot ) {
424
+ func mockTelemetryServer (t * testing.T ) (* url.URL , chan * telemetry.Deployment , chan * telemetry.Snapshot ) {
426
425
t .Helper ()
427
426
deployment := make (chan * telemetry.Deployment , 64 )
428
427
snapshot := make (chan * telemetry.Snapshot , 64 )
@@ -456,7 +455,7 @@ func setupTelemetryServer(t *testing.T) (*url.URL, chan *telemetry.Deployment, c
456
455
func collectSnapshot (t * testing.T , db database.Store , addOptionsFn func (opts telemetry.Options ) telemetry.Options ) (* telemetry.Deployment , * telemetry.Snapshot ) {
457
456
t .Helper ()
458
457
459
- serverURL , deployment , snapshot := setupTelemetryServer (t )
458
+ serverURL , deployment , snapshot := mockTelemetryServer (t )
460
459
461
460
options := telemetry.Options {
462
461
Database : db ,
0 commit comments