Skip to content

Commit

Permalink
go fmt (moira-alert#151)
Browse files Browse the repository at this point in the history
  • Loading branch information
@borovskyav
borovskyav authored Dec 20, 2018
1 parent 87170f1 commit 9a24704
Show file tree
Hide file tree
Showing 13 changed files with 73 additions and 75 deletions.
3 changes: 2 additions & 1 deletion api/controller/trigger_metrics_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,8 @@ func TestGetTriggerMetrics(t *testing.T) {
dataBase.EXPECT().GetMetricsValues([]string{metric}, from, until).Return(dataList, nil)
triggerMetrics, err := GetTriggerMetrics(dataBase, remoteCfg, from, until, triggerID)
So(err, ShouldBeNil)
So(*triggerMetrics, ShouldResemble, dto.TriggerMetrics{Main: map[string][]*moira.MetricValue{metric: {{Value: 0, Timestamp: 17}, {Value: 1, Timestamp: 27}, {Value: 2, Timestamp: 37}, {Value: 3, Timestamp: 47}, {Value: 4, Timestamp: 57}}}, Additional: make(map[string][]*moira.MetricValue)}) })
So(*triggerMetrics, ShouldResemble, dto.TriggerMetrics{Main: map[string][]*moira.MetricValue{metric: {{Value: 0, Timestamp: 17}, {Value: 1, Timestamp: 27}, {Value: 2, Timestamp: 37}, {Value: 3, Timestamp: 47}, {Value: 4, Timestamp: 57}}}, Additional: make(map[string][]*moira.MetricValue)})
})

