chore: added sourceID and destID tags for router tracker

rudderlabs · May 9, 2024 · a7be112 · a7be112
1 parent 5d54fc5
commit a7be112
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/warehouse/bcm/backend_config.go b/warehouse/bcm/backend_config.go
@@ -8,6 +8,7 @@ import (
 	"sync"
 
 	"github.com/rudderlabs/rudder-go-kit/stats"
+
 	"github.com/rudderlabs/rudder-server/utils/misc"
 
 	"github.com/rudderlabs/rudder-server/warehouse/multitenant"
@@ -18,6 +19,7 @@ import (
 
 	"github.com/rudderlabs/rudder-go-kit/config"
 	"github.com/rudderlabs/rudder-go-kit/logger"
+
 	backendconfig "github.com/rudderlabs/rudder-server/backend-config"
 	cpclient "github.com/rudderlabs/rudder-server/warehouse/client/controlplane"
 	"github.com/rudderlabs/rudder-server/warehouse/integrations/middleware/sqlquerywrapper"
@@ -348,6 +350,7 @@ func (bcm *BackendConfigManager) persistSSLFileErrorStat(
 		"module":        "warehouse",
 		"destType":      destType,
 		"warehouseID":   misc.GetTagName(destID, sourceName, destName, misc.TailTruncateStr(sourceID, 6)),
+		"sourceID":      sourceID,
 		"destinationID": destID,
 		"errTag":        errTag,
 	}

diff --git a/warehouse/internal/api/http.go b/warehouse/internal/api/http.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/rudderlabs/rudder-go-kit/logger"
 	"github.com/rudderlabs/rudder-go-kit/stats"
+
 	backendconfig "github.com/rudderlabs/rudder-server/backend-config"
 	"github.com/rudderlabs/rudder-server/utils/misc"
 	"github.com/rudderlabs/rudder-server/warehouse/internal/model"
@@ -149,6 +150,8 @@ func (api *WarehouseAPI) processHandler(w http.ResponseWriter, r *http.Request)
 		"workspaceId": stagingFile.WorkspaceID,
 		"module":      "warehouse",
 		"destType":    payload.BatchDestination.Destination.DestinationDefinition.Name,
+		"sourceID":    payload.BatchDestination.Source.ID,
+		"destID":      payload.BatchDestination.Destination.ID,
 		"warehouseID": misc.GetTagName(
 			payload.BatchDestination.Destination.ID,
 			payload.BatchDestination.Source.Name,

diff --git a/warehouse/router/tracker.go b/warehouse/router/tracker.go
@@ -84,6 +84,8 @@ func (r *Router) Track(
 		"workspaceId": warehouse.WorkspaceID,
 		"module":      moduleName,
 		"destType":    r.destType,
+		"sourceID":    source.ID,
+		"destID":      destination.ID,
 		"warehouseID": misc.GetTagName(
 			destination.ID,
 			source.Name,

diff --git a/warehouse/router/tracker_test.go b/warehouse/router/tracker_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/rudderlabs/rudder-go-kit/stats"
 	"github.com/rudderlabs/rudder-go-kit/stats/memstats"
 	"github.com/rudderlabs/rudder-go-kit/testhelper/docker/resource/postgres"
+
 	backendconfig "github.com/rudderlabs/rudder-server/backend-config"
 	migrator "github.com/rudderlabs/rudder-server/services/sql-migrator"
 	"github.com/rudderlabs/rudder-server/utils/misc"
@@ -174,6 +175,8 @@ func TestRouter_Track(t *testing.T) {
 				"module":      moduleName,
 				"workspaceId": warehouse.WorkspaceID,
 				"destType":    handle.destType,
+				"sourceID":    sourceID,
+				"destID":      destID,
 				"warehouseID": misc.GetTagName(
 					warehouse.Destination.ID,
 					warehouse.Source.Name,