Skip to content

Commit

Permalink
metrics: fix issue with integer division (#39)
Browse files Browse the repository at this point in the history 
* metrics: fix issue with integer division

* fix jails test
  • Loading branch information
@mikeykhalil
mikeykhalil authored Apr 30, 2020
1 parent 5d315f9 commit afd4801
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions e2e/e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func TestJails(t *testing.T) {
banned := false
resetRedis(*redisAddr)
applyGuardianConfig(t, *redisAddr, config)
for i := uint64(0); i < j.Jail.Limit.Count+5; i++ {
for i := uint64(0); i < j.Jail.Limit.Count+1; i++ {
if len(os.Getenv("SYNC")) == 0 {
time.Sleep(150 * time.Millisecond) // helps prevents races due asynchronous rate limiting
}
Expand All @@ -276,9 +276,9 @@ func TestJails(t *testing.T) {
}
}
if j.Jail.Limit.Enabled {
t.Logf("sleeping for ban_duration: %v to ensure the prisoner is removed", j.Jail.BanDuration)
t.Logf("sleeping for ban_duration: %v + 2 seconds to ensure the prisoner is removed", j.Jail.BanDuration)
time.Sleep(j.Jail.BanDuration)
time.Sleep(j.Jail.Limit.Duration)
time.Sleep(2 * time.Second) // ensure that we sleep for an additional confUpdateInterval so that the configuration is updated
res := GET(t, "192.168.1.43", j.Route)
if res.StatusCode != 200 {
t.Fatalf("prisoner was never removed, received unexpected status code: %d, %v", res.StatusCode, j.Jail)
Expand Down
16 changes: 8 additions & 8 deletions pkg/guardian/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (d *DataDogReporter) Duration(request Request, blocked bool, errorOccurred
blockedTag := blockedKey + ":" + strconv.FormatBool(blocked)
errorTag := errorKey + ":" + strconv.FormatBool(errorOccurred)
tags := append([]string{blockedTag, errorTag}, d.defaultTags...)
d.client.TimeInMilliseconds(durationMetricName, float64(duration/time.Millisecond), tags, 1)
d.client.Timing(durationMetricName, duration, tags, 1)
}

d.enqueue(f)
Expand All @@ -124,7 +124,7 @@ func (d *DataDogReporter) HandledWhitelist(request Request, whitelisted bool, er
whitelistedTag := whitelistedKey + ":" + strconv.FormatBool(whitelisted)
errorTag := errorKey + ":" + strconv.FormatBool(errorOccurred)
tags := append([]string{whitelistedTag, errorTag}, d.defaultTags...)
d.client.TimeInMilliseconds(reqWhitelistMetricName, float64(duration/time.Millisecond), tags, 1.0)
d.client.Timing(reqWhitelistMetricName, duration, tags, 1.0)
}
d.enqueue(f)
}
Expand All @@ -134,7 +134,7 @@ func (d *DataDogReporter) HandledBlacklist(request Request, blacklisted bool, er
blacklistedTag := blacklistedKey + ":" + strconv.FormatBool(blacklisted)
errorTag := errorKey + ":" + strconv.FormatBool(errorOccurred)
tags := append([]string{blacklistedTag, errorTag}, d.defaultTags...)
d.client.TimeInMilliseconds(reqBlacklistMetricName, float64(duration/time.Millisecond), tags, 1.0)
d.client.Timing(reqBlacklistMetricName, duration, tags, 1.0)
}
d.enqueue(f)
}
Expand All @@ -144,7 +144,7 @@ func (d *DataDogReporter) HandledRatelimit(request Request, ratelimited bool, er
ratelimitedTag := ratelimitedKey + ":" + strconv.FormatBool(ratelimited)
errorTag := errorKey + ":" + strconv.FormatBool(errorOccurred)
tags := append([]string{ratelimitedTag, errorTag}, d.defaultTags...)
d.client.TimeInMilliseconds(reqRateLimitMetricName, float64(duration/time.Millisecond), tags, 1.0)
d.client.Timing(reqRateLimitMetricName, duration, tags, 1.0)
}
d.enqueue(f)
}
Expand All @@ -155,7 +155,7 @@ func (d *DataDogReporter) HandledRatelimitWithRoute(request Request, ratelimited
errorTag := errorKey + ":" + strconv.FormatBool(errorOccurred)
routeTag := routeKey + ":" + request.Path
tags := append([]string{ratelimitedTag, errorTag, routeTag}, d.defaultTags...)
d.client.TimeInMilliseconds(reqRateLimitMetricName, float64(duration/time.Millisecond), tags, 1.0)
d.client.Timing(reqRateLimitMetricName, duration, tags, 1.0)
}
d.enqueue(f)
}
Expand All @@ -171,7 +171,7 @@ func (d *DataDogReporter) HandledJail(request Request, blocked bool, errorOccurr
blockedTag := blockedKey + ":" + strconv.FormatBool(blocked)
errorTag := errorKey + ":" + strconv.FormatBool(errorOccurred)
tags := append(tags, []string{blockedTag, errorTag}...)
d.client.TimeInMilliseconds(reqJailMetricName, float64(duration/time.Millisecond), tags, 1.0)
d.client.Timing(reqJailMetricName, duration, tags, 1.0)
}
d.enqueue(f)
}
Expand All @@ -191,7 +191,7 @@ func (d *DataDogReporter) RedisCounterIncr(duration time.Duration, errorOccurred
f := func() {
errorTag := errorKey + ":" + strconv.FormatBool(errorOccurred)
tags := append([]string{errorTag}, d.defaultTags...)
d.client.TimeInMilliseconds(redisCounterIncrMetricName, float64(duration/time.Millisecond), tags, 1.0)
d.client.Timing(redisCounterIncrMetricName, duration, tags, 1.0)
}
d.enqueue(f)
}
Expand All @@ -200,7 +200,7 @@ func (d *DataDogReporter) RedisCounterPruned(duration time.Duration, cacheSize f
f := func() {
d.client.Gauge(redisCounterCacheSizeMetricName, cacheSize, d.defaultTags, 1)
d.client.Gauge(redisCounterPrunedMetricName, prunedCounted, d.defaultTags, 1)
d.client.TimeInMilliseconds(redisCounterPrunePassMetricName, float64(duration/time.Millisecond), d.defaultTags, 1)
d.client.Timing(redisCounterPrunePassMetricName, duration, d.defaultTags, 1)
}
d.enqueue(f)
}
Expand Down

0 comments on commit afd4801

Please sign in to comment.