feat: add more metrics to prometheus exporter

Author: d-Rickyy-b

internal/bot/bot.go

@@ -11,6 +11,7 @@ import (
 	"log"
 	"net/http"
 	"net/url"
+	"time"
 
 	"github.com/PaulSonOfLars/gotgbot/v2/ext/handlers/filters/message"
 
@@ -219,6 +220,7 @@ func showPriceagentDetail(b *gotgbot.Bot, ctx *ext.Context) error {
 		},
 	}
 
+	// Check if the initial message contained a photo, if yes, we're coming from the price history graph
 	if len(cb.Message.Photo) > 0 {
 		bot.DeleteMessage(ctx.EffectiveChat.Id, cb.Message.MessageId)
 
@@ -345,6 +347,7 @@ func deletePriceagentHandler(b *gotgbot.Bot, ctx *ext.Context) error {
 }
 
 func newUserHandler(_ *gotgbot.Bot, ctx *ext.Context) error {
+	prometheus.TotalUserInteractions.Inc()
 	// Create user in databse if they don't exist already
 	if !ctx.EffectiveSender.IsUser() {
 		return nil
@@ -484,6 +487,15 @@ func Start(botConfig config.Config) {
 	if botConfig.Prometheus.Enabled {
 		exportAddr := fmt.Sprintf("%s:%d", botConfig.Prometheus.ExportIP, botConfig.Prometheus.ExportPort)
 		prometheus.StartPrometheusExporter(exportAddr)
+
+		// Periodically update the metrics from the database
+		go func() {
+			prometheus.TotalUniquePriceagentsValue = database.GetPriceAgentCount()
+			prometheus.TotalUniqueUsersValue = database.GetUserCount()
+			prometheus.TotalUniqueWishlistPriceagentsValue = database.GetPriceAgentWishlistCount()
+			prometheus.TotalUniqueProductPriceagentsValue = database.GetPriceAgentProductCount()
+			time.Sleep(time.Second * 60)
+		}()
 	}
 
 	updater.Idle()

internal/bot/pricehistory.go

@@ -4,6 +4,7 @@ import (
 	"GoGeizhalsBot/internal/bot/models"
 	"GoGeizhalsBot/internal/database"
 	"GoGeizhalsBot/internal/geizhals"
+	"GoGeizhalsBot/internal/prometheus"
 	"bytes"
 	"fmt"
 	"io"
@@ -145,6 +146,7 @@ func getPriceagentFromContext(ctx *ext.Context) (models.PriceAgent, error) {
 
 // renderChart renders a price history chart to the given writer.
 func renderChart(priceagent models.PriceAgent, history geizhals.PriceHistory, since time.Time, w io.Writer) {
+	prometheus.GraphsRendered.Inc()
 	darkFontColor := drawing.ColorFromHex("c2c2c2")
 	fontColor := darkFontColor
 

internal/geizhals/geizhals.go

@@ -1,6 +1,7 @@
 package geizhals
 
 import (
+	"GoGeizhalsBot/internal/prometheus"
 	"fmt"
 	"log"
 	"net/http"
@@ -72,9 +73,11 @@ func downloadHTML(entityURL string) (*goquery.Document, int, error) {
 		log.Println("Using proxy: ", proxyURL)
 	}
 
+	prometheus.GeizhalsHTTPRequests.Inc()
 	resp, getErr := httpClient.Get(entityURL)
 	if getErr != nil {
 		log.Println(getErr)
+		prometheus.HttpErrors.Inc()
 		return nil, 0, fmt.Errorf("error while downloading content from Geizhals: %w", getErr)
 	}
 	// Cleanup when this function ends

internal/prometheus/prometheus.go

@@ -1,31 +1,36 @@
 package prometheus
 
 import (
-	"GoGeizhalsBot/internal/database"
 	"net/http"
 
 	"github.com/VictoriaMetrics/metrics"
 )
 
 var (
-	totalUniqueUsers = metrics.NewGauge("gogeizhalsbot_unique_users_total", func() float64 {
-		return float64(database.GetUserCount())
+	TotalUniqueUsersValue int64
+	totalUniqueUsers      = metrics.NewGauge("gogeizhalsbot_unique_users_total", func() float64 {
+		return float64(TotalUniqueUsersValue)
 	})
-	totalUniquePriceagents = metrics.NewGauge("gogeizhalsbot_unique_priceagents", func() float64 {
-		return float64(database.GetPriceAgentCount())
+
+	TotalUniquePriceagentsValue int64
+	totalUniquePriceagents      = metrics.NewGauge("gogeizhalsbot_unique_priceagents", func() float64 {
+		return float64(TotalUniquePriceagentsValue)
 	})
-	totalUniqueProductPriceagents = metrics.NewGauge("gogeizhalsbot_unique_priceagents{type=\"product\"}", func() float64 {
-		return float64(database.GetPriceAgentProductCount())
+
+	TotalUniqueProductPriceagentsValue int64
+	totalUniqueProductPriceagents      = metrics.NewGauge("gogeizhalsbot_unique_priceagents{type=\"product\"}", func() float64 {
+		return float64(TotalUniqueProductPriceagentsValue)
 	})
-	totalUniqueWishlistPriceagents = metrics.NewGauge("gogeizhalsbot_unique_priceagents{type=\"wishlist\"}", func() float64 {
-		return float64(database.GetPriceAgentWishlistCount())
+
+	TotalUniqueWishlistPriceagentsValue int64
+	totalUniqueWishlistPriceagents      = metrics.NewGauge("gogeizhalsbot_unique_priceagents{type=\"wishlist\"}", func() float64 {
+		return float64(TotalUniqueWishlistPriceagentsValue)
 	})
-	totalUniqueProductPriceagentsValue int64
 
 	TotalUserInteractions   = metrics.NewCounter("gogeizhalsbot_user_interactions_total")
 	GeizhalsHTTPRequests    = metrics.NewCounter("gogeizhalsbot_geizhals_http_requests_total")
 	PriceagentNotifications = metrics.NewCounter("gogeizhalsbot_priceagent_notifications_total")
-	ProxyErrors             = metrics.NewCounter("gogeizhalsbot_proxy_errors_total")
+	HttpErrors              = metrics.NewCounter("gogeizhalsbot_http_errors_total")
 	GraphsRendered          = metrics.NewCounter("gogeizhalsbot_graphs_rendered_total")
 )