Skip to content

chore(): add new time-series key #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
e11sy merged 3 commits into from
Mar 3, 2026
Merged

chore(): add new time-series key #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47f71e0
chore(): add new time-series key
e11sy Feb 8, 2026
15fb9f9
chore(): rate-limited time-series key should stay the same
e11sy Feb 8, 2026
e740794
chore(): get time-series key method improved
e11sy Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions pkg/server/errorshandler/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func (handler *Handler) process(body []byte) ResponseMessage {

if handler.RedisClient.IsBlocked(projectId) {
handler.ErrorsBlockedByLimit.Inc()
handler.recordProjectMetrics(projectId, "events-rate-limited")
handler.recordProjectMetrics(projectId, "events-rate-limited", false)
return ResponseMessage{402, true, "Project has exceeded the events limit"}
}

Expand All @@ -83,7 +83,7 @@ func (handler *Handler) process(body []byte) ResponseMessage {
return ResponseMessage{402, true, "Failed to update rate limit"}
}
if !rateWithinLimit {
handler.recordProjectMetrics(projectId, "events-rate-limited")
handler.recordProjectMetrics(projectId, "events-rate-limited", false)
return ResponseMessage{402, true, "Rate limit exceeded"}
}

Expand All @@ -110,7 +110,7 @@ func (handler *Handler) process(body []byte) ResponseMessage {
handler.ErrorsProcessed.Inc()

// record project metrics
handler.recordProjectMetrics(projectId, "events-accepted")
handler.recordProjectMetrics(projectId, "events-accepted", true)

return ResponseMessage{200, false, "OK"}
}
Expand All @@ -133,16 +133,23 @@ func GetQueueCache(nonDefaultQueues []string) map[string]bool {
}

// getTimeSeriesKey generates a Redis TimeSeries key for project metrics
func getTimeSeriesKey(projectId, metricType, granularity string) string {
func getTimeSeriesKey(projectId, metricType, granularity string, isSystemMetric bool) string {
// flag determines which counter would be incremented
if isSystemMetric {
// ts:collector-project-%s:%s:%s could be used in admin
return fmt.Sprintf("ts:collector-project-%s:%s:%s", metricType, projectId, granularity)
}

// ts:project-%s:%s:%s is used in api for chart retrieving
return fmt.Sprintf("ts:project-%s:%s:%s", metricType, projectId, granularity)
}

// recordProjectMetrics records project metrics to Redis TimeSeries
// metricType can be: "events-accepted", "events-rate-limited", etc.
func (handler *Handler) recordProjectMetrics(projectId, metricType string) {
minutelyKey := getTimeSeriesKey(projectId, metricType, "minutely")
hourlyKey := getTimeSeriesKey(projectId, metricType, "hourly")
dailyKey := getTimeSeriesKey(projectId, metricType, "daily")
func (handler *Handler) recordProjectMetrics(projectId, metricType string, isSystemMetric bool) {
minutelyKey := getTimeSeriesKey(projectId, metricType, "minutely", isSystemMetric)
hourlyKey := getTimeSeriesKey(projectId, metricType, "hourly", isSystemMetric)
dailyKey := getTimeSeriesKey(projectId, metricType, "daily", isSystemMetric)

labels := map[string]string{
"type": "error",
Expand Down
6 changes: 3 additions & 3 deletions pkg/server/errorshandler/handler_sentry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func (handler *Handler) HandleSentry(ctx *fasthttp.RequestCtx) {

if handler.RedisClient.IsBlocked(projectId) {
handler.ErrorsBlockedByLimit.Inc()
handler.recordProjectMetrics(projectId, "events-rate-limited")
handler.recordProjectMetrics(projectId, "events-rate-limited", false)
sendAnswerHTTP(ctx, ResponseMessage{402, true, "Project has exceeded the events limit"})
return
}
Expand All @@ -115,7 +115,7 @@ func (handler *Handler) HandleSentry(ctx *fasthttp.RequestCtx) {
}

if !rateWithinLimit {
handler.recordProjectMetrics(projectId, "events-rate-limited")
handler.recordProjectMetrics(projectId, "events-rate-limited", false)
sendAnswerHTTP(ctx, ResponseMessage{402, true, "Rate limit exceeded"})
return
}
Expand Down Expand Up @@ -144,7 +144,7 @@ func (handler *Handler) HandleSentry(ctx *fasthttp.RequestCtx) {
handler.ErrorsProcessed.Inc()

// record project metrics
handler.recordProjectMetrics(projectId, "events-accepted")
handler.recordProjectMetrics(projectId, "events-accepted", true)

sendAnswerHTTP(ctx, ResponseMessage{200, false, "OK"})
}
6 changes: 3 additions & 3 deletions pkg/server/errorshandler/test_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
// Usage: handler.GenerateTestTimeSeriesData(projectId)
func (handler *Handler) GenerateTestTimeSeriesData(projectId string) error {
metricType := "events-accepted"
minutelyKey := getTimeSeriesKey(projectId, metricType, "minutely")
hourlyKey := getTimeSeriesKey(projectId, metricType, "hourly")
dailyKey := getTimeSeriesKey(projectId, metricType, "daily")
minutelyKey := getTimeSeriesKey(projectId, metricType, "minutely", true)
hourlyKey := getTimeSeriesKey(projectId, metricType, "hourly", true)
dailyKey := getTimeSeriesKey(projectId, metricType, "daily", true)

// Delete existing keys to avoid accumulation
log.Infof("Deleting existing test data keys for project %s...", projectId)
Expand Down
Loading