chore: sync release v1.40.1 to main branch

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.40.1](https://github.com/rudderlabs/rudder-server/compare/v1.40.0...v1.40.1) (2025-01-08)
+
+
+### Bug Fixes
+
+* warehouse router tracker ([#5407](https://github.com/rudderlabs/rudder-server/issues/5407)) ([8e314b6](https://github.com/rudderlabs/rudder-server/commit/8e314b6160c37283fbbe889f1dbad86f994943b1))
+
 ## [1.40.0](https://github.com/rudderlabs/rudder-server/compare/v1.39.0...v1.40.0) (2025-01-06)
 
 

warehouse/internal/model/warehouse.go

@@ -62,3 +62,7 @@ func (w *Warehouse) GetPreferAppendSetting() bool {
 	}
 	return value
 }
+
+func (w *Warehouse) IsEnabled() bool {
+	return w.Source.Enabled && w.Destination.Enabled
+}

warehouse/router/identities.go

@@ -18,7 +18,6 @@
 
 	"github.com/rudderlabs/rudder-server/rruntime"
 	"github.com/rudderlabs/rudder-server/utils/misc"
-	"github.com/rudderlabs/rudder-server/utils/timeutil"
 	warehouseutils "github.com/rudderlabs/rudder-server/warehouse/utils"
 )
 
@@ -309,7 +308,7 @@
 	RETURNING id
 	`, warehouseutils.WarehouseUploadsTable)
 
-	now := timeutil.Now()
+	now := r.now()
 	row := r.db.QueryRow(
 		sqlStatement,
 		warehouse.Source.ID,

warehouse/router/router.go

@@ -105,16 +105,17 @@ type Router struct {
 		stagingFilesBatchSize             config.ValueLoader[int]
 		warehouseSyncFreqIgnore           config.ValueLoader[bool]
 		cronTrackerRetries                config.ValueLoader[int64]
+		uploadBufferTimeInMin             config.ValueLoader[time.Duration]
 	}
 
 	stats struct {
-		processingPendingJobsStat      stats.Measurement
-		processingAvailableWorkersStat stats.Measurement
-		processingPickupLagStat        stats.Measurement
-		processingPickupWaitTimeStat   stats.Measurement
-
-		schedulerWarehouseLengthStat     stats.Measurement
-		schedulerTotalSchedulingTimeStat stats.Measurement
+		processingPendingJobsStat        stats.Gauge
+		processingAvailableWorkersStat   stats.Gauge
+		processingPickupLagStat          stats.Timer
+		processingPickupWaitTimeStat     stats.Timer
+		schedulerWarehouseLengthStat     stats.Gauge
+		schedulerTotalSchedulingTimeStat stats.Timer
+		cronTrackerExecTimestamp         stats.Gauge
 	}
 }
 
@@ -150,7 +151,7 @@ func New(
 	r.tenantManager = tenantManager
 	r.bcManager = bcManager
 	r.destType = destType
-	r.now = time.Now
+	r.now = timeutil.Now
 	r.triggerStore = triggerStore
 	r.createJobMarkerMap = make(map[string]time.Time)
 	r.createUploadAlways = createUploadAlways
@@ -200,7 +201,7 @@ func (r *Router) Start(ctx context.Context) error {
 		return nil
 	}))
 	g.Go(crash.NotifyWarehouse(func() error {
-		return r.CronTracker(gCtx)
+		return r.cronTracker(gCtx)
 	}))
 	return g.Wait()
 }
@@ -616,7 +617,7 @@ func (r *Router) handlePriorityForWaitingUploads(ctx context.Context, warehouse
 
 func (r *Router) uploadStartAfterTime() time.Time {
 	if r.config.enableJitterForSyncs.Load() {
-		return timeutil.Now().Add(time.Duration(rand.Intn(15)) * time.Second)
+		return r.now().Add(time.Duration(rand.Intn(15)) * time.Second)
 	}
 	return r.now()
 }
@@ -711,14 +712,32 @@ func (r *Router) loadReloadableConfig(whName string) {
 	r.config.enableJitterForSyncs = r.conf.GetReloadableBoolVar(false, "Warehouse.enableJitterForSyncs")
 	r.config.warehouseSyncFreqIgnore = r.conf.GetReloadableBoolVar(false, "Warehouse.warehouseSyncFreqIgnore")
 	r.config.cronTrackerRetries = r.conf.GetReloadableInt64Var(5, 1, "Warehouse.cronTrackerRetries")
+	r.config.uploadBufferTimeInMin = r.conf.GetReloadableDurationVar(180, time.Minute, "Warehouse.uploadBufferTimeInMin")
 }
 
 func (r *Router) loadStats() {
-	tags := stats.Tags{"destType": r.destType}
+	tags := stats.Tags{"module": moduleName, "destType": r.destType}
 	r.stats.processingPendingJobsStat = r.statsFactory.NewTaggedStat("wh_processing_pending_jobs", stats.GaugeType, tags)
 	r.stats.processingAvailableWorkersStat = r.statsFactory.NewTaggedStat("wh_processing_available_workers", stats.GaugeType, tags)
 	r.stats.processingPickupLagStat = r.statsFactory.NewTaggedStat("wh_processing_pickup_lag", stats.TimerType, tags)
 	r.stats.processingPickupWaitTimeStat = r.statsFactory.NewTaggedStat("wh_processing_pickup_wait_time", stats.TimerType, tags)
-	r.stats.schedulerWarehouseLengthStat = r.statsFactory.NewTaggedStat("wh_scheduler.warehouse_length", stats.GaugeType, tags)
-	r.stats.schedulerTotalSchedulingTimeStat = r.statsFactory.NewTaggedStat("wh_scheduler.total_scheduling_time", stats.TimerType, tags)
+	r.stats.schedulerWarehouseLengthStat = r.statsFactory.NewTaggedStat("wh_scheduler_warehouse_length", stats.GaugeType, tags)
+	r.stats.schedulerTotalSchedulingTimeStat = r.statsFactory.NewTaggedStat("wh_scheduler_total_scheduling_time", stats.TimerType, tags)
+	r.stats.cronTrackerExecTimestamp = r.statsFactory.NewTaggedStat("warehouse_cron_tracker_timestamp_seconds", stats.GaugeType, tags)
+}
+
+func (r *Router) copyWarehouses() []model.Warehouse {
+	r.configSubscriberLock.RLock()
+	defer r.configSubscriberLock.RUnlock()
+
+	warehouses := make([]model.Warehouse, len(r.warehouses))
+	copy(warehouses, r.warehouses)
+	return warehouses
+}
+
+func (r *Router) getNowSQL() string {
+	if r.nowSQL != "" {
+		return r.nowSQL
+	}
+	return "NOW()"
 }

warehouse/router/router_test.go

@@ -32,6 +32,7 @@ import (
 	"github.com/rudderlabs/rudder-server/services/notifier"
 	migrator "github.com/rudderlabs/rudder-server/services/sql-migrator"
 	"github.com/rudderlabs/rudder-server/utils/pubsub"
+	"github.com/rudderlabs/rudder-server/utils/timeutil"
 	"github.com/rudderlabs/rudder-server/warehouse/bcm"
 	"github.com/rudderlabs/rudder-server/warehouse/encoding"
 	sqlmiddleware "github.com/rudderlabs/rudder-server/warehouse/integrations/middleware/sqlquerywrapper"
@@ -143,7 +144,7 @@ func TestRouter(t *testing.T) {
 
 		db := sqlmiddleware.New(pgResource.DB)
 
-		now := time.Now()
+		now := timeutil.Now()
 
 		repoUpload := repo.NewUploads(db, repo.WithNow(func() time.Time {
 			return now

warehouse/router/scheduling_test.go

@@ -18,6 +18,7 @@ import (
 
 	backendConfig "github.com/rudderlabs/rudder-server/backend-config"
 	migrator "github.com/rudderlabs/rudder-server/services/sql-migrator"
+	"github.com/rudderlabs/rudder-server/utils/timeutil"
 	sqlmiddleware "github.com/rudderlabs/rudder-server/warehouse/integrations/middleware/sqlquerywrapper"
 	"github.com/rudderlabs/rudder-server/warehouse/internal/model"
 	"github.com/rudderlabs/rudder-server/warehouse/internal/repo"
@@ -235,7 +236,7 @@ func TestRouter_CanCreateUpload(t *testing.T) {
 					Identifier: "test_identifier_upload_frequency_exceeded",
 				}
 
-				now := time.Now()
+				now := timeutil.Now()
 
 				r := Router{}
 				r.conf = config.New()
@@ -260,7 +261,7 @@ func TestRouter_CanCreateUpload(t *testing.T) {
 					Identifier: "test_identifier_upload_frequency_exceeded",
 				}
 
-				now := time.Now()
+				now := timeutil.Now()
 
 				r := Router{}
 				r.conf = config.New()
@@ -316,7 +317,7 @@ func TestRouter_CanCreateUpload(t *testing.T) {
 				},
 			}
 
-			now := time.Now()
+			now := timeutil.Now()
 
 			r := Router{}
 			r.conf = config.New()
@@ -344,7 +345,7 @@ func TestRouter_CanCreateUpload(t *testing.T) {
 				},
 			}
 
-			now := time.Now()
+			now := timeutil.Now()
 
 			r := Router{}
 			r.conf = config.New()
@@ -453,7 +454,7 @@ func TestRouter_CanCreateUpload(t *testing.T) {
 						return tc.now
 					}
 
-					r.updateCreateJobMarker(w, time.Now())
+					r.updateCreateJobMarker(w, now)
 
 					err := r.canCreateUpload(context.Background(), w)
 					if tc.wantErr != nil {