Merge branch 'rate-limit-metrics' into stage

Author: pavelzotikov

pkg/server/errorshandler/handler.go

@@ -73,6 +73,7 @@ func (handler *Handler) process(body []byte) ResponseMessage {
 
 	if handler.RedisClient.IsBlocked(projectId) {
 		handler.ErrorsBlockedByLimit.Inc()
+		handler.recordProjectMetrics(projectId, "events-rate-limited")
 		return ResponseMessage{402, true, "Project has exceeded the events limit"}
 	}
 
@@ -82,6 +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")
 		return ResponseMessage{402, true, "Rate limit exceeded"}
 	}
 

pkg/server/errorshandler/handler_sentry.go

@@ -102,6 +102,7 @@ func (handler *Handler) HandleSentry(ctx *fasthttp.RequestCtx) {
 
 	if handler.RedisClient.IsBlocked(projectId) {
 		handler.ErrorsBlockedByLimit.Inc()
+		handler.recordProjectMetrics(projectId, "events-rate-limited")
 		sendAnswerHTTP(ctx, ResponseMessage{402, true, "Project has exceeded the events limit"})
 		return
 	}
@@ -114,6 +115,7 @@ func (handler *Handler) HandleSentry(ctx *fasthttp.RequestCtx) {
 	}
 
 	if !rateWithinLimit {
+		handler.recordProjectMetrics(projectId, "events-rate-limited")
 		sendAnswerHTTP(ctx, ResponseMessage{402, true, "Rate limit exceeded"})
 		return
 	}
@@ -141,5 +143,8 @@ func (handler *Handler) HandleSentry(ctx *fasthttp.RequestCtx) {
 	// increment processed errors counter
 	handler.ErrorsProcessed.Inc()
 
+	// record project metrics
+	handler.recordProjectMetrics(projectId, "events-accepted")
+
 	sendAnswerHTTP(ctx, ResponseMessage{200, false, "OK"})
 }

pkg/server/server.go

@@ -145,8 +145,8 @@ func (s *Server) handler(ctx *fasthttp.RequestCtx) {
 		s.ReleaseHandler.HandleHTTP(ctx)
 	case "/api/0/envelope/":
 		s.ErrorsHandler.HandleSentry(ctx)
-	case "/test/generate-timeseries":
-		s.HandleGenerateTestTimeSeries(ctx)
+	// case "/test/generate-timeseries":
+	// 	s.HandleGenerateTestTimeSeries(ctx)
 	default:
 		ctx.Error("Not found", fasthttp.StatusNotFound)
 	}