refactor: rename prometheus to "metrics"

Author: d-Rickyy-b

cmd/certstream-server-go/main.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/d-Rickyy-b/certstream-server-go/internal/certificatetransparency"
 	"github.com/d-Rickyy-b/certstream-server-go/internal/config"
-	"github.com/d-Rickyy-b/certstream-server-go/internal/prometheus"
+	"github.com/d-Rickyy-b/certstream-server-go/internal/metrics"
 	"github.com/d-Rickyy-b/certstream-server-go/internal/web"
 )
 
@@ -46,11 +46,11 @@ func setupMetrics(conf config.Config, webserver *web.WebServer) {
 		if (conf.Prometheus.ListenAddr == "" || conf.Prometheus.ListenAddr == conf.Webserver.ListenAddr) &&
 			(conf.Prometheus.ListenPort == 0 || conf.Prometheus.ListenPort == conf.Webserver.ListenPort) {
 			log.Println("Starting prometheus server on same interface as webserver")
-			webserver.RegisterPrometheus(conf.Prometheus.MetricsURL, prometheus.WritePrometheus)
+			webserver.RegisterPrometheus(conf.Prometheus.MetricsURL, metrics.WritePrometheus)
 		} else {
 			log.Println("Starting prometheus server on new interface")
-			metricsServer := web.NewMetricsServer(conf.Prometheus.ListenAddr, conf.Prometheus.ListenPort, conf.Webserver.CertPath, conf.Webserver.CertKeyPath)
-			metricsServer.RegisterPrometheus(conf.Prometheus.MetricsURL, prometheus.WritePrometheus)
+			metricsServer := web.NewMetricsServer(conf.Prometheus.ListenAddr, conf.Prometheus.ListenPort, conf.Prometheus.CertPath, conf.Prometheus.CertKeyPath)
+			metricsServer.RegisterPrometheus(conf.Prometheus.MetricsURL, metrics.WritePrometheus)
 			go metricsServer.Start()
 		}
 	}

internal/certificatetransparency/ct-watcher.go

@@ -243,6 +243,7 @@ func certHandler(entryChan chan certstream.Entry) {
 		// Run json encoding in the background and send the result to the clients.
 		web.ClientHandler.Broadcast <- entry
 
+		// Update metrics
 		url := entry.Data.Source.NormalizedURL
 		operator := entry.Data.Source.Operator
 

internal/config/config.go

@@ -160,12 +160,12 @@ func validateConfig(config Config) bool {
 	if config.Prometheus.Enabled {
 
 		if config.Prometheus.ListenAddr == "" || net.ParseIP(config.Prometheus.ListenAddr) == nil {
-			log.Fatalln("Prometheus export IP is not a valid IP")
+			log.Fatalln("Metrics export IP is not a valid IP")
 			return false
 		}
 
 		if config.Prometheus.ListenPort == 0 {
-			log.Fatalln("Prometheus export port is not set")
+			log.Fatalln("Metrics export port is not set")
 			return false
 		}
 
@@ -179,7 +179,7 @@ func validateConfig(config Config) bool {
 				// Provided entry is not an IP, check if it's a CIDR range
 				_, _, err := net.ParseCIDR(ip)
 				if err != nil {
-					log.Fatalln("Invalid IP in prometheus whitelist: ", ip)
+					log.Fatalln("Invalid IP in metrics whitelist: ", ip)
 					return false
 				}
 			}

internal/prometheus/prometheus.go internal/metrics/prometheus.gointernal/prometheus/prometheus.go renamed to internal/metrics/prometheus.go

@@ -1,4 +1,4 @@
-package prometheus
+package metrics
 
 import (
 	"fmt"

internal/web/server.go

@@ -53,7 +53,7 @@ func IPWhitelist(next http.Handler) http.Handler {
 		ip, ipNet, err := net.ParseCIDR(element)
 		if err != nil {
 			if net.ParseIP(element) == nil {
-				log.Println("Invalid IP in prometheus whitelist: ", element)
+				log.Println("Invalid IP in metrics whitelist: ", element)
 			}
 
 			ipList = append(ipList, ip)
@@ -226,7 +226,7 @@ func (ws *WebServer) initServer() {
 	}
 }
 
-// NewMetricsServer creates a new webserver that listens on the given port and provides metrics for a prometheus server.
+// NewMetricsServer creates a new webserver that listens on the given port and provides metrics for a metrics server.
 func NewMetricsServer(networkIf string, port int, certPath, keyPath string) *WebServer {
 	server := &WebServer{
 		networkIf: networkIf,