Skip to content

Commit a4f4b3a

Browse files
dgoodwindgoodwin
authored
Merge pull request #30503 from dgoodwin/highcpu-interval-fixes
NO-JIRA: Fix highcpu intervals picking up the wrong e2etest intervals
2 parents 603a6ec + b6b0df9 commit a4f4b3a

File tree

2 files changed

+42
-22
lines changed

2 files changed

+42
-22
lines changed

‎pkg/monitortests/testframework/highcputestanalyzer/monitortest.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ func findE2EIntervalsOverlappingHighCPU(intervals monitorapi.Intervals) []map[st
8686
interval.Message.Reason == monitorapi.IntervalReason("HighCPUUsage")
8787
})
8888

89-
// Filter for E2E test intervals
89+
// Filter for E2E test intervals, but the summary ones, not the started/finished variants
9090
e2eTestIntervals := intervals.Filter(func(interval monitorapi.Interval) bool {
91-
return interval.Source == monitorapi.SourceE2ETest
91+
return interval.Source == monitorapi.SourceE2ETest && interval.Display
9292
})
9393

9494
// Find E2E tests that overlap with alert intervals

‎pkg/monitortests/testframework/highcputestanalyzer/monitortest_test.go‎

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
6969
name: "e2e test overlaps with high CPU",
7070
intervals: monitorapi.Intervals{
7171
{
72-
Source: monitorapi.SourceCPUMonitor,
72+
Source: monitorapi.SourceCPUMonitor,
73+
Display: true,
7374
Condition: monitorapi.Condition{
7475
Locator: monitorapi.Locator{
7576
Keys: map[monitorapi.LocatorKey]string{
@@ -84,7 +85,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
8485
To: now.Add(10 * time.Minute),
8586
},
8687
{
87-
Source: monitorapi.SourceE2ETest,
88+
Source: monitorapi.SourceE2ETest,
89+
Display: true,
8890
Condition: monitorapi.Condition{
8991
Locator: monitorapi.Locator{
9092
Keys: map[monitorapi.LocatorKey]string{
@@ -112,7 +114,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
112114
name: "e2e test contained within high CPU period",
113115
intervals: monitorapi.Intervals{
114116
{
115-
Source: monitorapi.SourceCPUMonitor,
117+
Display: true,
118+
Source: monitorapi.SourceCPUMonitor,
116119
Condition: monitorapi.Condition{
117120
Locator: monitorapi.Locator{
118121
Keys: map[monitorapi.LocatorKey]string{
@@ -127,7 +130,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
127130
To: now.Add(20 * time.Minute),
128131
},
129132
{
130-
Source: monitorapi.SourceE2ETest,
133+
Display: true,
134+
Source: monitorapi.SourceE2ETest,
131135
Condition: monitorapi.Condition{
132136
Locator: monitorapi.Locator{
133137
Keys: map[monitorapi.LocatorKey]string{
@@ -155,7 +159,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
155159
name: "high CPU period contained within e2e test",
156160
intervals: monitorapi.Intervals{
157161
{
158-
Source: monitorapi.SourceCPUMonitor,
162+
Source: monitorapi.SourceCPUMonitor,
163+
Display: true,
159164
Condition: monitorapi.Condition{
160165
Locator: monitorapi.Locator{
161166
Keys: map[monitorapi.LocatorKey]string{
@@ -170,7 +175,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
170175
To: now.Add(15 * time.Minute),
171176
},
172177
{
173-
Source: monitorapi.SourceE2ETest,
178+
Source: monitorapi.SourceE2ETest,
179+
Display: true,
174180
Condition: monitorapi.Condition{
175181
Locator: monitorapi.Locator{
176182
Keys: map[monitorapi.LocatorKey]string{
@@ -272,7 +278,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
272278
name: "e2e test with zero end time",
273279
intervals: monitorapi.Intervals{
274280
{
275-
Source: monitorapi.SourceCPUMonitor,
281+
Source: monitorapi.SourceCPUMonitor,
282+
Display: true,
276283
Condition: monitorapi.Condition{
277284
Locator: monitorapi.Locator{
278285
Keys: map[monitorapi.LocatorKey]string{
@@ -287,7 +294,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
287294
To: now.Add(10 * time.Minute),
288295
},
289296
{
290-
Source: monitorapi.SourceE2ETest,
297+
Source: monitorapi.SourceE2ETest,
298+
Display: true,
291299
Condition: monitorapi.Condition{
292300
Locator: monitorapi.Locator{
293301
Keys: map[monitorapi.LocatorKey]string{
@@ -315,7 +323,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
315323
name: "high CPU period with zero end time",
316324
intervals: monitorapi.Intervals{
317325
{
318-
Source: monitorapi.SourceCPUMonitor,
326+
Source: monitorapi.SourceCPUMonitor,
327+
Display: true,
319328
Condition: monitorapi.Condition{
320329
Locator: monitorapi.Locator{
321330
Keys: map[monitorapi.LocatorKey]string{
@@ -330,7 +339,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
330339
To: time.Time{}, // Zero time
331340
},
332341
{
333-
Source: monitorapi.SourceE2ETest,
342+
Source: monitorapi.SourceE2ETest,
343+
Display: true,
334344
Condition: monitorapi.Condition{
335345
Locator: monitorapi.Locator{
336346
Keys: map[monitorapi.LocatorKey]string{
@@ -358,7 +368,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
358368
name: "multiple overlapping tests",
359369
intervals: monitorapi.Intervals{
360370
{
361-
Source: monitorapi.SourceCPUMonitor,
371+
Source: monitorapi.SourceCPUMonitor,
372+
Display: true,
362373
Condition: monitorapi.Condition{
363374
Locator: monitorapi.Locator{
364375
Keys: map[monitorapi.LocatorKey]string{
@@ -373,7 +384,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
373384
To: now.Add(30 * time.Minute),
374385
},
375386
{
376-
Source: monitorapi.SourceE2ETest,
387+
Source: monitorapi.SourceE2ETest,
388+
Display: true,
377389
Condition: monitorapi.Condition{
378390
Locator: monitorapi.Locator{
379391
Keys: map[monitorapi.LocatorKey]string{
@@ -390,7 +402,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
390402
To: now.Add(15 * time.Minute),
391403
},
392404
{
393-
Source: monitorapi.SourceE2ETest,
405+
Source: monitorapi.SourceE2ETest,
406+
Display: true,
394407
Condition: monitorapi.Condition{
395408
Locator: monitorapi.Locator{
396409
Keys: map[monitorapi.LocatorKey]string{
@@ -422,7 +435,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
422435
name: "test overlaps with multiple high CPU periods - should only be reported once",
423436
intervals: monitorapi.Intervals{
424437
{
425-
Source: monitorapi.SourceCPUMonitor,
438+
Source: monitorapi.SourceCPUMonitor,
439+
Display: true,
426440
Condition: monitorapi.Condition{
427441
Locator: monitorapi.Locator{
428442
Keys: map[monitorapi.LocatorKey]string{
@@ -437,7 +451,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
437451
To: now.Add(15 * time.Minute),
438452
},
439453
{
440-
Source: monitorapi.SourceCPUMonitor,
454+
Source: monitorapi.SourceCPUMonitor,
455+
Display: true,
441456
Condition: monitorapi.Condition{
442457
Locator: monitorapi.Locator{
443458
Keys: map[monitorapi.LocatorKey]string{
@@ -452,7 +467,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
452467
To: now.Add(25 * time.Minute),
453468
},
454469
{
455-
Source: monitorapi.SourceE2ETest,
470+
Source: monitorapi.SourceE2ETest,
471+
Display: true,
456472
Condition: monitorapi.Condition{
457473
Locator: monitorapi.Locator{
458474
Keys: map[monitorapi.LocatorKey]string{
@@ -480,7 +496,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
480496
name: "same test runs twice and overlaps high CPU period each time",
481497
intervals: monitorapi.Intervals{
482498
{
483-
Source: monitorapi.SourceCPUMonitor,
499+
Source: monitorapi.SourceCPUMonitor,
500+
Display: true,
484501
Condition: monitorapi.Condition{
485502
Locator: monitorapi.Locator{
486503
Keys: map[monitorapi.LocatorKey]string{
@@ -495,7 +512,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
495512
To: now.Add(15 * time.Minute),
496513
},
497514
{
498-
Source: monitorapi.SourceCPUMonitor,
515+
Source: monitorapi.SourceCPUMonitor,
516+
Display: true,
499517
Condition: monitorapi.Condition{
500518
Locator: monitorapi.Locator{
501519
Keys: map[monitorapi.LocatorKey]string{
@@ -510,7 +528,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
510528
To: now.Add(45 * time.Minute),
511529
},
512530
{
513-
Source: monitorapi.SourceE2ETest,
531+
Source: monitorapi.SourceE2ETest,
532+
Display: true,
514533
Condition: monitorapi.Condition{
515534
Locator: monitorapi.Locator{
516535
Keys: map[monitorapi.LocatorKey]string{
@@ -527,7 +546,8 @@ func TestFindE2EIntervalsOverlappingHighCPU(t *testing.T) {
527546
To: now.Add(10 * time.Minute),
528547
},
529548
{
530-
Source: monitorapi.SourceE2ETest,
549+
Source: monitorapi.SourceE2ETest,
550+
Display: true,
531551
Condition: monitorapi.Condition{
532552
Locator: monitorapi.Locator{
533553
Keys: map[monitorapi.LocatorKey]string{

0 commit comments

Comments
 (0)