From 84f9a42391627f01e30fda8185c47acde0b31e88 Mon Sep 17 00:00:00 2001
From: Junwei Zhao <wahyd4@gmail.com>
Date: Fri, 15 Apr 2022 22:15:57 +1000
Subject: [PATCH] remove ip from prometheus labels to reduce query complexicity

---
 handlers/badges.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/handlers/badges.go b/handlers/badges.go
index ecbd386..114415b 100644
--- a/handlers/badges.go
+++ b/handlers/badges.go
@@ -32,12 +32,12 @@ var (
 	badgeRequested = promauto.NewCounterVec(prometheus.CounterOpts{
 		Name: "badge_requested_total",
 		Help: "The total request number of badges",
-	}, []string{"badge", "ip"})
+	}, []string{"badge"})
 
 	aria2UIImageCounter = promauto.NewCounterVec(prometheus.CounterOpts{
 		Name: "aria2_ui_docker_counter",
 		Help: "The counter for junv's aria2-ui docker image updates checker",
-	}, []string{"badge", "version", "ip", "arch"})
+	}, []string{"badge", "version", "arch"})
 
 	badgeGenerationTime = promauto.NewHistogram(prometheus.HistogramOpts{
 		Name:    "badge_generation_time",
@@ -238,15 +238,14 @@ func (handler *BadgesHandler) generateBadgeValue(c *gin.Context) error {
 	if !internalRequest {
 		badgeRequested.With(map[string]string{
 			"badge": queryName,
-			"ip":    utils.GetUserIP(c.Request),
 		}).Inc()
 		aria2UIImageCounter.With(map[string]string{
 			"badge":   queryName,
 			"version": c.Query("version"),
-			"ip":      utils.GetUserIP(c.Request),
 			"arch":    c.Query("arch"),
 		}).Inc()
 	}
+	logrus.Infof("Request %s from IP %s version and arch %s", badge.ULID, utils.GetUserIP(c.Request), c.Query("version"), c.Query("arch"))
 	c.String(http.StatusOK, "%s", metric.TextValue)
 	return nil
 }
@@ -325,7 +324,6 @@ func (handler *BadgesHandler) generateSVG(c *gin.Context, colorScheme ColorSchem
 		badgeGenerationTime.Observe(float64(time.Since(startTime).Milliseconds()))
 		badgeRequested.With(map[string]string{
 			"badge": queryName,
-			"ip":    utils.GetUserIP(c.Request),
 		}).Inc()
 	}