Fix tests

Signed-off-by: Justin Jung <[email protected]>

Author: justinjung04

integration/resource_based_limiter_test.go

@@ -1,5 +1,5 @@
-//go:build requires_docker
-// +build requires_docker
+//go:build integration_querier
+// +build integration_querier
 
 package integration
 
@@ -9,6 +9,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/cortexproject/cortex/integration/e2e"
+	e2edb "github.com/cortexproject/cortex/integration/e2e/db"
+	"github.com/cortexproject/cortex/integration/e2ecortex"
 )
 
 func Test_ResourceBasedLimiter_shouldStartWithoutError(t *testing.T) {
@@ -17,21 +19,22 @@ func Test_ResourceBasedLimiter_shouldStartWithoutError(t *testing.T) {
 	defer s.Close()
 
 	flags := mergeFlags(BlocksStorageFlags(), map[string]string{
-		"-monitored.resource": "cpu,heap",
+		"-monitored.resources": "cpu,heap",
 	})
 
 	// Start dependencies.
 	consul := e2edb.NewConsul()
-	require.NoError(t, s.StartAndWaitReady(consul))
+	minio := e2edb.NewMinio(9000, flags["-blocks-storage.s3.bucket-name"])
+	require.NoError(t, s.StartAndWaitReady(consul, minio))
 
 	// Start Cortex components.
 	ingester := e2ecortex.NewIngester("ingester", e2ecortex.RingStoreConsul, consul.NetworkHTTPEndpoint(), mergeFlags(flags, map[string]string{
-		"-ingester.instance-limits.cpu-utilization":  0.8,
-		"-ingester.instance-limits.heap-utilization": 0.8,
+		"-ingester.instance-limits.cpu-utilization":  "0.8",
+		"-ingester.instance-limits.heap-utilization": "0.8",
 	}), "")
 	storeGateway := e2ecortex.NewStoreGateway("store-gateway", e2ecortex.RingStoreConsul, consul.NetworkHTTPEndpoint(), mergeFlags(flags, map[string]string{
-		"-store-gateway.instance-limits.cpu-utilization":  0.8,
-		"-store-gateway.instance-limits.heap-utilization": 0.8,
+		"-store-gateway.instance-limits.cpu-utilization":  "0.8",
+		"-store-gateway.instance-limits.heap-utilization": "0.8",
 	}), "")
 	require.NoError(t, s.StartAndWaitReady(ingester, storeGateway))
 }

pkg/cortex/modules.go

@@ -770,10 +770,12 @@ func (t *Cortex) initQueryScheduler() (services.Service, error) {
 }
 
 func (t *Cortex) initResourceMonitor() (services.Service, error) {
-	if len(t.Cfg.MonitoredResources) == 0 {
+	if t.Cfg.MonitoredResources.String() == "" || len(t.Cfg.MonitoredResources) == 0 {
 		return nil, nil
 	}
 
+	util_log.WarnExperimentalUse(fmt.Sprintf("resource monitor for [%s]", t.Cfg.MonitoredResources.String()))
+
 	containerLimits := make(map[resource.Type]float64)
 	for _, res := range t.Cfg.MonitoredResources {
 		switch resource.Type(res) {
@@ -788,7 +790,6 @@ func (t *Cortex) initResourceMonitor() (services.Service, error) {
 
 	var err error
 	t.ResourceMonitor, err = resource.NewMonitor(containerLimits, prometheus.DefaultRegisterer)
-	util_log.WarnExperimentalUse("resource monitor")
 	return t.ResourceMonitor, err
 }
 
@@ -797,7 +798,7 @@ func (t *Cortex) setupModuleManager() error {
 
 	// Register all modules here.
 	// RegisterModule(name string, initFn func()(services.Service, error))
-	mm.RegisterModule(ResourceMonitor, t.initResourceMonitor)
+	mm.RegisterModule(ResourceMonitor, t.initResourceMonitor, modules.UserInvisibleModule)
 	mm.RegisterModule(Server, t.initServer, modules.UserInvisibleModule)
 	mm.RegisterModule(API, t.initAPI, modules.UserInvisibleModule)
 	mm.RegisterModule(RuntimeConfig, t.initRuntimeConfig, modules.UserInvisibleModule)

pkg/util/resource/scanner.go

@@ -39,5 +39,5 @@ func newHeapScanner() (scanner, error) {
 
 func (s *heapScanner) scan() (float64, error) {
 	metrics.Read(s.metricSamples)
-	return s.metricSamples[0].Value.Float64(), nil
+	return float64(s.metricSamples[0].Value.Uint64()), nil
 }