From d0ce6697971851848ad2b0010a8e1aa0e541c513 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 10:39:05 +0530 Subject: [PATCH 1/7] chore(deps): bump the go-deps group with 3 updates (#5373) --- go.mod | 10 +++++----- go.sum | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 16c23472a7..40d76b6acf 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/denisenkom/go-mssqldb v0.12.3 github.com/dgraph-io/badger/v4 v4.5.0 github.com/docker/docker v27.4.0+incompatible - github.com/go-chi/chi/v5 v5.1.0 + github.com/go-chi/chi/v5 v5.2.0 github.com/go-redis/redis v6.15.9+incompatible github.com/go-redis/redis/v8 v8.11.5 github.com/gocql/gocql v1.14.4 @@ -62,7 +62,7 @@ require ( github.com/lib/pq v1.10.9 github.com/linkedin/goavro/v2 v2.13.0 github.com/marcboeker/go-duckdb v1.8.3 - github.com/minio/minio-go/v7 v7.0.81 + github.com/minio/minio-go/v7 v7.0.82 github.com/mitchellh/mapstructure v1.5.0 github.com/olekukonko/tablewriter v0.0.5 github.com/onsi/ginkgo/v2 v2.22.0 @@ -81,7 +81,7 @@ require ( github.com/rudderlabs/rudder-schemas v0.5.3 github.com/rudderlabs/rudder-transformer/go v0.0.0-20240910055720-f77d2ab4125a github.com/rudderlabs/sql-tunnels v0.1.7 - github.com/rudderlabs/sqlconnect-go v1.13.0 + github.com/rudderlabs/sqlconnect-go v1.14.0 github.com/samber/lo v1.47.0 github.com/segmentio/go-hll v1.0.1 github.com/segmentio/kafka-go v0.4.47 @@ -338,11 +338,11 @@ require ( go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.30.0 // indirect + golang.org/x/crypto v0.31.0 // indirect golang.org/x/mod v0.21.0 // indirect golang.org/x/net v0.32.0 // indirect golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.25.0 // indirect + golang.org/x/term v0.27.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.8.0 golang.org/x/tools v0.26.0 // indirect diff --git a/go.sum b/go.sum index 822fff31a7..94508de14c 100644 --- a/go.sum +++ b/go.sum @@ -545,8 +545,8 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE= github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8= -github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw= -github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= +github.com/go-chi/chi/v5 v5.2.0 h1:Aj1EtB0qR2Rdo2dG4O94RIU35w2lvQSj6BRA4+qwFL0= +github.com/go-chi/chi/v5 v5.2.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= @@ -1007,8 +1007,8 @@ github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8Ie github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= github.com/minio/minio-go/v7 v7.0.34/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw= -github.com/minio/minio-go/v7 v7.0.81 h1:SzhMN0TQ6T/xSBu6Nvw3M5M8voM+Ht8RH3hE8S7zxaA= -github.com/minio/minio-go/v7 v7.0.81/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0= +github.com/minio/minio-go/v7 v7.0.82 h1:tWfICLhmp2aFPXL8Tli0XDTHj2VB/fNf0PC1f/i1gRo= +github.com/minio/minio-go/v7 v7.0.82/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0= github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -1181,8 +1181,8 @@ github.com/rudderlabs/rudder-transformer/go v0.0.0-20240910055720-f77d2ab4125a h github.com/rudderlabs/rudder-transformer/go v0.0.0-20240910055720-f77d2ab4125a/go.mod h1:3NGitPz4pYRRZ6Xt09S+8hb0tHK/9pZcKJ3OgOTaSmE= github.com/rudderlabs/sql-tunnels v0.1.7 h1:wDCRl6zY4M5gfWazf7XkSTGQS3yjBzUiUgEMBIfHNDA= github.com/rudderlabs/sql-tunnels v0.1.7/go.mod h1:5f7+YL49JHYgteP4rAgqKnr4K2OadB0oIpUS+Tt3sPM= -github.com/rudderlabs/sqlconnect-go v1.13.0 h1:0DZPvqfwrNCZ12dVsqfkSPC/AZXrb9+MYfENDz6ld48= -github.com/rudderlabs/sqlconnect-go v1.13.0/go.mod h1:lfS3Q+HK/1IarAbVUKi808Ed55OEw2k1aDKsPDt8g+M= +github.com/rudderlabs/sqlconnect-go v1.14.0 h1:4Ctg+HmAOQqiHZUZk5tLXkZRfmJbu7c7sUa15j3ToQI= +github.com/rudderlabs/sqlconnect-go v1.14.0/go.mod h1:kRf1Srugetck/wYrSZE6q66odpSxZZxQWECG4KYkYpM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= @@ -1628,8 +1628,8 @@ golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= -golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From dd33feefa233457fb7667666ede870118d3fc125 Mon Sep 17 00:00:00 2001 From: devops-github-rudderstack <88187154+devops-github-rudderstack@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:28:33 +0530 Subject: [PATCH 2/7] chore: sync release v1.39.1 to main branch (#5377) --- CHANGELOG.md | 7 +++++++ warehouse/router/router.go | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa1cc7fc5e..d7ee5b9a15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.39.1](https://github.com/rudderlabs/rudder-server/compare/v1.39.0...v1.39.1) (2024-12-17) + + +### Bug Fixes + +* processing pickup race condition ([#5374](https://github.com/rudderlabs/rudder-server/issues/5374)) ([21f0d13](https://github.com/rudderlabs/rudder-server/commit/21f0d13ffb64ff82fc147b46ca72b8e9c672b0ea)) + ## [1.39.0](https://github.com/rudderlabs/rudder-server/compare/v1.38.0...v1.39.0) (2024-12-10) diff --git a/warehouse/router/router.go b/warehouse/router/router.go index 7c02155477..b2e66d249d 100644 --- a/warehouse/router/router.go +++ b/warehouse/router/router.go @@ -74,6 +74,8 @@ type Router struct { inProgressMap map[workerIdentifierMapKey][]jobID inProgressMapLock sync.RWMutex + processingMu sync.Mutex + scheduledTimesCache map[string][]int scheduledTimesCacheLock sync.RWMutex @@ -371,18 +373,22 @@ loop: continue } + r.processingMu.Lock() inProgressNamespaces := r.getInProgressNamespaces() r.logger.Debugf(`Current inProgress namespace identifiers for %s: %v`, r.destType, inProgressNamespaces) uploadJobsToProcess, err := r.uploadsToProcess(ctx, availableWorkers, inProgressNamespaces) if err != nil && ctx.Err() == nil { r.logger.Errorn("Error getting uploads to process", logger.NewErrorField(err)) + r.processingMu.Unlock() return err } - for _, uploadJob := range uploadJobsToProcess { r.setDestInProgress(uploadJob.warehouse, uploadJob.upload.ID) + } + r.processingMu.Unlock() + for _, uploadJob := range uploadJobsToProcess { workerName := r.workerIdentifier(uploadJob.warehouse) r.workerChannelMapLock.RLock() @@ -596,6 +602,9 @@ func (r *Router) handlePriorityForWaitingUploads(ctx context.Context, warehouse return defaultUploadPriority, nil } + r.processingMu.Lock() + defer r.processingMu.Unlock() + // If it is present do nothing else delete it if _, inProgress := r.isUploadJobInProgress(warehouse, latestInfo.ID); !inProgress { if err := r.uploadRepo.DeleteWaiting(ctx, latestInfo.ID); err != nil { From 8fa4436346530817ee512aa0e116f2b1070eb25c Mon Sep 17 00:00:00 2001 From: Akash Chetty Date: Wed, 18 Dec 2024 10:39:18 +0530 Subject: [PATCH 3/7] chore: cleanup archiver to use uploadID for filtering (#5346) --- warehouse/archive/archiver.go | 10 ++-------- warehouse/archive/testdata/dump.sql | 4 ++-- warehouse/archive/testdata/storage.json | 6 +++--- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/warehouse/archive/archiver.go b/warehouse/archive/archiver.go index f611f60001..81b4548973 100644 --- a/warehouse/archive/archiver.go +++ b/warehouse/archive/archiver.go @@ -431,18 +431,12 @@ func (a *Archiver) getStagingFilesData( FROM %s WHERE - source_id = $1 - AND destination_id = $2 - AND id >= $3 - and id <= $4;`, + upload_id = $1;`, pq.QuoteIdentifier(warehouseutils.WarehouseStagingFilesTable), ) stagingFileRows, err := txn.QueryContext(ctx, stmt, - u.sourceID, - u.destID, - u.startStagingFileId, - u.endStagingFileId, + u.uploadID, ) if err != nil { return nil, fmt.Errorf("cannot query staging files data: %w", err) diff --git a/warehouse/archive/testdata/dump.sql b/warehouse/archive/testdata/dump.sql index 18853a361e..927916da38 100644 --- a/warehouse/archive/testdata/dump.sql +++ b/warehouse/archive/testdata/dump.sql @@ -43,13 +43,13 @@ VALUES 1, 'rudder/rudder-warehouse-staging-logs/2EUralUySYUs7hgsdU1lFXRSm/2022-09-20/1663650685.2EUralsdsDyZjOKU1lFXRSm.eeadsb4-a066-42f4-a90b-460161378e1b.json.gz', '{}', 'test-sourceID', 'test-destinationID', 'succeeded', 1, 231, NOW(), NOW(), NOW(), - NOW(), '{}', NULL + NOW(), '{}', 1 ), ( 2, 'rudder/rudder-warehouse-staging-logs/2EUralUySYUs7hgsdU1lFXRSm/2022-09-20/1663650685.2EUralsdsDyZjOKU1lFXRSm.eeadsb4-a066-42f4-a90b-460161378e1b.json.gz', '{}', 'test-sourceID', 'test-destinationID', 'succeeded', 1, 231, NOW(), NOW(), NOW(), - NOW(), '{}', NULL + NOW(), '{}', 2 ), ( 3, 'rudder/rudder-warehouse-staging-logs/2EUralUySYUs7hgsdU1lFXRSm/2022-09-20/1663650685.2EUralsdsDyZjOKU1lFXRSm.eeadsb4-a066-42f4-a90b-460161378e1b.json.gz', diff --git a/warehouse/archive/testdata/storage.json b/warehouse/archive/testdata/storage.json index 1db2b7fea9..7610a01652 100644 --- a/warehouse/archive/testdata/storage.json +++ b/warehouse/archive/testdata/storage.json @@ -1,6 +1,6 @@ { - "test-prefix/wh-staging-files.test-sourceID.test-destinationID.1.unix_time.json.gz": "{\"id\":1,\"location\":\"rudder/rudder-warehouse-staging-logs/2EUralUySYUs7hgsdU1lFXRSm/2022-09-20/1663650685.2EUralsdsDyZjOKU1lFXRSm.eeadsb4-a066-42f4-a90b-460161378e1b.json.gz\",\"source_id\":\"test-sourceID\",\"destination_id\":\"test-destinationID\",\"schema\":{},\"error\":null,\"status\":\"succeeded\",\"first_event_at\":\"{{.Now}}\",\"last_event_at\":\"{{.Now}}\",\"total_events\":1,\"created_at\":\"{{.Now}}\",\"updated_at\":\"{{.Now}}\",\"metadata\":{},\"workspace_id\":\"1\",\"total_bytes\":231,\"upload_id\":null}\n", - "test-prefix/wh-staging-files.test-sourceID.test-destinationID.2.unix_time.json.gz": "{\"id\":2,\"location\":\"rudder/rudder-warehouse-staging-logs/2EUralUySYUs7hgsdU1lFXRSm/2022-09-20/1663650685.2EUralsdsDyZjOKU1lFXRSm.eeadsb4-a066-42f4-a90b-460161378e1b.json.gz\",\"source_id\":\"test-sourceID\",\"destination_id\":\"test-destinationID\",\"schema\":{},\"error\":null,\"status\":\"succeeded\",\"first_event_at\":\"{{.Now}}\",\"last_event_at\":\"{{.Now}}\",\"total_events\":1,\"created_at\":\"{{.Now}}\",\"updated_at\":\"{{.Now}}\",\"metadata\":{},\"workspace_id\":\"1\",\"total_bytes\":231,\"upload_id\":null}\n", + "test-prefix/wh-staging-files.test-sourceID.test-destinationID.1.unix_time.json.gz": "{\"id\":1,\"location\":\"rudder/rudder-warehouse-staging-logs/2EUralUySYUs7hgsdU1lFXRSm/2022-09-20/1663650685.2EUralsdsDyZjOKU1lFXRSm.eeadsb4-a066-42f4-a90b-460161378e1b.json.gz\",\"source_id\":\"test-sourceID\",\"destination_id\":\"test-destinationID\",\"schema\":{},\"error\":null,\"status\":\"succeeded\",\"first_event_at\":\"{{.Now}}\",\"last_event_at\":\"{{.Now}}\",\"total_events\":1,\"created_at\":\"{{.Now}}\",\"updated_at\":\"{{.Now}}\",\"metadata\":{},\"workspace_id\":\"1\",\"total_bytes\":231,\"upload_id\":1}\n", + "test-prefix/wh-staging-files.test-sourceID.test-destinationID.2.unix_time.json.gz": "{\"id\":2,\"location\":\"rudder/rudder-warehouse-staging-logs/2EUralUySYUs7hgsdU1lFXRSm/2022-09-20/1663650685.2EUralsdsDyZjOKU1lFXRSm.eeadsb4-a066-42f4-a90b-460161378e1b.json.gz\",\"source_id\":\"test-sourceID\",\"destination_id\":\"test-destinationID\",\"schema\":{},\"error\":null,\"status\":\"succeeded\",\"first_event_at\":\"{{.Now}}\",\"last_event_at\":\"{{.Now}}\",\"total_events\":1,\"created_at\":\"{{.Now}}\",\"updated_at\":\"{{.Now}}\",\"metadata\":{},\"workspace_id\":\"1\",\"total_bytes\":231,\"upload_id\":2}\n", "test-prefix/wh-staging-files.test-sourceID.test-destinationID.3.unix_time.json.gz": "{\"id\":3,\"location\":\"rudder/rudder-warehouse-staging-logs/2EUralUySYUs7hgsdU1lFXRSm/2022-09-20/1663650685.2EUralsdsDyZjOKU1lFXRSm.eeadsb4-a066-42f4-a90b-460161378e1b.json.gz\",\"source_id\":\"test-sourceID\",\"destination_id\":\"test-destinationID\",\"schema\":{},\"error\":null,\"status\":\"succeeded\",\"first_event_at\":\"{{.Now}}\",\"last_event_at\":\"{{.Now}}\",\"total_events\":1,\"created_at\":\"{{.Now}}\",\"updated_at\":\"{{.Now}}\",\"metadata\":{},\"workspace_id\":\"1\",\"total_bytes\":231,\"upload_id\":3}\n", "test-prefix/wh-staging-files.test-sourceID.test-destinationID.4.unix_time.json.gz": "{\"id\":4,\"location\":\"rudder/rudder-warehouse-staging-logs/2EUralUySYUs7hgsdU1lFXRSm/2022-09-20/1663650685.2EUralsdsDyZjOKU1lFXRSm.eeadsb4-a066-42f4-a90b-460161378e1b.json.gz\",\"source_id\":\"test-sourceID\",\"destination_id\":\"test-destinationID\",\"schema\":{},\"error\":null,\"status\":\"succeeded\",\"first_event_at\":\"{{.Now}}\",\"last_event_at\":\"{{.Now}}\",\"total_events\":1,\"created_at\":\"{{.Now}}\",\"updated_at\":\"{{.Now}}\",\"metadata\":{},\"workspace_id\":\"1\",\"total_bytes\":231,\"upload_id\":4}\n" -} \ No newline at end of file +} From 7b46cd2eec2f995aff9db6f73bc197b101d145d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 12:00:14 +0530 Subject: [PATCH 4/7] chore(deps): bump google.golang.org/api from 0.211.0 to 0.212.0 in the frequent group (#5378) --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 40d76b6acf..68ecf46848 100644 --- a/go.mod +++ b/go.mod @@ -107,7 +107,7 @@ require ( golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 golang.org/x/oauth2 v0.24.0 golang.org/x/sync v0.10.0 - google.golang.org/api v0.211.0 + google.golang.org/api v0.212.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 google.golang.org/grpc v1.68.1 google.golang.org/protobuf v1.35.2 @@ -124,9 +124,9 @@ require ( require ( cel.dev/expr v0.16.1 // indirect cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.12.1 // indirect + cloud.google.com/go/auth v0.13.0 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect - cloud.google.com/go/compute/metadata v0.5.2 // indirect + cloud.google.com/go/compute/metadata v0.6.0 // indirect cloud.google.com/go/iam v1.2.2 // indirect cloud.google.com/go/monitoring v1.21.2 // indirect dario.cat/mergo v1.0.1 // indirect diff --git a/go.sum b/go.sum index 94508de14c..b9b12bbde7 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE= cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U= -cloud.google.com/go/auth v0.12.1 h1:n2Bj25BUMM0nvE9D2XLTiImanwZhO3DkfWSYS/SAJP4= -cloud.google.com/go/auth v0.12.1/go.mod h1:BFMu+TNpF3DmvfBO9ClqTR/SiqVIm7LukKF9mbendF4= +cloud.google.com/go/auth v0.13.0 h1:8Fu8TZy167JkW8Tj3q7dIkr2v4cndv41ouecJx0PAHs= +cloud.google.com/go/auth v0.13.0/go.mod h1:COOjD9gwfKNKz+IIduatIhYJQIc0mG3H102r/EMxX6Q= cloud.google.com/go/auth/oauth2adapt v0.2.6 h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU= cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= @@ -50,8 +50,8 @@ cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTB cloud.google.com/go/compute v1.2.0/go.mod h1:xlogom/6gr8RJGBe7nT2eGsQYAFUbbv8dbC29qE3Xmw= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= -cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo= -cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k= +cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I= +cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg= cloud.google.com/go/datacatalog v1.23.0 h1:9F2zIbWNNmtrSkPIyGRQNsIugG5VgVVFip6+tXSdWLg= cloud.google.com/go/datacatalog v1.23.0/go.mod h1:9Wamq8TDfL2680Sav7q3zEhBJSPBrDxJU8WtPJ25dBM= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= @@ -1772,8 +1772,8 @@ google.golang.org/api v0.69.0/go.mod h1:boanBiw+h5c3s+tBPgEzLDRHfFLWV0qXxRHz3ws7 google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= -google.golang.org/api v0.211.0 h1:IUpLjq09jxBSV1lACO33CGY3jsRcbctfGzhj+ZSE/Bg= -google.golang.org/api v0.211.0/go.mod h1:XOloB4MXFH4UTlQSGuNUxw0UT74qdENK8d6JNsXKLi0= +google.golang.org/api v0.212.0 h1:BcRj3MJfHF3FYD29rk7u9kuu1SyfGqfHcA0hSwKqkHg= +google.golang.org/api v0.212.0/go.mod h1:gICpLlpp12/E8mycRMzgy3SQ9cFh2XnVJ6vJi/kQbvI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From 74256599bbbe460c0166470196704b9de9477c14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 12:00:19 +0530 Subject: [PATCH 5/7] chore(deps): bump google.golang.org/protobuf from 1.35.2 to 1.36.0 in the go-deps group (#5379) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 68ecf46848..fa81ddb98c 100644 --- a/go.mod +++ b/go.mod @@ -110,7 +110,7 @@ require ( google.golang.org/api v0.212.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 google.golang.org/grpc v1.68.1 - google.golang.org/protobuf v1.35.2 + google.golang.org/protobuf v1.36.0 ) require ( diff --git a/go.sum b/go.sum index b9b12bbde7..4b1e768310 100644 --- a/go.sum +++ b/go.sum @@ -1922,8 +1922,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= -google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ= +google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alexcesaro/statsd.v2 v2.0.0 h1:FXkZSCZIH17vLCO5sO2UucTHsH9pc+17F6pl3JVCwMc= gopkg.in/alexcesaro/statsd.v2 v2.0.0/go.mod h1:i0ubccKGzBVNBpdGV5MocxyA/XlLUJzA7SLonnE4drU= gopkg.in/cenkalti/backoff.v1 v1.1.0 h1:Arh75ttbsvlpVA7WtVpH4u9h6Zl46xuptxqLxPiSo4Y= From 98827e57eae6949ea06bd7a0ca58e678360e66e6 Mon Sep 17 00:00:00 2001 From: devops-github-rudderstack <88187154+devops-github-rudderstack@users.noreply.github.com> Date: Fri, 20 Dec 2024 17:37:13 +0530 Subject: [PATCH 6/7] chore: sync release v1.38.4 to main branch (#5333) * fix: bq partitioning for additional columns (#5293) * chore: release 1.38.1 (#5295) * fix: klaviyo bulk upload and BingAds OC (#5305) * fix: bing ads audience (#5299) * chore: handle 500kb limit, refactor to service impl (#5302) * chore: handle 500kb limit, refactor to service impl * chore: fix mock * chore: fix mock newline * chore: fix apiservice newline * chore: move error --------- Co-authored-by: Sudip Paul <67197965+ItsSudip@users.noreply.github.com> * chore: release 1.38.2 (#5306) * fix: allow only enabled dest in backendSubscriber, fix klaviyo bulk (#5309) * chore: release 1.38.3 (#5311) * fix: disable vacuum at startup for reporting (#5325) * chore: remove full vacuum at flusher startup (#5332) * chore: release 1.38.4 (#5331) * update action to apidom-validate --------- Co-authored-by: Akash Chetty Co-authored-by: Yashasvi Bajpai <33063622+yashasvibajpai@users.noreply.github.com> Co-authored-by: Sudip Paul <67197965+ItsSudip@users.noreply.github.com> Co-authored-by: siddarth.msv <82795818+Sidddddarth@users.noreply.github.com> Co-authored-by: mihir --- .github/workflows/verify.yml | 2 +- CHANGELOG.md | 12 ++++++++++++ enterprise/reporting/error_reporting.go | 15 +++++++++------ enterprise/reporting/flusher/flusher.go | 6 ------ enterprise/reporting/reporting.go | 8 +++++--- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 92e92bec2a..ac8d7ff81b 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -51,7 +51,7 @@ jobs: if: ${{ failure() }} run: echo 'Not formatted files. Ensure you have run `make fmt` and committed the files locally.' - name: Validate OpenAPI definition - uses: char0n/swagger-editor-validate@v1 + uses: char0n/apidom-validate@v1 with: definition-file: gateway/openapi.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index d7ee5b9a15..d7fbd816dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -68,6 +68,18 @@ * upgrade major version pglock ([#5292](https://github.com/rudderlabs/rudder-server/issues/5292)) ([1f575ec](https://github.com/rudderlabs/rudder-server/commit/1f575ec2b5eac32df856ccf2d55ee2d40a516d8e)) * webhook integration tests commandline ([#5286](https://github.com/rudderlabs/rudder-server/issues/5286)) ([1d3ac29](https://github.com/rudderlabs/rudder-server/commit/1d3ac296789c2c65753df4f65ff80d971f4c3a0b)) +## [1.38.4](https://github.com/rudderlabs/rudder-server/compare/v1.38.3...v1.38.4) (2024-12-04) + + +### Bug Fixes + +* disable vacuum at startup for reporting ([#5325](https://github.com/rudderlabs/rudder-server/issues/5325)) ([d8fb8be](https://github.com/rudderlabs/rudder-server/commit/d8fb8be7a5ace45b6198579283b4f3b77cf71fbd)) + + +### Miscellaneous + +* remove full vacuum at flusher startup ([#5332](https://github.com/rudderlabs/rudder-server/issues/5332)) ([65ab23c](https://github.com/rudderlabs/rudder-server/commit/65ab23c79933d880dfef3dd8ff6e4a150f26435d)) + ## [1.38.3](https://github.com/rudderlabs/rudder-server/compare/v1.38.2...v1.38.3) (2024-11-20) diff --git a/enterprise/reporting/error_reporting.go b/enterprise/reporting/error_reporting.go index ea2a0d5647..28f7e3743c 100644 --- a/enterprise/reporting/error_reporting.go +++ b/enterprise/reporting/error_reporting.go @@ -28,6 +28,7 @@ import ( "github.com/rudderlabs/rudder-go-kit/stats/collectors" obskit "github.com/rudderlabs/rudder-observability-kit/go/labels" + migrator "github.com/rudderlabs/rudder-server/services/sql-migrator" "github.com/rudderlabs/rudder-server/utils/httputil" . "github.com/rudderlabs/rudder-server/utils/tx" //nolint:staticcheck @@ -160,12 +161,14 @@ func (edr *ErrorDetailReporter) DatabaseSyncer(c types.SyncerConfig) types.Repor if !edr.config.GetBool("Reporting.errorReporting.syncer.enabled", true) { return func() {} } - if _, err := dbHandle.ExecContext( - context.Background(), - fmt.Sprintf("vacuum full analyze %s", pq.QuoteIdentifier(ErrorDetailReportsTable)), - ); err != nil { - edr.log.Errorn("error full vacuuming", logger.NewStringField("table", ErrorDetailReportsTable), obskit.Error(err)) - panic(err) + if edr.config.GetBool("Reporting.errorReporting.vacuumAtStartup", false) { + if _, err := dbHandle.ExecContext( + context.Background(), + fmt.Sprintf("vacuum full analyze %s", pq.QuoteIdentifier(ErrorDetailReportsTable)), + ); err != nil { + edr.log.Errorn("error full vacuuming", logger.NewStringField("table", ErrorDetailReportsTable), obskit.Error(err)) + panic(err) + } } return func() { diff --git a/enterprise/reporting/flusher/flusher.go b/enterprise/reporting/flusher/flusher.go index d18f9afe34..d4b333677a 100644 --- a/enterprise/reporting/flusher/flusher.go +++ b/enterprise/reporting/flusher/flusher.go @@ -117,12 +117,6 @@ func NewFlusher(db *sql.DB, log logger.Logger, stats stats.Stats, conf *config.C f.initCommonTags() f.initStats(f.commonTags) - if _, err := db.Exec( - fmt.Sprintf("vacuum full analyze %s", pq.QuoteIdentifier(table)), - ); err != nil { - log.Errorn("error full vacuuming", logger.NewStringField("table", table), obskit.Error(err)) - return nil, fmt.Errorf("error full vacuuming %s table %w", table, err) - } return &f, nil } diff --git a/enterprise/reporting/reporting.go b/enterprise/reporting/reporting.go index 3d2b281a80..8fddbec0fe 100644 --- a/enterprise/reporting/reporting.go +++ b/enterprise/reporting/reporting.go @@ -185,9 +185,11 @@ func (r *DefaultReporter) DatabaseSyncer(c types.SyncerConfig) types.ReportingSy if !config.GetBool("Reporting.syncer.enabled", true) { return func() {} } - if _, err := dbHandle.ExecContext(context.Background(), `vacuum full analyze reports;`); err != nil { - r.log.Errorn(`[ Reporting ]: Error full vacuuming reports table`, logger.NewErrorField(err)) - panic(err) + if config.GetBool("Reporting.syncer.vacuumAtStartup", false) { + if _, err := dbHandle.ExecContext(context.Background(), `vacuum full analyze reports;`); err != nil { + r.log.Errorn(`[ Reporting ]: Error full vacuuming reports table`, logger.NewErrorField(err)) + panic(err) + } } return func() { r.g.Go(func() error { From a82aa4719922f0ff82a938df69b6a83b8979e911 Mon Sep 17 00:00:00 2001 From: devops-github-rudderstack <88187154+devops-github-rudderstack@users.noreply.github.com> Date: Fri, 20 Dec 2024 18:16:39 +0530 Subject: [PATCH 7/7] chore: sync release v1.39.2 to main branch (#5383) * fix: processing pickup race condition (#5374) * chore: release 1.39.1 (#5376) * chore: add error msg in the logs when gw req fails (#5369) * chore: add error msg in the logs when gw req fails * addressed comments * addressed comments * update go version and schema version * update go version in docker file * downgrade swagger-editor-validate * update action to apidom-validate * chore: release 1.39.2 (#5382) --------- Co-authored-by: Akash Chetty Co-authored-by: Mihir Gandhi --- CHANGELOG.md | 7 ++++++ Dockerfile | 2 +- gateway/handle.go | 31 ++++++++++++++++++++++++--- go.mod | 6 +++--- go.sum | 8 +++---- suppression-backup-service/Dockerfile | 2 +- 6 files changed, 44 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7fbd816dc..b35f92ee26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.39.2](https://github.com/rudderlabs/rudder-server/compare/v1.39.1...v1.39.2) (2024-12-18) + + +### Miscellaneous + +* add error msg in the logs when gw req fails ([#5369](https://github.com/rudderlabs/rudder-server/issues/5369)) ([a0ef0f1](https://github.com/rudderlabs/rudder-server/commit/a0ef0f15ca456fc459233bf70c324cc60cfca7f0)) + ## [1.39.1](https://github.com/rudderlabs/rudder-server/compare/v1.39.0...v1.39.1) (2024-12-17) diff --git a/Dockerfile b/Dockerfile index a38c0b66ea..2db21beee9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # syntax=docker/dockerfile:1 # GO_VERSION is updated automatically to match go.mod, see Makefile -ARG GO_VERSION=1.23.3 +ARG GO_VERSION=1.23.4 ARG ALPINE_VERSION=3.20 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS builder ARG VERSION diff --git a/gateway/handle.go b/gateway/handle.go index 402ae15bd3..abacefee13 100644 --- a/gateway/handle.go +++ b/gateway/handle.go @@ -709,11 +709,11 @@ func (gw *Handle) internalBatchHandlerFunc() http.HandlerFunc { errorMessage = err.Error() status = response.GetErrorStatusCode(errorMessage) responseBody = response.GetStatus(errorMessage) - gw.logger.Infon("response", + gw.logger.Errorn("response", logger.NewStringField("ip", kithttputil.GetRequestIP(r)), logger.NewStringField("path", r.URL.Path), logger.NewIntField("status", int64(status)), - logger.NewStringField("body", responseBody), + obskit.Error(err), ) gw.logger.Debugn("response", logger.NewStringField("ip", kithttputil.GetRequestIP(r)), @@ -763,6 +763,8 @@ func (gw *Handle) extractJobsFromInternalBatchPayload(reqType string, body []byt if err != nil { stat.RequestFailed(response.InvalidJSON) stat.Report(gw.stats) + gw.logger.Errorn("invalid json in request", + obskit.Error(err)) return nil, errors.New(response.InvalidJSON) } gw.requestSizeStat.Observe(float64(len(body))) @@ -770,6 +772,7 @@ func (gw *Handle) extractJobsFromInternalBatchPayload(reqType string, body []byt if len(messages) == 0 { stat.RequestFailed(response.NotRudderEvent) stat.Report(gw.stats) + gw.logger.Errorn("no messages in request") return nil, errors.New(response.NotRudderEvent) } @@ -779,7 +782,10 @@ func (gw *Handle) extractJobsFromInternalBatchPayload(reqType string, body []byt stat := gwstats.SourceStat{ReqType: reqType} err := gw.streamMsgValidator(&msg) if err != nil { - gw.logger.Errorn("invalid message in request", logger.NewErrorField(err)) + loggerFields := msg.Properties.LoggerFields() + loggerFields = append(loggerFields, obskit.Error(err)) + gw.logger.Errorn("invalid message in request", + loggerFields...) stat.RequestEventsFailed(1, response.InvalidStreamMessage) stat.Report(gw.stats) return nil, errors.New(response.InvalidStreamMessage) @@ -793,6 +799,9 @@ func (gw *Handle) extractJobsFromInternalBatchPayload(reqType string, body []byt if err != nil { stat.RequestEventsFailed(1, response.NotRudderEvent) stat.Report(gw.stats) + loggerFields := msg.Properties.LoggerFields() + loggerFields = append(loggerFields, obskit.Error(err)) + gw.logger.Errorn("failed to set type in message", loggerFields...) return nil, errors.New(response.NotRudderEvent) } } @@ -806,6 +815,8 @@ func (gw *Handle) extractJobsFromInternalBatchPayload(reqType string, body []byt if err != nil { stat.RequestFailed(response.NotRudderEvent) stat.Report(gw.stats) + gw.logger.Errorn("failed to set messageID in message", + obskit.Error(err)) return nil, errors.New(response.NotRudderEvent) } } @@ -813,12 +824,18 @@ func (gw *Handle) extractJobsFromInternalBatchPayload(reqType string, body []byt if err != nil { stat.RequestFailed(response.NotRudderEvent) stat.Report(gw.stats) + gw.logger.Errorn("failed to get rudderId", + obskit.Error(err)) return nil, errors.New(response.NotRudderEvent) } msg.Payload, err = sjson.SetBytes(msg.Payload, "rudderId", rudderId.String()) if err != nil { stat.RequestFailed(response.NotRudderEvent) stat.Report(gw.stats) + loggerFields := msg.Properties.LoggerFields() + loggerFields = append(loggerFields, obskit.Error(err)) + gw.logger.Errorn("failed to set rudderId in message", + loggerFields...) return nil, errors.New(response.NotRudderEvent) } writeKey, ok := gw.getWriteKeyFromSourceID(msg.Properties.SourceID) @@ -877,6 +894,8 @@ func (gw *Handle) extractJobsFromInternalBatchPayload(reqType string, body []byt err = fmt.Errorf("filling receivedAt: %w", err) stat.RequestEventsFailed(1, err.Error()) stat.Report(gw.stats) + gw.logger.Errorn("failed to fill receivedAt in message", + obskit.Error(err)) return nil, fmt.Errorf("filling receivedAt: %w", err) } msg.Payload, err = fillRequestIP(msg.Payload, msg.Properties.RequestIP) @@ -884,6 +903,8 @@ func (gw *Handle) extractJobsFromInternalBatchPayload(reqType string, body []byt err = fmt.Errorf("filling request_ip: %w", err) stat.RequestEventsFailed(1, err.Error()) stat.Report(gw.stats) + gw.logger.Errorn("failed to fill request_ip in message", + obskit.Error(err)) return nil, fmt.Errorf("filling request_ip: %w", err) } @@ -899,6 +920,10 @@ func (gw *Handle) extractJobsFromInternalBatchPayload(reqType string, body []byt err = fmt.Errorf("marshalling event batch: %w", err) stat.RequestEventsFailed(1, err.Error()) stat.Report(gw.stats) + loggerFields := msg.Properties.LoggerFields() + loggerFields = append(loggerFields, obskit.Error(err)) + gw.logger.Errorn("failed to marshal event batch", + loggerFields...) return nil, fmt.Errorf("marshalling event batch: %w", err) } jobUUID := uuid.New() diff --git a/go.mod b/go.mod index fa81ddb98c..940a175508 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/rudderlabs/rudder-server -go 1.23.3 +go 1.23.4 // Addressing snyk vulnerabilities in indirect dependencies // When upgrading a dependency, please make sure that @@ -78,7 +78,7 @@ require ( github.com/rudderlabs/compose-test v0.1.3 github.com/rudderlabs/rudder-go-kit v0.45.0 github.com/rudderlabs/rudder-observability-kit v0.0.3 - github.com/rudderlabs/rudder-schemas v0.5.3 + github.com/rudderlabs/rudder-schemas v0.5.4 github.com/rudderlabs/rudder-transformer/go v0.0.0-20240910055720-f77d2ab4125a github.com/rudderlabs/sql-tunnels v0.1.7 github.com/rudderlabs/sqlconnect-go v1.14.0 @@ -214,7 +214,7 @@ require ( github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.22.1 // indirect + github.com/go-playground/validator/v10 v10.23.0 // indirect github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/go-viper/mapstructure/v2 v2.1.0 // indirect diff --git a/go.sum b/go.sum index 4b1e768310..1ffb5e293a 100644 --- a/go.sum +++ b/go.sum @@ -587,8 +587,8 @@ github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/Nu github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= -github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= -github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o= +github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-redis/redis v6.15.8+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= @@ -1175,8 +1175,8 @@ github.com/rudderlabs/rudder-go-kit v0.45.0 h1:y8ModVsl2rAdqnqv/di82cddkaEBT1qZv github.com/rudderlabs/rudder-go-kit v0.45.0/go.mod h1:NrHCi0KSzHSMFXQu0t2kgJcE4ClAKklVXfb2glADvQ4= github.com/rudderlabs/rudder-observability-kit v0.0.3 h1:vZtuZRkGX+6rjaeKtxxFE2YYP6QlmAcVcgecTOjvz+Q= github.com/rudderlabs/rudder-observability-kit v0.0.3/go.mod h1:6UjAh3H6rkE0fFLh7z8ZGQEQbKtUkRfhWOf/OUhfqW8= -github.com/rudderlabs/rudder-schemas v0.5.3 h1:IWWjAo2TzsjwHNhS2EAr1+0MjvA8BoTpJvB2o/GFwNU= -github.com/rudderlabs/rudder-schemas v0.5.3/go.mod h1:iUpjG/Zb+ioZcNLvXNYXSKQ2LpPlsIDBfxfCDH9ue/E= +github.com/rudderlabs/rudder-schemas v0.5.4 h1:QzI6vIC38W0jGJu6E0vdwh4IAtSKx8ziqff+JL0xmIE= +github.com/rudderlabs/rudder-schemas v0.5.4/go.mod h1:oypQtew1d2jBGJdFMT4zf1XOvXgGEcNPtRFy6vRDAv8= github.com/rudderlabs/rudder-transformer/go v0.0.0-20240910055720-f77d2ab4125a h1:OZcvpApxEYNkB9UNXrKDUBufQ24Lsr2Cs0pw70tzXBw= github.com/rudderlabs/rudder-transformer/go v0.0.0-20240910055720-f77d2ab4125a/go.mod h1:3NGitPz4pYRRZ6Xt09S+8hb0tHK/9pZcKJ3OgOTaSmE= github.com/rudderlabs/sql-tunnels v0.1.7 h1:wDCRl6zY4M5gfWazf7XkSTGQS3yjBzUiUgEMBIfHNDA= diff --git a/suppression-backup-service/Dockerfile b/suppression-backup-service/Dockerfile index f10a80d4e2..adabf15d31 100644 --- a/suppression-backup-service/Dockerfile +++ b/suppression-backup-service/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # GO_VERSION is updated automatically to match go.mod, see Makefile -ARG GO_VERSION=1.23.3 +ARG GO_VERSION=1.23.4 ARG ALPINE_VERSION=3.20 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS builder RUN mkdir /app