Skip to content

Commit cc6f106

Browse files
yeya24harry671003
yeya24
authored and
harry671003
committed
fix tests and interface
1 parent 1145d20 commit cc6f106

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

‎api/v2/api.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ func (api *API) getAlertsFromAlertGroup(ctx context.Context, receiverFilter *reg
898898
fp := alert.Fingerprint()
899899
receivers := allReceivers[fp]
900900
status := api.getAlertStatus(fp)
901-
apiAlert := AlertToOpenAPIAlert(alert, status, receivers)
901+
apiAlert := AlertToOpenAPIAlert(alert, status, receivers, nil)
902902
res = append(res, apiAlert)
903903
}
904904
}

‎api/v2/api_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"bytes"
1818
"encoding/json"
1919
"fmt"
20+
2021
"github.com/prometheus/client_golang/prometheus"
2122

2223
"io"
@@ -236,7 +237,7 @@ func TestGetAlertGroupInfosHandler(t *testing.T) {
236237
alertGroupInfos: func(f func(*dispatch.Route) bool) dispatch.AlertGroupInfos {
237238
return aginfos
238239
},
239-
logger: log.NewNopLogger(),
240+
logger: promslog.NewNopLogger(),
240241
}
241242
r, err := http.NewRequest("GET", "/api/v2/alertgroups", nil)
242243
require.NoError(t, err)
@@ -825,7 +826,7 @@ func TestListAlertsHandler(t *testing.T) {
825826
api := API{
826827
uptime: time.Now(),
827828
getAlertStatus: newGetAlertStatus(alertsProvider),
828-
logger: log.NewNopLogger(),
829+
logger: promslog.NewNopLogger(),
829830
apiCallback: tc.callback,
830831
alerts: alertsProvider,
831832
setAlertStatus: func(model.LabelSet) {},
@@ -939,7 +940,7 @@ func TestGetAlertGroupsHandler(t *testing.T) {
939940
return aginfos, nil
940941
},
941942
getAlertStatus: getAlertStatus,
942-
logger: log.NewNopLogger(),
943+
logger: promslog.NewNopLogger(),
943944
apiCallback: tc.callback,
944945
}
945946
r, err := http.NewRequest("GET", "/api/v2/alertgroups", nil)
@@ -1144,7 +1145,7 @@ func TestListAlertInfosHandler(t *testing.T) {
11441145
api := API{
11451146
uptime: time.Now(),
11461147
getAlertStatus: newGetAlertStatus(alertsProvider),
1147-
logger: log.NewNopLogger(),
1148+
logger: promslog.NewNopLogger(),
11481149
alerts: alertsProvider,
11491150
alertGroups: func(f func(*dispatch.Route) bool, f2 func(*types.Alert, time.Time) bool, f3 func(string) bool) (dispatch.AlertGroups, map[model.Fingerprint][]string) {
11501151
return ags, nil
@@ -1220,7 +1221,7 @@ func TestPostAlertHandler(t *testing.T) {
12201221
api := API{
12211222
uptime: time.Now(),
12221223
alerts: newFakeAlerts([]*types.Alert{}),
1223-
logger: log.NewNopLogger(),
1224+
logger: promslog.NewNopLogger(),
12241225
m: metrics.NewAlerts(prometheus.NewRegistry()),
12251226
}
12261227
api.Update(&config.Config{

‎api/v2/testing.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
package v2
1515

1616
import (
17+
"encoding/json"
1718
"testing"
1819
"time"
1920

2021
"github.com/prometheus/common/model"
22+
"github.com/stretchr/testify/require"
2123

2224
"github.com/prometheus/alertmanager/provider"
2325
"github.com/prometheus/alertmanager/types"

‎dispatch/dispatch.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,6 @@ type aggrGroup struct {
456456
logger *slog.Logger
457457
routeID string
458458
routeKey string
459-
routeID string
460459

461460
alerts *store.Alerts
462461
ctx context.Context
@@ -478,7 +477,6 @@ func newAggrGroup(ctx context.Context, labels model.LabelSet, r *Route, to func(
478477
labels: labels,
479478
routeID: r.ID(),
480479
routeKey: r.Key(),
481-
routeID: r.ID(),
482480
opts: &r.RouteOpts,
483481
timeout: to,
484482
alerts: store.NewAlerts(),

‎dispatch/dispatch_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ route:
642642
t.Fatal(err)
643643
}
644644

645-
logger := log.NewNopLogger()
645+
logger := promslog.NewNopLogger()
646646
route := NewRoute(conf.Route, nil)
647647
marker := types.NewMarker(prometheus.NewRegistry())
648648
alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, nil, logger, nil)
@@ -781,7 +781,7 @@ route:
781781
t.Fatal(err)
782782
}
783783

784-
logger := log.NewNopLogger()
784+
logger := promslog.NewNopLogger()
785785
route := NewRoute(conf.Route, nil)
786786
marker := types.NewMarker(prometheus.NewRegistry())
787787
alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, nil, logger, nil)
@@ -979,7 +979,7 @@ func TestDispatcher_DoMaintenance(t *testing.T) {
979979
recorder := &recordStage{alerts: make(map[string]map[model.Fingerprint]*types.Alert)}
980980

981981
ctx := context.Background()
982-
dispatcher := NewDispatcher(alerts, route, recorder, marker, timeout, nil, promslog.NewNopLogger(), NewDispatcherMetrics(false, r))
982+
dispatcher := NewDispatcher(alerts, route, recorder, marker, timeout, nil, promslog.NewNopLogger(), NewDispatcherMetrics(false, r), nil)
983983
aggrGroups := make(map[*Route]map[model.Fingerprint]*aggrGroup)
984984
aggrGroups[route] = make(map[model.Fingerprint]*aggrGroup)
985985

‎notify/notify.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ func (pb *PipelineBuilder) New(
424424
}
425425

426426
ms := NewGossipSettleStage(peer)
427-
is := NewMuteStage(inhibitor, pb.metrics)
427+
is := NewMuteStage(inhibitor, pb.metrics, o)
428428
tas := NewTimeActiveStage(intervener, marker, pb.metrics)
429429
tms := NewTimeMuteStage(intervener, marker, pb.metrics)
430430
ss := NewMuteStage(silencer, pb.metrics, o)

‎notify/notify_test.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"testing"
2626
"time"
2727

28-
"github.com/go-kit/log"
2928
"github.com/prometheus/alertmanager/alertobserver"
3029

3130
"github.com/prometheus/client_golang/prometheus"
@@ -347,7 +346,7 @@ func TestMultiStage(t *testing.T) {
347346
observer := alertobserver.NewFakeLifeCycleObserver()
348347
ctx := WithGroupKey(context.Background(), "test")
349348
stage.alertLCObserver = observer
350-
_, _, err = stage.Exec(ctx, log.NewNopLogger(), alerts1...)
349+
_, _, err = stage.Exec(ctx, promslog.NewNopLogger(), alerts1...)
351350
if err != nil {
352351
t.Fatalf("Exec failed: %s", err)
353352
}
@@ -405,7 +404,7 @@ func TestRoutingStage(t *testing.T) {
405404
// Rerun RoutingStage but with alert life cycle observer
406405
observer := alertobserver.NewFakeLifeCycleObserver()
407406
stage.alertLCObserver = observer
408-
_, _, err = stage.Exec(ctx, log.NewNopLogger(), alerts1...)
407+
_, _, err = stage.Exec(ctx, promslog.NewNopLogger(), alerts1...)
409408
if err != nil {
410409
t.Fatalf("Exec failed: %s", err)
411410
}
@@ -455,7 +454,7 @@ func TestRetryStageWithError(t *testing.T) {
455454
// Rerun recoverable error but with alert life cycle observer
456455
observer := alertobserver.NewFakeLifeCycleObserver()
457456
r.alertLCObserver = observer
458-
_, _, err = r.Exec(ctx, log.NewNopLogger(), alerts...)
457+
_, _, err = r.Exec(ctx, promslog.NewNopLogger(), alerts...)
459458
require.Nil(t, err)
460459
require.Equal(t, len(alerts), len(observer.AlertsPerEvent[alertobserver.EventAlertSent]))
461460
meta := observer.MetaPerEvent[alertobserver.EventAlertSent][0]
@@ -477,7 +476,7 @@ func TestRetryStageWithError(t *testing.T) {
477476
// Rerun the unrecoverable error but with alert life cycle observer
478477
fail = true
479478
r.alertLCObserver = observer
480-
_, _, err = r.Exec(ctx, log.NewNopLogger(), alerts...)
479+
_, _, err = r.Exec(ctx, promslog.NewNopLogger(), alerts...)
481480
require.NotNil(t, err)
482481
require.Equal(t, len(alerts), len(observer.AlertsPerEvent[alertobserver.EventAlertSendFailed]))
483482
meta = observer.MetaPerEvent[alertobserver.EventAlertSendFailed][0]
@@ -892,7 +891,7 @@ func TestMuteStageWithAlertObserver(t *testing.T) {
892891
if err != nil {
893892
t.Fatal(err)
894893
}
895-
_, err = silences.Set(&silencepb.Silence{
894+
err = silences.Set(&silencepb.Silence{
896895
EndsAt: utcNow().Add(time.Hour),
897896
Matchers: []*silencepb.Matcher{{Name: "mute", Pattern: "me"}},
898897
})
@@ -901,7 +900,7 @@ func TestMuteStageWithAlertObserver(t *testing.T) {
901900
}
902901

903902
marker := types.NewMarker(prometheus.NewRegistry())
904-
silencer := silence.NewSilencer(silences, marker, log.NewNopLogger())
903+
silencer := silence.NewSilencer(silences, marker, promslog.NewNopLogger())
905904
observer := alertobserver.NewFakeLifeCycleObserver()
906905
metrics := NewMetrics(prometheus.NewRegistry(), featurecontrol.NoopFlags{})
907906
stage := NewMuteStage(silencer, metrics, observer)
@@ -919,7 +918,7 @@ func TestMuteStageWithAlertObserver(t *testing.T) {
919918
})
920919
}
921920

922-
_, _, err = stage.Exec(context.Background(), log.NewNopLogger(), inAlerts...)
921+
_, _, err = stage.Exec(context.Background(), promslog.NewNopLogger(), inAlerts...)
923922
if err != nil {
924923
t.Fatalf("Exec failed: %s", err)
925924
}

0 commit comments

Comments
 (0)