Skip to content

Commit 4d83c2d

Browse files
authored
Merge branch 'master' into chore.cacheParametersQuery
2 parents d33cf93 + dbd46bf commit 4d83c2d

File tree

90 files changed

+4766
-1332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+4766
-1332
lines changed

.github/workflows/tests.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
run: go test -v ./integration_test/docker_test/docker_test.go -count 1
3535
env:
3636
ENTERPRISE_TOKEN: ${{ secrets.ENTERPRISE_TOKEN }}
37-
RSERVER_TRANSFORMER_FORCE_COMPACTION_ENABLED: true
3837

3938
- name: oss
4039
if: matrix.FEATURES == 'oss'
@@ -126,7 +125,6 @@ jobs:
126125
run: FORCE_RUN_INTEGRATION_TESTS=true make test exclude="/rudder-server/(jobsdb|integration_test|processor|regulation-worker|router|services|suppression-backup-service|warehouse)"
127126
env:
128127
RSERVER_PROCESSOR_ENABLE_CONCURRENT_STORE: "true"
129-
RSERVER_TRANSFORMER_FORCE_COMPACTION_ENABLED: "true"
130128
- name: Upload coverage report
131129
uses: actions/upload-artifact@v4
132130
with:
@@ -195,7 +193,6 @@ jobs:
195193
SNOWPIPE_STREAMING_KEYPAIR_ENCRYPTED_INTEGRATION_TEST_CREDENTIALS: ${{ secrets.SNOWPIPE_STREAMING_KEYPAIR_ENCRYPTED_INTEGRATION_TEST_CREDENTIALS }}
196194
SNOWFLAKE_PRIVILEGE_INTEGRATION_TEST_CREDENTIALS: ${{ secrets.SNOWFLAKE_PRIVILEGE_INTEGRATION_TEST_CREDENTIALS }}
197195
RSERVER_PROCESSOR_ENABLE_CONCURRENT_STORE: "true"
198-
RSERVER_TRANSFORMER_FORCE_COMPACTION_ENABLED: "true"
199196
run: FORCE_RUN_INTEGRATION_TESTS=true make test exclude="${{ matrix.exclude }}" package=${{ matrix.package }}
200197
- name: Sanitize name for Artifact
201198
run: |

.github/workflows/verify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,5 @@ jobs:
7777
- name: golangci-lint
7878
uses: golangci/golangci-lint-action@v7
7979
with:
80-
version: v2.0.2
80+
version: v2.1.1
8181
args: -v

CHANGELOG.md

+49
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,54 @@
11
# Changelog
22

