Skip to content

Commit e497ce6

Browse files
authored
fix: keydb grpc config (#6370)
# Description Fixing keydb gRPC config with backoffs and keepalives. ## Linear Ticket Fixes [PIPE-2413](https://linear.app/rudderstack/issue/PIPE-2413/deploy-keydb-grpc-fixes-backoffs-and-keepalives) ## Security - [x] The code changed/added as part of this pull request won't create any security issues with how the software is being used.
1 parent bb69b71 commit e497ce6

File tree

5 files changed

+198
-160
lines changed

5 files changed

+198
-160
lines changed

archiver/archiver_isolation_test.go

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,8 @@ func ArchivalScenario(
183183
}
184184
}()
185185
r := runner.New(runner.ReleaseInfo{})
186-
c := r.Run(ctx, []string{"brt-isolation-test-rudder-server"})
187-
if c != 0 {
188-
t.Errorf("rudder-server exited with a non-0 exit code: %d", c)
189-
}
186+
ec := r.Run(ctx, []string{"brt-isolation-test-rudder-server"})
187+
require.Equalf(t, 0, ec, "rudder-server exited with a non-0 exit code: %d", ec)
190188
close(svcDone)
191189
}()
192190
health.WaitUntilReady(ctx, t,
@@ -197,12 +195,17 @@ func ArchivalScenario(
197195
)
198196
t.Logf("Rudder server started")
199197

200-
g, _ := errgroup.WithContext(ctx)
198+
g := errgroup.Group{}
201199
g.Go(func() error {
202200
t.Logf("Waiting for all gw jobs to be successfully processed")
203201
require.Eventually(t, func() bool {
204202
var processedJobCount int
205-
require.NoError(t, postgresContainer.DB.QueryRow("SELECT count(*) FROM unionjobsdbmetadata('gw',20) WHERE job_state = 'succeeded'").Scan(&processedJobCount))
203+
row := postgresContainer.DB.QueryRow("SELECT count(*) FROM unionjobsdbmetadata('gw',20) WHERE job_state = 'succeeded'")
204+
err := row.Scan(&processedJobCount)
205+
if err != nil {
206+
t.Logf("processedJobCount: failed to scan the row: %v", err)
207+
return false
208+
}
206209
return processedJobCount == numJobs
207210
}, 5*time.Minute, 1*time.Second, "all gw jobs should be successfully processed")
208211
return nil
@@ -211,7 +214,12 @@ func ArchivalScenario(
211214
g.Go(func() error {
212215
require.Eventually(t, func() bool {
213216
var archivedJobCount int
214-
require.NoError(t, postgresContainer.DB.QueryRow("SELECT count(*) FROM unionjobsdbmetadata('arc',20) WHERE job_state = 'succeeded'").Scan(&archivedJobCount))
217+
row := postgresContainer.DB.QueryRow("SELECT count(*) FROM unionjobsdbmetadata('arc',20) WHERE job_state = 'succeeded'")
218+
err := row.Scan(&archivedJobCount)
219+
if err != nil {
220+
t.Logf("archivedJobCount: failed to scan the row: %v", err)
221+
return false
222+
}
215223
return archivedJobCount == numJobs
216224
}, 5*time.Minute, 1*time.Second, "all jobs should be successfully archived")
217225
return nil

go.mod

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ require (
3131
github.com/allisson/go-pglock/v3 v3.0.0
3232
github.com/apache/pulsar-client-go v0.16.0
3333
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
34-
github.com/aws/aws-sdk-go-v2 v1.38.0
34+
github.com/aws/aws-sdk-go-v2 v1.39.0
3535
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0
3636
github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0
3737
github.com/aws/aws-sdk-go-v2/service/glue v1.126.0
3838
github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0
3939
github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0
4040
github.com/aws/aws-sdk-go-v2/service/personalizeevents v1.29.0
41-
github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0
42-
github.com/aws/smithy-go v1.22.5
41+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1
42+
github.com/aws/smithy-go v1.23.0
4343
github.com/bufbuild/httplb v0.4.1
4444
github.com/cenkalti/backoff v2.2.1+incompatible
4545
github.com/cenkalti/backoff/v4 v4.3.0
@@ -50,7 +50,7 @@ require (
5050
github.com/docker/docker v28.3.3+incompatible
5151
github.com/evanphx/json-patch/v5 v5.9.11
5252
github.com/fsouza/fake-gcs-server v1.52.2
53-
github.com/go-chi/chi/v5 v5.2.2
53+
github.com/go-chi/chi/v5 v5.2.3
5454
github.com/go-redis/redis v6.15.9+incompatible
5555
github.com/go-redis/redis/v8 v8.11.5
5656
github.com/go-viper/mapstructure/v2 v2.4.0
@@ -87,9 +87,9 @@ require (
8787
github.com/rudderlabs/analytics-go v3.3.3+incompatible
8888
github.com/rudderlabs/bing-ads-go-sdk v0.2.3
8989
github.com/rudderlabs/compose-test v0.1.3
90-
github.com/rudderlabs/keydb v0.4.2-alpha
90+
github.com/rudderlabs/keydb v1.1.0
9191
github.com/rudderlabs/rudder-go-kit v0.62.0
92-
github.com/rudderlabs/rudder-observability-kit v0.0.4
92+
github.com/rudderlabs/rudder-observability-kit v0.0.5
9393
github.com/rudderlabs/rudder-schemas v0.7.0
9494
github.com/rudderlabs/rudder-transformer/go v0.0.0-20250707171833-9cd525669b1b
9595
github.com/rudderlabs/sql-tunnels v0.1.7
@@ -102,7 +102,7 @@ require (
102102
github.com/sony/gobreaker v1.0.0
103103
github.com/spaolacci/murmur3 v1.1.0
104104
github.com/spf13/cast v1.9.2
105-
github.com/stretchr/testify v1.10.0
105+
github.com/stretchr/testify v1.11.1
106106
github.com/tidwall/gjson v1.18.0
107107
github.com/tidwall/sjson v1.2.5
108108
github.com/trinodb/trino-go-client v0.328.0
@@ -118,12 +118,12 @@ require (
118118
go.uber.org/mock v0.6.0
119119
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac
120120
golang.org/x/oauth2 v0.30.0
121-
golang.org/x/sync v0.16.0
121+
golang.org/x/sync v0.17.0
122122
golang.org/x/time v0.12.0
123123
google.golang.org/api v0.243.0
124124
google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074
125-
google.golang.org/grpc v1.74.2
126-
google.golang.org/protobuf v1.36.7
125+
google.golang.org/grpc v1.75.1
126+
google.golang.org/protobuf v1.36.9
127127
)
128128

129129
require (
@@ -163,27 +163,27 @@ require (
163163
github.com/ardielle/ardielle-go v1.5.2 // indirect
164164
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 // indirect
165165
github.com/aws/aws-sdk-go v1.55.7 // indirect
166-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
167-
github.com/aws/aws-sdk-go-v2/config v1.30.1 // indirect
168-
github.com/aws/aws-sdk-go-v2/credentials v1.18.1 // indirect
169-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.0 // indirect
170-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.1 // indirect
171-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3 // indirect
172-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3 // indirect
166+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
167+
github.com/aws/aws-sdk-go-v2/config v1.31.8 // indirect
168+
github.com/aws/aws-sdk-go-v2/credentials v1.18.12 // indirect
169+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 // indirect
170+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.6 // indirect
171+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 // indirect
172+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 // indirect
173173
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
174-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3 // indirect
175-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect
176-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3 // indirect
177-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3 // indirect
178-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3 // indirect
174+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 // indirect
175+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
176+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 // indirect
177+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 // indirect
178+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 // indirect
179179
github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.33.1 // indirect
180-
github.com/aws/aws-sdk-go-v2/service/sso v1.26.0 // indirect
181-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.31.0 // indirect
182-
github.com/aws/aws-sdk-go-v2/service/sts v1.37.0
180+
github.com/aws/aws-sdk-go-v2/service/sso v1.29.3 // indirect
181+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4 // indirect
182+
github.com/aws/aws-sdk-go-v2/service/sts v1.38.4
183183
github.com/beorn7/perks v1.0.1 // indirect
184184
github.com/bitfield/gotestdox v0.2.2 // indirect
185185
github.com/bits-and-blooms/bitset v1.14.3 // indirect
186-
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
186+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
187187
github.com/cespare/xxhash/v2 v2.3.0 // indirect
188188
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect
189189
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
@@ -195,7 +195,7 @@ require (
195195
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
196196
github.com/danieljoos/wincred v1.2.2 // indirect
197197
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
198-
github.com/dgraph-io/ristretto/v2 v2.2.0 // indirect
198+
github.com/dgraph-io/ristretto/v2 v2.3.0 // indirect
199199
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
200200
github.com/dnephin/pflag v1.0.7 // indirect
201201
github.com/docker/cli v28.3.1+incompatible // indirect
@@ -291,10 +291,10 @@ require (
291291
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
292292
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
293293
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
294-
github.com/prometheus/client_golang v1.22.0 // indirect
294+
github.com/prometheus/client_golang v1.23.2 // indirect
295295
github.com/prometheus/client_model v0.6.2 // indirect
296-
github.com/prometheus/common v0.65.0 // indirect
297-
github.com/prometheus/procfs v0.15.1 // indirect
296+
github.com/prometheus/common v0.66.1 // indirect
297+
github.com/prometheus/procfs v0.16.1 // indirect
298298
github.com/rivo/uniseg v0.4.7 // indirect
299299
github.com/rs/xid v1.6.0 // indirect
300300
github.com/rs/zerolog v1.33.0 // indirect
@@ -349,11 +349,12 @@ require (
349349
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
350350
go.uber.org/multierr v1.11.0 // indirect
351351
go.uber.org/zap v1.27.0 // indirect
352-
golang.org/x/crypto v0.40.0 // indirect
352+
go.yaml.in/yaml/v2 v2.4.2 // indirect
353+
golang.org/x/crypto v0.41.0 // indirect
353354
golang.org/x/mod v0.27.0 // indirect
354355
golang.org/x/net v0.43.0 // indirect
355356
golang.org/x/sys v0.35.0 // indirect
356-
golang.org/x/term v0.33.0 // indirect
357+
golang.org/x/term v0.34.0 // indirect
357358
golang.org/x/text v0.28.0 // indirect
358359
golang.org/x/tools v0.36.0 // indirect
359360
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect

0 commit comments

Comments
 (0)