Skip to content

Commit 67befa5

Browse files
chore: sync release v1.68.1 to main branch (#6703)
# Description Syncing patch release v1.68.1 to main branch **↓↓ Please review and edit commit overrides before merging ↓↓** BEGIN_COMMIT_OVERRIDE fix(batchrouter): klaviyo bulk upload manager tries to update zero-valued job ids in case of failures causing panics (#6701) END_COMMIT_OVERRIDE --------- Co-authored-by: Sudip Paul <67197965+ItsSudip@users.noreply.github.com> Co-authored-by: rudderstack-github-actions[bot] <236995729+rudderstack-github-actions[bot]@users.noreply.github.com>
1 parent 8998ece commit 67befa5

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [1.68.1](https://github.com/rudderlabs/rudder-server/compare/v1.68.0...v1.68.1) (2026-02-18)
4+
5+
6+
### Bug Fixes
7+
8+
* **batchrouter:** klaviyo bulk upload manager tries to update zero-valued job ids in case of failures causing panics ([#6701](https://github.com/rudderlabs/rudder-server/issues/6701)) ([e90b3b7](https://github.com/rudderlabs/rudder-server/commit/e90b3b784585a42214b6644c66a3e9821728db97))
9+
310
## [1.68.0](https://github.com/rudderlabs/rudder-server/compare/v1.67.0...v1.68.0) (2026-02-16)
411

512

router/batchrouter/asyncdestinationmanager/klaviyobulkupload/klaviyobulkupload_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func TestUpload(t *testing.T) {
7474
}
7575
defer os.Remove(tempFile.Name())
7676

77-
testData := []byte(`{"message":{"body":{"JSON":{"data":{"type":"profile-bulk-import-job","attributes":{"profiles":{"data":[{"type":"profile","attributes":{"email":"qwe22@mail.com","first_name":"Testqwe0022","last_name":"user","phone_number":"+919902330123","location":{"address1":"dallas street","address2":"oppenheimer market","city":"delhi","country":"India","ip":"213.5.6.41"},"anonymous_id":"user1","jobIdentifier":"user1:1"}}]}},"relationships":{"lists":{"data":[{"type":"list","id":"list101"}]}}}}}},"metadata":{"jobId":1}}`)
77+
testData := []byte(`{"message":{"body":{"JSON":{"data":{"type":"profile-bulk-import-job","attributes":{"profiles":{"data":[{"type":"profile","attributes":{"email":"qwe22@mail.com","first_name":"Testqwe0022","last_name":"user","phone_number":"+919902330123","location":{"address1":"dallas street","address2":"oppenheimer market","city":"delhi","country":"India","ip":"213.5.6.41"},"anonymous_id":"user1","jobIdentifier":"user1:1"}}]}},"relationships":{"lists":{"data":[{"type":"list","id":"list101"}]}}}}}},"metadata":{"job_id":1}}`)
7878
_, err = tempFile.Write(testData)
7979
if err != nil {
8080
t.Fatal(err)
@@ -142,7 +142,7 @@ func TestUpload(t *testing.T) {
142142
}
143143
defer os.Remove(tempFile.Name())
144144

145-
const testProfileTemplate = `{"message":{"body":{"JSON":{"data":{"type":"profile-bulk-import-job","attributes":{"profiles":{"data":[{"type":"profile","attributes":{"email":"%s@mail.com","jobIdentifier":"%s:%d"}}]}}}}}},"metadata":{"jobId":%d}}`
145+
const testProfileTemplate = `{"message":{"body":{"JSON":{"data":{"type":"profile-bulk-import-job","attributes":{"profiles":{"data":[{"type":"profile","attributes":{"email":"%s@mail.com","jobIdentifier":"%s:%d"}}]}}}}}},"metadata":{"job_id":%d}}`
146146

147147
profiles := []string{
148148
fmt.Sprintf(testProfileTemplate, "user1", "user1", 1, 1),

router/batchrouter/asyncdestinationmanager/klaviyobulkupload/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ type List struct {
159159
ID string `json:"id,omitempty"`
160160
}
161161
type Metadata struct {
162-
JobID int `json:"jobId,omitempty"`
162+
JobID int `json:"job_id,omitempty"`
163163
}
164164

165165
type Profile struct {

0 commit comments

Comments
 (0)