3+
## [1.48.0](https://github.com/rudderlabs/rudder-server/compare/v1.47.0...v1.48.0) (2025-04-28)
4+
5+
6+
### Features
7+
8+
* introduce common http client for reporting ([#5669](https://github.com/rudderlabs/rudder-server/issues/5669)) ([594bdce](https://github.com/rudderlabs/rudder-server/commit/594bdce9d4b04b5a15c661bd6f7ae9a875b56977))
9+
* populate bytesPerTable for warehouse process API ([#5737](https://github.com/rudderlabs/rudder-server/issues/5737)) ([fd46379](https://github.com/rudderlabs/rudder-server/commit/fd4637910b28935cc9ba1c6dc62d15086dfdd08b))
10+
* query load files using upload_id instead of staging_file_id ([#5700](https://github.com/rudderlabs/rudder-server/issues/5700)) ([3749ba9](https://github.com/rudderlabs/rudder-server/commit/3749ba96e6d0e75e9286d49e07527fb73e3b8a21))
11+
* support for creating upload v2 notifier jobs ([#5729](https://github.com/rudderlabs/rudder-server/issues/5729)) ([dbc830f](https://github.com/rudderlabs/rudder-server/commit/dbc830f2aab30f9bc3371ee18ea667e08db2ea3b))
12+
* use header augmenter for router transformer client ([#5640](https://github.com/rudderlabs/rudder-server/issues/5640)) ([3749ba9](https://github.com/rudderlabs/rudder-server/commit/3749ba96e6d0e75e9286d49e07527fb73e3b8a21))
13+
14+
15+
### Bug Fixes
16+
17+
* httplb client doesn't respect connection limits ([#5773](https://github.com/rudderlabs/rudder-server/issues/5773)) ([ef0a15e](https://github.com/rudderlabs/rudder-server/commit/ef0a15e0b7b79f3bcb1eb3b4069c90afe71da34c))
18+
* jobsdb payload limit used compressed column sizes instead of actual payload length ([#5723](https://github.com/rudderlabs/rudder-server/issues/5723)) ([c711b25](https://github.com/rudderlabs/rudder-server/commit/c711b25cac2e03b12c356244cbd4e8f9f7ced390))
19+
* race condition in table schema updates causing incorrect schema to be saved ([#5756](https://github.com/rudderlabs/rudder-server/issues/5756)) ([f5ab51a](https://github.com/rudderlabs/rudder-server/commit/f5ab51a0c2407a4d79cd86ab2e7eebe7104021e2))
20+
* use copy to load table in append mode for redshift([#5743](https://github.com/rudderlabs/rudder-server/issues/5743)) ([877da25](https://github.com/rudderlabs/rudder-server/commit/877da256a894df506ca8e5ab4e5a4b9896ae77dd))
21+
* use warehouse transformer event instead of using processor event ([#5764](https://github.com/rudderlabs/rudder-server/issues/5764)) ([f51e260](https://github.com/rudderlabs/rudder-server/commit/f51e260baf5f79a723d14a373052e32264a71a4e))
22+
* version downgrade for databricks-sql-go to 1.6.1 ([#5741](https://github.com/rudderlabs/rudder-server/issues/5741)) ([c711b25](https://github.com/rudderlabs/rudder-server/commit/c711b25cac2e03b12c356244cbd4e8f9f7ced390))
23+
* warehouse extracting messageId and receivedAt from event payload ([#5757](https://github.com/rudderlabs/rudder-server/issues/5757)) ([f5ab51a](https://github.com/rudderlabs/rudder-server/commit/f5ab51a0c2407a4d79cd86ab2e7eebe7104021e2))
24+
25+
26+
### Miscellaneous
27+
28+
* add destination type in metrics ([#5727](https://github.com/rudderlabs/rudder-server/issues/5727)) ([fa38f34](https://github.com/rudderlabs/rudder-server/commit/fa38f34b7790e27150a469774273a4a9a1675873))
29+
* **batchrouter:** limiter cleanup adjust stats and use harmonized config ([#5783](https://github.com/rudderlabs/rudder-server/issues/5783)) ([96aba9d](https://github.com/rudderlabs/rudder-server/commit/96aba9d2c213d01eca8deda774eed04204e9db02))
30+
* change jobsdb payload column type default to text ([#5746](https://github.com/rudderlabs/rudder-server/issues/5746)) ([0f436e7](https://github.com/rudderlabs/rudder-server/commit/0f436e79c2fc164466fa02035eff5228596da823))
31+
* configure pubsub publish settings ([#5755](https://github.com/rudderlabs/rudder-server/issues/5755)) ([e481992](https://github.com/rudderlabs/rudder-server/commit/e4819927e965c074d6de2a4fdd8b456d62cbe674))
32+
* **deps:** bump google.golang.org/api from 0.228.0 to 0.229.0 in the frequent group ([#5734](https://github.com/rudderlabs/rudder-server/issues/5734)) ([32854cc](https://github.com/rudderlabs/rudder-server/commit/32854cc6f1229cb2c6e0a6bc1d488c53efac5d0f))
33+
* **deps:** bump the frequent group with 3 updates ([#5769](https://github.com/rudderlabs/rudder-server/issues/5769)) ([12b7d96](https://github.com/rudderlabs/rudder-server/commit/12b7d96e0d0a7cfe663fef21beeb6cb0bd426d05))
34+
* disable transformer compaction by default ([#5766](https://github.com/rudderlabs/rudder-server/issues/5766)) ([c504aa0](https://github.com/rudderlabs/rudder-server/commit/c504aa05133971cf00295d1378a1b69af3553dc5))
35+
* granular configuration for adaptive rate limiting ([#5739](https://github.com/rudderlabs/rudder-server/issues/5739)) ([c711b25](https://github.com/rudderlabs/rudder-server/commit/c711b25cac2e03b12c356244cbd4e8f9f7ced390))
36+
* improve BRT performance ([#5730](https://github.com/rudderlabs/rudder-server/issues/5730)) ([61642c8](https://github.com/rudderlabs/rudder-server/commit/61642c82b324bdbed3ecb3b13c098aca9b00d5d0))
37+
* **jobsdb:** remove jobMinRowsMigrateThres configuration option ([#5763](https://github.com/rudderlabs/rudder-server/issues/5763)) ([5d2fae9](https://github.com/rudderlabs/rudder-server/commit/5d2fae9cb2ca6dab5bfe2384a55fd29064fb44c4))
38+
* processor UT mirroring ([#5710](https://github.com/rudderlabs/rudder-server/issues/5710)) ([f4f056c](https://github.com/rudderlabs/rudder-server/commit/f4f056c28cfb45ae21aa5396d779cce167042be2))
39+
* remove payload logging ([#5447](https://github.com/rudderlabs/rudder-server/issues/5447)) ([8e08c11](https://github.com/rudderlabs/rudder-server/commit/8e08c11b5547cadf7059be074ea43bc3ca65e864))
40+
* trim down tracking plan validation payload ([#5749](https://github.com/rudderlabs/rudder-server/issues/5749)) ([e711579](https://github.com/rudderlabs/rudder-server/commit/e711579eac45033cd8138cbd24172b15aae93bd0))
41+
* use reloadable limiters ([#5744](https://github.com/rudderlabs/rudder-server/issues/5744)) ([d344d40](https://github.com/rudderlabs/rudder-server/commit/d344d406ad0b8489281727c40506cfcdabc59e46))
42+
* use transformer compaction by default ([#5740](https://github.com/rudderlabs/rudder-server/issues/5740)) ([53792f2](https://github.com/rudderlabs/rudder-server/commit/53792f25451e949932b54ed5acc424816945466d))
43+
44+
## [1.47.2](https://github.com/rudderlabs/rudder-server/compare/v1.47.1...v1.47.2) (2025-04-23)
45+
46+
47+
### Bug Fixes
48+
49+
* race condition in table schema updates causing incorrect schema to be saved ([#5756](https://github.com/rudderlabs/rudder-server/issues/5756)) ([5ec12a0](https://github.com/rudderlabs/rudder-server/commit/5ec12a074a76ea28d3bdcb80482abed0c62c2e9c))
50+
* warehouse extracting messageId and receivedAt from event payload ([#5757](https://github.com/rudderlabs/rudder-server/issues/5757)) ([2532122](https://github.com/rudderlabs/rudder-server/commit/253212274862af9bf64eea4ee4d29bc987e5bde4))
51+
352
## [1.47.1](https://github.com/rudderlabs/rudder-server/compare/v1.47.0...v1.47.1) (2025-04-16)
453

554

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ TESTFILE=_testok
66
MOUNT_PATH=/local
77

88
# go tools versions
9-
GOLANGCI=github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.0.2
9+
GOLANGCI=github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.1
1010
gofumpt=mvdan.cc/gofumpt@latest
1111
govulncheck=golang.org/x/vuln/cmd/govulncheck@latest
1212
goimports=golang.org/x/tools/cmd/goimports@latest

backend-config/account_association.go

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
package backendconfig
2+
3+
import "github.com/samber/lo"
4+
5+
// processAccountAssociations processes account configurations and merges them with their corresponding
6+
// account definitions. It then associates these merged accounts with destinations based on
7+
// their configuration settings.
8+
//
9+
// The process involves three main steps:
10+
// 1. Creating a map of account definitions for quick lookup
11+
// 2. Merging account configurations with their definitions
12+
// 3. Associating the merged accounts with destinations
13+
func (c *ConfigT) processAccountAssociations() {
14+
// Create a lookup map for account definitions using their names as keys
15+
accountDefMap := lo.SliceToMap(c.AccountDefinitions, func(accDef AccountDefinition) (string, AccountDefinition) {
16+
return accDef.Name, accDef
17+
})
18+
19+
// Create a map of accounts merged with their definitions
20+
// This combines the account-specific settings with the shared definition settings
21+
accountWithDefMap := lo.SliceToMap(c.Accounts, func(acc Account) (string, AccountWithDefinition) {
22+
return acc.Id, AccountWithDefinition{
23+
Id: acc.Id,
24+
Options: acc.Options,
25+
Secret: acc.Secret,
26+
AccountDefinition: accountDefMap[acc.AccountDefinitionName],
27+
}
28+
})
29+
30+
// Iterate through all sources and their destinations to set up account associations
31+
if len(accountWithDefMap) > 0 {
32+
for i := range c.Sources {
33+
for j := range c.Sources[i].Destinations {
34+
dest := &c.Sources[i].Destinations[j]
35+
c.setDestinationAccounts(dest, accountWithDefMap)
36+
}
37+
}
38+
}
39+
}
40+
41+
// setDestinationAccounts assigns accounts to a destination based on its configuration.
42+
// It handles two types of account associations:
43+
// 1. Regular account (rudderAccountId)
44+
// 2. Delete account (rudderDeleteAccountId)
45+
//
46+
// Parameters:
47+
// - dest: Pointer to the destination being configured
48+
// - accountMap: Map of available accounts that can be associated with destinations
49+
func (c *ConfigT) setDestinationAccounts(dest *DestinationT, accountMap map[string]AccountWithDefinition) {
50+
// Check and set the regular account if specified in the destination config
51+
if accountID, ok := dest.Config["rudderAccountId"].(string); ok {
52+
if account, exists := accountMap[accountID]; exists {
53+
dest.DeliveryAccount = &account
54+
}
55+
}
56+
57+
// Check and set the delete account if specified in the destination config
58+
if deleteAccountID, ok := dest.Config["rudderDeleteAccountId"].(string); ok {
59+
if account, exists := accountMap[deleteAccountID]; exists {
60+
dest.DeleteAccount = &account
61+
}
62+
}
63+
}

0 commit comments

Comments
 (0)