feat: add queries metric per chain/host (#15)

Author: freak12techno

.golangci.yml

@@ -17,7 +17,6 @@ linters:
     - funlen
     - nlreturn
     - wrapcheck
-    - gomnd
     - cyclop
     - err113
     - exhaustruct
@@ -42,3 +41,4 @@ linters:
     - mnd
     - goconst
     - execinquery
+    - nilnil

pkg/data_fetcher/data_fetcher.go

@@ -31,7 +31,7 @@ func NewDataFetcher(
 	nodesManager *tendermint.NodeManager,
 ) *DataFetcher {
 	priceFetchers := map[constants.PriceFetcherName]priceFetcher.PriceFetcher{
-		constants.PriceFetcherNameCoingecko: priceFetcher.NewCoingeckoPriceFetcher(logger),
+		constants.PriceFetcherNameCoingecko: priceFetcher.NewCoingeckoPriceFetcher(logger, metricsManager),
 	}
 
 	return &DataFetcher{

pkg/data_fetcher/denoms.go

@@ -92,8 +92,7 @@ func (f *DataFetcher) PopulateDenoms(amounts []*types.AmountWithChain) {
 				return
 			}
 
-			fetcherPrices, queryInfo, denomFetchError := foundPriceFetcher.GetPrices(notCachedDenoms)
-			f.MetricsManager.LogQueryInfo(queryInfo)
+			fetcherPrices, denomFetchError := foundPriceFetcher.GetPrices(notCachedDenoms)
 
 			if denomFetchError != nil {
 				f.Logger.Err(denomFetchError).

pkg/http/http.go

@@ -15,7 +15,10 @@ type Client struct {
 	chain  string
 }
 
-func NewClient(logger *zerolog.Logger, chain string) *Client {
+func NewClient(
+	logger *zerolog.Logger,
+	chain string,
+) *Client {
 	return &Client{
 		logger: logger.With().
 			Str("component", "http").
@@ -26,6 +29,7 @@ func NewClient(logger *zerolog.Logger, chain string) *Client {
 }
 
 func (c *Client) GetInternal(
+	host string,
 	url string,
 	query string,
 ) (io.ReadCloser, types.QueryInfo, error) {
@@ -47,11 +51,12 @@ func (c *Client) GetInternal(
 	queryInfo := types.QueryInfo{
 		Success: false,
 		Chain:   c.chain,
+		Host:    host,
 		Query:   query,
 		URL:     url,
 	}
 
-	req, err := http.NewRequest(http.MethodGet, url, nil)
+	req, err := http.NewRequest(http.MethodGet, host+url, nil)
 	if err != nil {
 		return nil, queryInfo, err
 	}
@@ -73,10 +78,11 @@ func (c *Client) GetInternal(
 }
 
 func (c *Client) GetPlain(
+	host string,
 	url string,
 	query string,
 ) ([]byte, types.QueryInfo, error) {
-	body, queryInfo, err := c.GetInternal(url, query)
+	body, queryInfo, err := c.GetInternal(host, url, query)
 	if err != nil {
 		return nil, queryInfo, err
 	}
@@ -86,15 +92,18 @@ func (c *Client) GetPlain(
 		return nil, queryInfo, err
 	}
 
+	queryInfo.Success = true
+
 	return bytes, queryInfo, nil
 }
 
 func (c *Client) Get(
+	host string,
 	url string,
 	query string,
 	target interface{},
 ) (types.QueryInfo, error) {
-	body, queryInfo, err := c.GetInternal(url, query)
+	body, queryInfo, err := c.GetInternal(host, url, query)
 	if err != nil {
 		return queryInfo, err
 	}
@@ -104,5 +113,7 @@ func (c *Client) Get(
 		return queryInfo, jsonErr
 	}
 
+	queryInfo.Success = true
+
 	return queryInfo, body.Close()
 }

pkg/http/http_test.go

@@ -12,7 +12,7 @@ func TestHttpClientErrorCreating(t *testing.T) {
 
 	logger := loggerPkg.GetNopLogger()
 	client := NewClient(logger, "chain")
-	queryInfo, err := client.Get("://test", "query", nil)
+	queryInfo, err := client.Get("://test", "", "query", nil)
 	require.Error(t, err)
 	require.False(t, queryInfo.Success)
 }

pkg/metrics/manager.go

@@ -44,12 +44,12 @@ func NewManager(logger *zerolog.Logger, config types.MetricsConfig) *Manager {
 	successQueriesCounter := prometheus.NewCounterVec(prometheus.CounterOpts{
 		Name: constants.PrometheusMetricsPrefix + "queries_successful",
 		Help: "Counter of successful queries towards the external services.",
-	}, []string{"chain", "query"})
+	}, []string{"chain", "query", "host"})
 
 	failedQueriesCounter := prometheus.NewCounterVec(prometheus.CounterOpts{
 		Name: constants.PrometheusMetricsPrefix + "queries_failed",
 		Help: "Counter of failed queries towards the external services.",
-	}, []string{"chain", "query"})
+	}, []string{"chain", "query", "host"})
 
 	appVersionGauge := prometheus.NewGaugeVec(prometheus.GaugeOpts{
 		Name: constants.PrometheusMetricsPrefix + "version",
@@ -127,11 +127,19 @@ func (m *Manager) LogAppVersion(version string) {
 func (m *Manager) LogQueryInfo(queryInfo types.QueryInfo) {
 	if queryInfo.Success {
 		m.successQueriesCounter.
-			With(prometheus.Labels{"chain": queryInfo.Chain, "query": queryInfo.Query}).
+			With(prometheus.Labels{
+				"chain": queryInfo.Chain,
+				"query": queryInfo.Query,
+				"host":  queryInfo.Host,
+			}).
 			Inc()
 	} else {
 		m.failedQueriesCounter.
-			With(prometheus.Labels{"chain": queryInfo.Chain, "query": queryInfo.Query}).
+			With(prometheus.Labels{
+				"chain": queryInfo.Chain,
+				"query": queryInfo.Query,
+				"host":  queryInfo.Host,
+			}).
 			Inc()
 	}
 }

pkg/price_fetcher/coingecko.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"main/pkg/constants"
 	"main/pkg/http"
+	"main/pkg/metrics"
 	"main/pkg/types"
 	"main/pkg/utils"
 	"strings"
@@ -12,39 +13,47 @@ import (
 )
 
 type CoingeckoPriceFetcher struct {
-	Client *http.Client
-	Logger zerolog.Logger
+	Client         *http.Client
+	Logger         zerolog.Logger
+	MetricsManager *metrics.Manager
 }
 
-func NewCoingeckoPriceFetcher(logger *zerolog.Logger) *CoingeckoPriceFetcher {
+func NewCoingeckoPriceFetcher(
+	logger *zerolog.Logger,
+	metricsManager *metrics.Manager,
+) *CoingeckoPriceFetcher {
 	return &CoingeckoPriceFetcher{
-		Client: http.NewClient(logger, "coingecko"),
-		Logger: logger.With().Str("component", "coingecko_price_fetcher").Logger(),
+		Client:         http.NewClient(logger, "coingecko"),
+		Logger:         logger.With().Str("component", "coingecko_price_fetcher").Logger(),
+		MetricsManager: metricsManager,
 	}
 }
 
-func (c *CoingeckoPriceFetcher) GetPrices(denomInfos []*types.Denom) (Prices, types.QueryInfo, error) {
+func (c *CoingeckoPriceFetcher) GetPrices(denomInfos []*types.Denom) (Prices, error) {
 	currenciesToFetch := utils.Map(denomInfos, func(denomInfo *types.Denom) string {
 		return denomInfo.CoingeckoCurrency.String
 	})
 
 	var coingeckoResponse map[string]map[string]float64
-	query, err := c.Client.Get(
+	queryInfo, err := c.Client.Get(
+		"https://api.coingecko.com",
 		fmt.Sprintf(
-			"https://api.coingecko.com/api/v3/simple/price?ids=%s&vs_currencies=%s",
+			"/api/v3/simple/price?ids=%s&vs_currencies=%s",
 			strings.Join(currenciesToFetch, ","),
 			constants.CoingeckoBaseCurrency,
 		),
 		"fetch_prices",
 		&coingeckoResponse,
 	)
 
+	c.MetricsManager.LogQueryInfo(queryInfo)
+
 	if err != nil {
 		c.Logger.Error().
 			Err(err).
 			Strs("currencies", currenciesToFetch).
 			Msg("Could not get rates, probably rate-limiting")
-		return map[string]map[string]float64{}, query, err
+		return map[string]map[string]float64{}, err
 	}
 
 	result := make(map[string]map[string]float64)
@@ -64,7 +73,7 @@ func (c *CoingeckoPriceFetcher) GetPrices(denomInfos []*types.Denom) (Prices, ty
 		}
 	}
 
-	return result, query, nil
+	return result, nil
 }
 
 func (c *CoingeckoPriceFetcher) Name() string {

pkg/price_fetcher/price_fetcher.go

@@ -23,6 +23,6 @@ func (p *Prices) Get(chain string, denom string) (float64, bool) {
 }
 
 type PriceFetcher interface {
-	GetPrices(denomInfos []*types.Denom) (Prices, types.QueryInfo, error)
+	GetPrices(denomInfos []*types.Denom) (Prices, error)
 	Name() string
 }