feat: move to the same master code to check if tests are still working

Kava-Labs · Sep 6, 2024 · 9fa07f2 · 9fa07f2
1 parent 6feb607
commit 9fa07f2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 18 deletions.
diff --git a/config/config.go b/config/config.go
@@ -48,7 +48,6 @@ type Config struct {
 	MetricPruningRoutineInterval                  time.Duration
 	MetricPruningRoutineDelayFirstRun             time.Duration
 	MetricPruningMaxRequestMetricsHistoryDays     int
-	MetricOperationsEnabled                       bool
 	CacheEnabled                                  bool
 	RedisEndpointURL                              string
 	RedisPassword                                 string
@@ -102,8 +101,6 @@ const (
 	DEFAULT_METRIC_PRUNING_ENABLED                              = true
 	METRIC_PRUNING_ROUTINE_INTERVAL_SECONDS_ENVIRONMENT_KEY     = "METRIC_PRUNING_ROUTINE_INTERVAL_SECONDS"
 	// 60 seconds * 60 minutes * 24 hours = 1 day
-	METRIC_OPERATIONS_ENABLED_ENVIRONMENT_KEY                         = "METRIC_OPERATIONS_ENABLED"
-	DEFAULT_METRIC_OPERATIONS_ENABLED                                 = true
 	DEFAULT_METRIC_PRUNING_ROUTINE_INTERVAL_SECONDS                   = 86400
 	METRIC_PRUNING_ROUTINE_DELAY_FIRST_RUN_SECONDS_ENVIRONMENT_KEY    = "METRIC_PRUNING_ROUTINE_DELAY_FIRST_RUN_SECONDS"
 	DEFAULT_METRIC_PRUNING_ROUTINE_DELAY_FIRST_RUN_SECONDS            = 10
@@ -383,7 +380,6 @@ func ReadConfig() Config {
 		MetricPruningRoutineInterval:                  time.Duration(time.Duration(EnvOrDefaultInt(METRIC_PRUNING_ROUTINE_INTERVAL_SECONDS_ENVIRONMENT_KEY, DEFAULT_METRIC_PRUNING_ROUTINE_INTERVAL_SECONDS)) * time.Second),
 		MetricPruningRoutineDelayFirstRun:             time.Duration(time.Duration(EnvOrDefaultInt(METRIC_PRUNING_ROUTINE_DELAY_FIRST_RUN_SECONDS_ENVIRONMENT_KEY, DEFAULT_METRIC_PRUNING_ROUTINE_DELAY_FIRST_RUN_SECONDS)) * time.Second),
 		MetricPruningMaxRequestMetricsHistoryDays:     EnvOrDefaultInt(METRIC_PRUNING_MAX_REQUEST_METRICS_HISTORY_DAYS_ENVIRONMENT_KEY, DEFAULT_METRIC_PRUNING_MAX_REQUEST_METRICS_HISTORY_DAYS),
-		MetricOperationsEnabled:                       EnvOrDefaultBool(METRIC_OPERATIONS_ENABLED_ENVIRONMENT_KEY, DEFAULT_METRIC_OPERATIONS_ENABLED),
 		CacheEnabled:                                  EnvOrDefaultBool(CACHE_ENABLED_ENVIRONMENT_KEY, false),
 		RedisEndpointURL:                              os.Getenv(REDIS_ENDPOINT_URL_ENVIRONMENT_KEY),
 		RedisPassword:                                 os.Getenv(REDIS_PASSWORD_ENVIRONMENT_KEY),

diff --git a/main.go b/main.go
@@ -37,12 +37,6 @@ func init() {
 }
 
 func startMetricPartitioningRoutine(serviceConfig config.Config, service service.ProxyService, serviceLogger logging.ServiceLogger) <-chan error {
-	//if !serviceConfig.MetricOperationsEnabled {
-	//	serviceLogger.Info().Msg("skipping starting metric partitioning routine since it is disabled via config")
-	//
-	//	return nil
-	//}
-
 	metricPartitioningRoutineConfig := routines.MetricPartitioningRoutineConfig{
 		Interval:          serviceConfig.MetricPartitioningRoutineInterval,
 		DelayFirstRun:     serviceConfig.MetricPartitioningRoutineDelayFirstRun,
@@ -73,12 +67,6 @@ func startMetricPartitioningRoutine(serviceConfig config.Config, service service
 }
 
 func startMetricCompactionRoutine(serviceConfig config.Config, service service.ProxyService, serviceLogger logging.ServiceLogger) <-chan error {
-	//if !serviceConfig.MetricOperationsEnabled {
-	//	serviceLogger.Info().Msg("skipping starting metric compaction routine since it is disabled via config")
-	//
-	//	return nil
-	//}
-
 	metricCompactionRoutineConfig := routines.MetricCompactionRoutineConfig{
 		Interval: serviceConfig.MetricCompactionRoutineInterval,
 		Database: service.Database,
@@ -107,10 +95,8 @@ func startMetricCompactionRoutine(serviceConfig config.Config, service service.P
 }
 
 func startMetricPruningRoutine(serviceConfig config.Config, service service.ProxyService, serviceLogger logging.ServiceLogger) <-chan error {
-	//if !serviceConfig.MetricPruningEnabled || !serviceConfig.MetricOperationsEnabled {
 	if !serviceConfig.MetricPruningEnabled {
 		serviceLogger.Info().Msg("skipping starting metric pruning routine since it is disabled via config")
-
 		return make(<-chan error)
 	}