mode

cmd/connect/main.go

@@ -25,6 +25,7 @@ import (
 	"github.com/skip-mev/connect/v2/providers/apis/marketmap"
 	oraclefactory "github.com/skip-mev/connect/v2/providers/factories/oracle"
 	mmservicetypes "github.com/skip-mev/connect/v2/service/clients/marketmap/types"
+	promclient "github.com/skip-mev/connect/v2/service/clients/prometheus"
 	oracleserver "github.com/skip-mev/connect/v2/service/servers/oracle"
 	promserver "github.com/skip-mev/connect/v2/service/servers/prometheus"
 	mmtypes "github.com/skip-mev/connect/v2/x/marketmap/types"
@@ -83,7 +84,7 @@ var (
 const (
 	DefaultLegacyConfigPath = "./oracle.json"
 
-	defaultValidationPeriod = 10 * time.Minute
+	defaultValidationPeriod = 2 * time.Minute
 )
 
 type runMode string
@@ -426,7 +427,17 @@ func runOracle() error {
 		logger.Info("running in validation mode", zap.Int("validation period",
 			validationPeriod))
 
-		go validate(cancel, logger)
+		go func(c context.CancelFunc) {
+			defer c()
+
+			err := validate(cfg.Metrics.PrometheusServerAddress, logger)
+			if err != nil {
+				logger.Error("failed to validate metrics", zap.Error(err))
+				return
+			}
+			logger.Info("shutting down after validation")
+
+		}(cancel)
 	}
 
 	// start server (blocks).
@@ -452,9 +463,13 @@ func overwriteMarketMapEndpoint(cfg config.OracleConfig, overwrite string) (conf
 	return cfg, fmt.Errorf("no market-map provider found in config")
 }
 
-func validate(c context.CancelFunc, logger *zap.Logger) {
+func validate(address string, logger *zap.Logger) error {
+	_, err := promclient.NewClient(address, logger)
+	if err != nil {
+		return err
+	}
+
 	time.Sleep(time.Duration(validationPeriod))
 
-	logger.Info("cancelling context after validation period")
-	c()
+	return nil
 }

go.sum

@@ -947,6 +947,7 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfC
 github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U=
 github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=

pkg/http/address.go

@@ -0,0 +1,16 @@
+package http
+
+import "net"
+
+func IsValidAddress(address string) bool {
+	host, port, err := net.SplitHostPort(address)
+	if err != nil {
+		return false
+	}
+
+	if host == "" || port == "" {
+		return false
+	}
+
+	return true
+}

service/clients/prometheus/client.go

@@ -0,0 +1,50 @@
+package prometheus
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/prometheus/client_golang/api"
+	v1 "github.com/prometheus/client_golang/api/prometheus/v1"
+	"go.uber.org/zap"
+
+	libhttp "github.com/skip-mev/connect/v2/pkg/http"
+)
+
+type Client struct {
+	v1.API
+	logger *zap.Logger
+}
+
+func NewClient(address string, logger *zap.Logger) (Client, error) {
+	if logger == nil {
+		logger = zap.NewNop()
+	}
+
+	logger = logger.With(zap.String("service", "prometheus_client"))
+	logger.Info("creating prometheus client", zap.String("address", address))
+
+	// get the prometheus server address
+	if address == "" || !libhttp.IsValidAddress(address) {
+		return Client{}, fmt.Errorf("invalid prometheus server address: %s", address)
+	}
+
+	const httpPrefix = "http://"
+	if !strings.HasPrefix(address, httpPrefix) {
+		address = httpPrefix + address
+	}
+
+	// Create a Prometheus API client
+	client, err := api.NewClient(api.Config{
+		Address: address, // Address of your Prometheus server
+	})
+	if err != nil {
+		return Client{}, fmt.Errorf("failed to create prometheus client: %w", err)
+	}
+
+	// Create a new Prometheus API v1 client
+	return Client{
+		API:    v1.NewAPI(client),
+		logger: logger,
+	}, nil
+}

service/servers/prometheus/server.go

@@ -3,14 +3,14 @@ package prometheus
 import (
 	"errors"
 	"fmt"
-	"net"
 	"net/http"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"go.uber.org/zap"
 
+	libhttp "github.com/skip-mev/connect/v2/pkg/http"
 	"github.com/skip-mev/connect/v2/pkg/sync"
 )
 
@@ -34,7 +34,7 @@ type PrometheusServer struct { //nolint
 // address is set, and valid. Notice, this method does not start the server.
 func NewPrometheusServer(prometheusAddress string, logger *zap.Logger) (*PrometheusServer, error) {
 	// get the prometheus server address
-	if prometheusAddress == "" || !isValidAddress(prometheusAddress) {
+	if prometheusAddress == "" || !libhttp.IsValidAddress(prometheusAddress) {
 		return nil, fmt.Errorf("invalid prometheus server address: %s", prometheusAddress)
 	}
 	srv := &http.Server{
@@ -79,16 +79,3 @@ func (ps *PrometheusServer) Start() {
 	// close the done channel
 	close(ps.done)
 }
-
-func isValidAddress(address string) bool {
-	host, port, err := net.SplitHostPort(address)
-	if err != nil {
-		return false
-	}
-
-	if host == "" || port == "" {
-		return false
-	}
-
-	return true
-}