Convey("GetTrigger error", t, func() {
expected := fmt.Errorf("get trigger error")
Expand Down
1 change: 0 additions & 1 deletion api/handler/trigger_metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,3 @@ func deleteTriggerNodataMetrics(writer http.ResponseWriter, request *http.Reques
render.Render(writer, request, err)
}
}

114 changes: 57 additions & 57 deletions checker/check_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,12 +480,12 @@ func TestCheckErrors(t *testing.T) {
}

lastCheck := moira.CheckData{
Metrics: triggerChecker.lastCheck.Metrics,
State: EXCEPTION,
Timestamp: triggerChecker.Until,
EventTimestamp: triggerChecker.Until,
Score: 100000,
Message: messageException,
Metrics: triggerChecker.lastCheck.Metrics,
State: EXCEPTION,
Timestamp: triggerChecker.Until,
EventTimestamp: triggerChecker.Until,
Score: 100000,
Message: messageException,
LastSuccessfulCheckTimestamp: 0,
}

Expand Down Expand Up @@ -526,11 +526,11 @@ func TestCheckErrors(t *testing.T) {
}

lastCheck := moira.CheckData{
Metrics: eventMetrics,
State: OK,
Timestamp: triggerChecker.Until,
EventTimestamp: triggerChecker.Until,
Score: 0,
Metrics: eventMetrics,
State: OK,
Timestamp: triggerChecker.Until,
EventTimestamp: triggerChecker.Until,
Score: 0,
LastSuccessfulCheckTimestamp: triggerChecker.Until,
}

Expand Down Expand Up @@ -824,10 +824,10 @@ func TestHandleTrigger(t *testing.T) {
checkData, err := triggerChecker.handleMetricsCheck()
So(err, ShouldResemble, ErrTriggerHasOnlyWildcards{})
So(checkData, ShouldResemble, moira.CheckData{
Metrics: lastCheck.Metrics,
Timestamp: triggerChecker.Until,
State: OK,
Score: 0,
Metrics: lastCheck.Metrics,
Timestamp: triggerChecker.Until,
State: OK,
Score: 0,
LastSuccessfulCheckTimestamp: 0,
})
mockCtrl.Finish()
Expand Down Expand Up @@ -904,10 +904,10 @@ func TestHandleTrigger(t *testing.T) {
checkData, err := triggerChecker.handleMetricsCheck()
So(err, ShouldBeNil)
So(checkData, ShouldResemble, moira.CheckData{
Metrics: make(map[string]moira.MetricState),
Timestamp: triggerChecker.Until,
State: OK,
Score: 0,
Metrics: make(map[string]moira.MetricState),
Timestamp: triggerChecker.Until,
State: OK,
Score: 0,
LastSuccessfulCheckTimestamp: 0,
})
mockCtrl.Finish()
Expand Down Expand Up @@ -936,9 +936,9 @@ func TestHandleErrorCheck(t *testing.T) {
},
}
checkData := moira.CheckData{
State: NODATA,
Timestamp: time.Now().Unix(),
Message: "Trigger has no metrics, check your target",
State: NODATA,
Timestamp: time.Now().Unix(),
Message: "Trigger has no metrics, check your target",
LastSuccessfulCheckTimestamp: time.Now().Unix(),
}
actual, err := triggerChecker.handleTriggerCheck(checkData, ErrTriggerHasNoTimeSeries{})
Expand All @@ -955,8 +955,8 @@ func TestHandleErrorCheck(t *testing.T) {
trigger: &moira.Trigger{TriggerType: moira.RisingTrigger},
ttlState: NODATA,
lastCheck: &moira.CheckData{
Timestamp: 0,
State: NODATA,
Timestamp: 0,
State: NODATA,
LastSuccessfulCheckTimestamp: 0,
},
}
Expand All @@ -977,10 +977,10 @@ func TestHandleErrorCheck(t *testing.T) {
dataBase.EXPECT().PushNotificationEvent(event, true).Return(nil)
actual, err := triggerChecker.handleTriggerCheck(checkData, ErrTriggerHasNoTimeSeries{})
expected := moira.CheckData{
State: NODATA,
Timestamp: checkData.Timestamp,
EventTimestamp: checkData.Timestamp,
Message: "Trigger has no metrics, check your target",
State: NODATA,
Timestamp: checkData.Timestamp,
EventTimestamp: checkData.Timestamp,
Message: "Trigger has no metrics, check your target",
LastSuccessfulCheckTimestamp: 0,
}
So(err, ShouldBeNil)
Expand All @@ -998,8 +998,8 @@ func TestHandleErrorCheck(t *testing.T) {
trigger: &moira.Trigger{TriggerType: moira.RisingTrigger},
ttlState: ERROR,
lastCheck: &moira.CheckData{
Timestamp: time.Now().Unix(),
State: OK,
Timestamp: time.Now().Unix(),
State: OK,
LastSuccessfulCheckTimestamp: time.Now().Unix(),
},
}
Expand All @@ -1011,10 +1011,10 @@ func TestHandleErrorCheck(t *testing.T) {
dataBase.EXPECT().PushNotificationEvent(gomock.Any(), true).Return(nil)
actual, err := triggerChecker.handleTriggerCheck(checkData, ErrTriggerHasOnlyWildcards{})
expected := moira.CheckData{
State: ERROR,
Timestamp: checkData.Timestamp,
EventTimestamp: checkData.Timestamp,
Message: "Trigger never received metrics",
State: ERROR,
Timestamp: checkData.Timestamp,
EventTimestamp: checkData.Timestamp,
Message: "Trigger never received metrics",
LastSuccessfulCheckTimestamp: 0,
}
So(err, ShouldBeNil)
Expand All @@ -1031,8 +1031,8 @@ func TestHandleErrorCheck(t *testing.T) {
trigger: &moira.Trigger{TriggerType: moira.RisingTrigger},
ttlState: NODATA,
lastCheck: &moira.CheckData{
Timestamp: time.Now().Unix(),
State: OK,
Timestamp: time.Now().Unix(),
State: OK,
LastSuccessfulCheckTimestamp: time.Now().Unix(),
},
}
Expand Down Expand Up @@ -1066,8 +1066,8 @@ func TestHandleErrorCheck(t *testing.T) {
trigger: &moira.Trigger{TriggerType: moira.RisingTrigger},
ttlState: OK,
lastCheck: &moira.CheckData{
Timestamp: time.Now().Unix(),
State: OK,
Timestamp: time.Now().Unix(),
State: OK,
LastSuccessfulCheckTimestamp: 0,
},
}
Expand All @@ -1080,11 +1080,11 @@ func TestHandleErrorCheck(t *testing.T) {

actual, err := triggerChecker.handleTriggerCheck(checkData, ErrTriggerHasOnlyWildcards{})
expected := moira.CheckData{
Metrics: checkData.Metrics,
State: OK,
Timestamp: checkData.Timestamp,
EventTimestamp: checkData.Timestamp,
Message: "Trigger never received metrics",
Metrics: checkData.Metrics,
State: OK,
Timestamp: checkData.Timestamp,
EventTimestamp: checkData.Timestamp,
Message: "Trigger never received metrics",
LastSuccessfulCheckTimestamp: 0,
}
So(err, ShouldBeNil)
Expand Down Expand Up @@ -1133,8 +1133,8 @@ func TestHandleErrorCheck(t *testing.T) {
trigger: &moira.Trigger{TriggerType: moira.RisingTrigger},
ttlState: NODATA,
lastCheck: &moira.CheckData{
Timestamp: time.Now().Unix(),
State: OK,
Timestamp: time.Now().Unix(),
State: OK,
LastSuccessfulCheckTimestamp: 0,
},
}
Expand All @@ -1147,10 +1147,10 @@ func TestHandleErrorCheck(t *testing.T) {

actual, err := triggerChecker.handleTriggerCheck(checkData, target.ErrUnknownFunction{FuncName: "123"})
expected := moira.CheckData{
State: EXCEPTION,
Timestamp: checkData.Timestamp,
EventTimestamp: checkData.Timestamp,
Message: "Unknown graphite function: \"123\"",
State: EXCEPTION,
Timestamp: checkData.Timestamp,
EventTimestamp: checkData.Timestamp,
Message: "Unknown graphite function: \"123\"",
LastSuccessfulCheckTimestamp: 0,
}
So(err, ShouldBeNil)
Expand Down Expand Up @@ -1180,10 +1180,10 @@ func TestHandleErrorCheck(t *testing.T) {

actual, err := triggerChecker.handleTriggerCheck(checkData, ErrTriggerHasSameTimeSeriesNames{names: []string{"first", "second"}})
expected := moira.CheckData{
State: ERROR,
Timestamp: checkData.Timestamp,
EventTimestamp: checkData.Timestamp,
Message: "Trigger has same timeseries names: first, second",
State: ERROR,
Timestamp: checkData.Timestamp,
EventTimestamp: checkData.Timestamp,
Message: "Trigger has same timeseries names: first, second",
LastSuccessfulCheckTimestamp: 0,
}
So(err, ShouldBeNil)
Expand Down Expand Up @@ -1216,10 +1216,10 @@ func TestHandleErrorCheck(t *testing.T) {

actual, err := triggerChecker.handleTriggerCheck(checkData, ErrWrongTriggerTargets([]int{2}))
expected := moira.CheckData{
State: ERROR,
Timestamp: checkData.Timestamp,
EventTimestamp: checkData.Timestamp,
Message: "Target t2 has more than one timeseries",
State: ERROR,
Timestamp: checkData.Timestamp,
EventTimestamp: checkData.Timestamp,
Message: "Target t2 has more than one timeseries",
LastSuccessfulCheckTimestamp: 0,
}
So(err, ShouldBeNil)
Expand Down
6 changes: 3 additions & 3 deletions filter/cache_storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type Storage struct {
retentions []retentionMatcher
retentionsCache map[string]*retentionCacheItem
metricsCache map[string]*moira.MatchedMetric
logger moira.Logger
logger moira.Logger
}

// NewCacheStorage create new Storage
Expand All @@ -37,7 +37,7 @@ func NewCacheStorage(logger moira.Logger, metrics *graphite.FilterMetrics, reade
retentionsCache: make(map[string]*retentionCacheItem),
metricsCache: make(map[string]*moira.MatchedMetric),
metrics: metrics,
logger: logger,
logger: logger,
}

if err := storage.buildRetentions(bufio.NewScanner(reader)); err != nil {
Expand Down Expand Up @@ -93,7 +93,7 @@ func (storage *Storage) buildRetentions(retentionScanner *bufio.Scanner) error {
line2 := retentionScanner.Text()
splitted := strings.Split(line2, "=")

if len(splitted) < 2{
if len(splitted) < 2 {
storage.logger.Errorf("Invalid pattern found: '%s'", patternString)
continue
}
Expand Down
4 changes: 2 additions & 2 deletions filter/patterns_storage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package filter

import (
"fmt"
"testing"
"math/rand"
"strconv"
"testing"

"github.com/golang/mock/gomock"
"github.com/moira-alert/moira/metrics/graphite/go-metrics"
Expand Down Expand Up @@ -85,7 +85,7 @@ func TestParseMetricFromString(t *testing.T) {
// [n=19] One.two.three 123 1234567890.6790847778320312500

for i := 1; i < 20; i++ {
rawTimestamp := strconv.FormatFloat(float64(testTimestamp) + rand.Float64(), 'f', i, 64)
rawTimestamp := strconv.FormatFloat(float64(testTimestamp)+rand.Float64(), 'f', i, 64)
rawMetric := "One.two.three 123 " + rawTimestamp
validMetric := ValidMetricCase{rawMetric, "One.two.three", 123, testTimestamp}
metric, value, timestamp, err := storage.parseMetricFromString([]byte(validMetric.raw))
Expand Down
2 changes: 1 addition & 1 deletion notifier/notifier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func (pkg NotificationPackage) GetWindow() (from, to int64, err error) {
}

// GetMetricNames returns all metric names found in package events
func(pkg NotificationPackage) GetMetricNames() []string {
func (pkg NotificationPackage) GetMetricNames() []string {
metricNames := make([]string, 0)
for _, event := range pkg.Events {
metricNames = append(metricNames, event.Metric)
Expand Down
2 changes: 1 addition & 1 deletion plotting/helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func TestTimeValueFormatter(t *testing.T) {
fmt.Printf("%s: %s,\n%s: %s\n\n",
timeValue.Location().String(), timeValue.String(), location.String(), formatted)
So(formattedMinute, ShouldEqual, timeValue.Minute())
So(formattedHour, ShouldEqual, timeValue.Add(time.Duration(increment) * time.Hour).Hour())
So(formattedHour, ShouldEqual, timeValue.Add(time.Duration(increment)*time.Hour).Hour())
}
})
}
Expand Down
4 changes: 2 additions & 2 deletions plotting/plot.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package plotting

import (
"time"
"fmt"
"time"

"github.com/go-graphite/carbonapi/expr/types"
"github.com/wcharczuk/go-chart"
Expand Down Expand Up @@ -114,7 +114,7 @@ func (plot *Plot) GetRenderable(trigger *moira.Trigger, metricsData []*types.Met
}

if len(renderable.Series) == 0 {
return renderable, ErrNoPointsToRender{triggerName:trigger.Name}
return renderable, ErrNoPointsToRender{triggerName: trigger.Name}
}

return renderable, nil
Expand Down
2 changes: 1 addition & 1 deletion plotting/plot_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ func TestGetRenderable(t *testing.T) {
Convey("Test plots hash distances", t, func() {
for _, testCase := range plotsHashDistancesTestCases {
trigger := moira.Trigger{
Name: testCase.getTriggerName(),
Name: testCase.getTriggerName(),
TriggerType: testCase.triggerType,
}
if testCase.errorValue != nil {
Expand Down
4 changes: 2 additions & 2 deletions plotting/themes/dark/dark.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (theme *PlotTheme) GetBackgroundStyle(maxMarkLen int) chart.Style {
verticalShift := 40
horizontalShift := 20
if maxMarkLen > 4 {
horizontalShift = horizontalShift/2
horizontalShift = horizontalShift / 2
}
return chart.Style{
FillColor: drawing.ColorFromHex(theme.bgColor),
Expand Down Expand Up @@ -132,7 +132,7 @@ func (theme *PlotTheme) GetSerieStyles(curveInd int) (chart.Style, chart.Style)
pointStyle := chart.Style{
Show: true,
StrokeWidth: chart.Disabled,
DotWidth: curveWidth/2,
DotWidth: curveWidth / 2,
DotColor: curveColor.WithAlpha(90),
}
return curveStyle, pointStyle
Expand Down
4 changes: 2 additions & 2 deletions plotting/themes/light/light.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (theme *PlotTheme) GetBackgroundStyle(maxMarkLen int) chart.Style {
verticalShift := 40
horizontalShift := 20
if maxMarkLen > 4 {
horizontalShift = horizontalShift/2
horizontalShift = horizontalShift / 2
}
return chart.Style{
FillColor: drawing.ColorFromHex(theme.bgColor),
Expand Down Expand Up @@ -132,7 +132,7 @@ func (theme *PlotTheme) GetSerieStyles(curveInd int) (chart.Style, chart.Style)
pointStyle := chart.Style{
Show: true,
StrokeWidth: chart.Disabled,
DotWidth: curveWidth/2,
DotWidth: curveWidth / 2,
DotColor: curveColor.WithAlpha(90),
}
return curveStyle, pointStyle
Expand Down
1 change: 0 additions & 1 deletion senders/pushover/pushover.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,3 @@ func (sender *Sender) SendEvents(events moira.NotificationEvents, contact moira.
}
return nil
}

1 change: 0 additions & 1 deletion senders/script/script.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,3 @@ func (sender *Sender) SendEvents(events moira.NotificationEvents, contact moira.
}
return nil
}

0 comments on commit 9a24704

Please sign in to comment.