chore: sync release v1.35.3 to main branch (#5179)

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.35.3](https://github.com/rudderlabs/rudder-server/compare/v1.35.2...v1.35.3) (2024-10-08)
+
+
+### Bug Fixes
+
+* sourceID and originalSourceID not flipped before transformation ([#5177](https://github.com/rudderlabs/rudder-server/issues/5177)) ([7b60b67](https://github.com/rudderlabs/rudder-server/commit/7b60b6718e5eab4712ca2ee312abe7c5ab691dac))
+
 ## [1.35.2](https://github.com/rudderlabs/rudder-server/compare/v1.35.1...v1.35.2) (2024-10-04)
 
 

processor/transformer/transformer.go

@@ -255,11 +255,9 @@ func (trans *handle) transform(
 	}
 	// flip sourceID and originalSourceID if it's a replay source for the purpose of any user transformation
 	// flip back afterwards
-	for _, clientEvent := range clientEvents {
-		if clientEvent.Metadata.OriginalSourceID != "" {
-			originalSourceID := clientEvent.Metadata.OriginalSourceID
-			clientEvent.Metadata.OriginalSourceID = clientEvent.Metadata.SourceID
-			clientEvent.Metadata.SourceID = originalSourceID
+	for i := range clientEvents {
+		if clientEvents[i].Metadata.OriginalSourceID != "" {
+			clientEvents[i].Metadata.OriginalSourceID, clientEvents[i].Metadata.SourceID = clientEvents[i].Metadata.SourceID, clientEvents[i].Metadata.OriginalSourceID
 		}
 	}
 	sTags := stats.Tags{
@@ -321,9 +319,7 @@ func (trans *handle) transform(
 		// response for each is an array. We flatten it out
 		for _, transformerResponse := range batch {
 			if transformerResponse.Metadata.OriginalSourceID != "" {
-				originalSourceID := transformerResponse.Metadata.SourceID
-				transformerResponse.Metadata.SourceID = transformerResponse.Metadata.OriginalSourceID
-				transformerResponse.Metadata.OriginalSourceID = originalSourceID
+				transformerResponse.Metadata.SourceID, transformerResponse.Metadata.OriginalSourceID = transformerResponse.Metadata.OriginalSourceID, transformerResponse.Metadata.SourceID
 			}
 			switch transformerResponse.StatusCode {
 			case http.StatusOK: