Skip to content

Commit 3deadee

Browse files
achettyiitrachettyiitr
authored
feat: adaptations of additional helpers packages from go-kit (#4562)
* feat: additional of some helpers fot go-kit * chore: review comments * chore: upgrade go-kit
1 parent d7e9a9e commit 3deadee

File tree

87 files changed

+439
-736
lines changed

Some content is hidden

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

87 files changed

+439
-736
lines changed

‎app/app.go

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
"github.com/rudderlabs/rudder-go-kit/config"
1414
"github.com/rudderlabs/rudder-go-kit/logger"
15+
1516
backendconfig "github.com/rudderlabs/rudder-server/backend-config"
1617
configenv "github.com/rudderlabs/rudder-server/enterprise/config-env"
1718
"github.com/rudderlabs/rudder-server/enterprise/replay"

‎app/apphandlers/embeddedAppHandler.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/rudderlabs/rudder-go-kit/config"
1212
"github.com/rudderlabs/rudder-go-kit/logger"
1313
"github.com/rudderlabs/rudder-go-kit/stats"
14+
1415
"github.com/rudderlabs/rudder-server/app"
1516
"github.com/rudderlabs/rudder-server/app/cluster"
1617
"github.com/rudderlabs/rudder-server/archiver"
@@ -48,10 +49,10 @@ type embeddedApp struct {
4849
log logger.Logger
4950
config struct {
5051
enableReplay bool
51-
processorDSLimit misc.ValueLoader[int]
52-
routerDSLimit misc.ValueLoader[int]
53-
batchRouterDSLimit misc.ValueLoader[int]
54-
gatewayDSLimit misc.ValueLoader[int]
52+
processorDSLimit config.ValueLoader[int]
53+
routerDSLimit config.ValueLoader[int]
54+
batchRouterDSLimit config.ValueLoader[int]
55+
gatewayDSLimit config.ValueLoader[int]
5556
}
5657
}
5758

‎app/apphandlers/gatewayAppHandler.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/rudderlabs/rudder-go-kit/config"
1212
"github.com/rudderlabs/rudder-go-kit/logger"
1313
"github.com/rudderlabs/rudder-go-kit/stats"
14+
1415
"github.com/rudderlabs/rudder-server/app"
1516
"github.com/rudderlabs/rudder-server/app/cluster"
1617
backendconfig "github.com/rudderlabs/rudder-server/backend-config"
@@ -33,7 +34,7 @@ type gatewayApp struct {
3334
versionHandler func(w http.ResponseWriter, r *http.Request)
3435
log logger.Logger
3536
config struct {
36-
gatewayDSLimit misc.ValueLoader[int]
37+
gatewayDSLimit config.ValueLoader[int]
3738
}
3839
}
3940

‎app/apphandlers/processorAppHandler.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ type processorApp struct {
4949
versionHandler func(w http.ResponseWriter, r *http.Request)
5050
log logger.Logger
5151
config struct {
52-
processorDSLimit misc.ValueLoader[int]
53-
routerDSLimit misc.ValueLoader[int]
54-
batchRouterDSLimit misc.ValueLoader[int]
55-
gatewayDSLimit misc.ValueLoader[int]
52+
processorDSLimit config.ValueLoader[int]
53+
routerDSLimit config.ValueLoader[int]
54+
batchRouterDSLimit config.ValueLoader[int]
55+
gatewayDSLimit config.ValueLoader[int]
5656
http struct {
5757
ReadTimeout time.Duration
5858
ReadHeaderTimeout time.Duration

‎app/cluster/integration_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"github.com/rudderlabs/rudder-go-kit/config"
2121
"github.com/rudderlabs/rudder-go-kit/logger"
2222
"github.com/rudderlabs/rudder-go-kit/stats"
23+
2324
"github.com/rudderlabs/rudder-server/admin"
2425
"github.com/rudderlabs/rudder-server/app/cluster"
2526
arc "github.com/rudderlabs/rudder-server/archiver"

‎backend-config/backend-config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919
"github.com/rudderlabs/rudder-go-kit/config"
2020
"github.com/rudderlabs/rudder-go-kit/logger"
2121
"github.com/rudderlabs/rudder-go-kit/stats"
22+
2223
"github.com/rudderlabs/rudder-server/backend-config/internal/cache"
2324
"github.com/rudderlabs/rudder-server/rruntime"
2425
"github.com/rudderlabs/rudder-server/services/controlplane/identity"
2526
"github.com/rudderlabs/rudder-server/services/diagnostics"
26-
"github.com/rudderlabs/rudder-server/utils/misc"
2727
"github.com/rudderlabs/rudder-server/utils/pubsub"
2828
"github.com/rudderlabs/rudder-server/utils/sysUtils"
2929
"github.com/rudderlabs/rudder-server/utils/types"
@@ -34,7 +34,7 @@ var (
3434
// environment variables
3535
configBackendURL string
3636
cpRouterURL string
37-
pollInterval misc.ValueLoader[time.Duration]
37+
pollInterval config.ValueLoader[time.Duration]
3838
configJSONPath string
3939
configFromFile bool
4040
configEnvReplacementEnabled bool

‎backend-config/backend_config_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"github.com/rudderlabs/rudder-go-kit/config"
2424
"github.com/rudderlabs/rudder-go-kit/logger"
2525
"github.com/rudderlabs/rudder-go-kit/stats"
26+
2627
adminpkg "github.com/rudderlabs/rudder-server/admin"
2728
"github.com/rudderlabs/rudder-server/backend-config/internal/cache"
2829
"github.com/rudderlabs/rudder-server/services/diagnostics"
29-
"github.com/rudderlabs/rudder-server/utils/misc"
3030
"github.com/rudderlabs/rudder-server/utils/pubsub"
3131
"github.com/rudderlabs/rudder-server/utils/types/deployment"
3232
)
@@ -331,7 +331,7 @@ func TestWaitForConfig(t *testing.T) {
331331
defer ctrl.Finish()
332332

333333
pkgLogger = logger.NOP
334-
pollInterval = misc.SingleValueLoader(time.Millisecond)
334+
pollInterval = config.SingleValueLoader(time.Millisecond)
335335
bc := &backendConfigImpl{initialized: false}
336336

337337
var done int32

‎cmd/backupfilemigrator/file_migrator.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"strings"
1313
"time"
1414

15+
"github.com/rudderlabs/rudder-go-kit/stringify"
1516
obskit "github.com/rudderlabs/rudder-observability-kit/go/labels"
1617

1718
kitconfig "github.com/rudderlabs/rudder-go-kit/config"
@@ -31,6 +32,7 @@ import (
3132

3233
"github.com/rudderlabs/rudder-go-kit/filemanager"
3334
kitlogger "github.com/rudderlabs/rudder-go-kit/logger"
35+
3436
"github.com/rudderlabs/rudder-server/enterprise/replay/utils"
3537
)
3638

@@ -116,7 +118,7 @@ func (m *fileMigrator) convertToNewFormat(lineBytes []byte, createdAt time.Time)
116118
j.UserID = userID
117119
j.EventPayload = payloadBytes
118120
j.CreatedAt = createdAt
119-
j.MessageID = misc.GetStringifiedData(singleEvent["messageId"])
121+
j.MessageID = stringify.Any(singleEvent["messageId"])
120122
listOfNewEvents = append(listOfNewEvents, j)
121123
}
122124
return listOfNewEvents, nil

‎enterprise/reporting/error_extractor.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
"github.com/rudderlabs/rudder-go-kit/config"
1313
"github.com/rudderlabs/rudder-go-kit/logger"
14-
"github.com/rudderlabs/rudder-server/utils/misc"
1514
)
1615

1716
const (
@@ -69,7 +68,7 @@ var lowercasedDeprecationKeywords = lo.MapKeys(deprecationKeywords, func(_ int,
6968
type ExtractorHandle struct {
7069
log logger.Logger
7170
ErrorMessageKeys []string // the keys where in we may have error message
72-
versionDeprecationThresholdScore misc.ValueLoader[int]
71+
versionDeprecationThresholdScore config.ValueLoader[int]
7372
}
7473

7574
func NewErrorDetailExtractor(log logger.Logger) *ExtractorHandle {

‎enterprise/reporting/error_index/error_index_reporting.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/rudderlabs/rudder-go-kit/logger"
1717
"github.com/rudderlabs/rudder-go-kit/stats"
1818
kitsync "github.com/rudderlabs/rudder-go-kit/sync"
19+
1920
"github.com/rudderlabs/rudder-server/jobsdb"
20-
"github.com/rudderlabs/rudder-server/utils/misc"
2121
. "github.com/rudderlabs/rudder-server/utils/tx" //nolint:staticcheck
2222
"github.com/rudderlabs/rudder-server/utils/types"
2323
"github.com/rudderlabs/rudder-server/utils/workerpool"
@@ -43,7 +43,7 @@ type ErrorIndexReporter struct {
4343
update kitsync.Limiter
4444
}
4545

46-
concurrency misc.ValueLoader[int]
46+
concurrency config.ValueLoader[int]
4747

4848
statsFactory stats.Stats
4949
stats struct {

‎enterprise/reporting/error_index/worker.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ type worker struct {
5555
lastUploadTime time.Time
5656

5757
config struct {
58-
parquetParallelWriters, parquetRowGroupSize, parquetPageSize misc.ValueLoader[int64]
58+
parquetParallelWriters, parquetRowGroupSize, parquetPageSize config.ValueLoader[int64]
5959
bucketName, instanceID string
60-
payloadLimit, eventsLimit misc.ValueLoader[int64]
60+
payloadLimit, eventsLimit config.ValueLoader[int64]
6161
minWorkerSleep, uploadFrequency, jobsDBCommandTimeout time.Duration
62-
jobsDBMaxRetries misc.ValueLoader[int]
62+
jobsDBMaxRetries config.ValueLoader[int]
6363
}
6464
}
6565

‎enterprise/reporting/error_index/worker_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import (
3636
kitsync "github.com/rudderlabs/rudder-go-kit/sync"
3737
"github.com/rudderlabs/rudder-go-kit/testhelper/docker/resource/minio"
3838
"github.com/rudderlabs/rudder-go-kit/testhelper/docker/resource/postgres"
39+
3940
"github.com/rudderlabs/rudder-server/jobsdb"
40-
"github.com/rudderlabs/rudder-server/utils/misc"
4141
warehouseutils "github.com/rudderlabs/rudder-server/warehouse/utils"
4242
)
4343

@@ -84,9 +84,9 @@ func TestWorkerWriter(t *testing.T) {
8484
buf := bytes.NewBuffer(make([]byte, 0, 1024))
8585

8686
w := worker{}
87-
w.config.parquetRowGroupSize = misc.SingleValueLoader(512 * bytesize.MB)
88-
w.config.parquetPageSize = misc.SingleValueLoader(8 * bytesize.KB)
89-
w.config.parquetParallelWriters = misc.SingleValueLoader(int64(8))
87+
w.config.parquetRowGroupSize = config.SingleValueLoader(512 * bytesize.MB)
88+
w.config.parquetPageSize = config.SingleValueLoader(8 * bytesize.KB)
89+
w.config.parquetParallelWriters = config.SingleValueLoader(int64(8))
9090

9191
require.NoError(t, w.encodeToParquet(buf, toEncode))
9292

@@ -125,9 +125,9 @@ func TestWorkerWriter(t *testing.T) {
125125
require.NoError(t, err)
126126

127127
w := worker{}
128-
w.config.parquetRowGroupSize = misc.SingleValueLoader(512 * bytesize.MB)
129-
w.config.parquetPageSize = misc.SingleValueLoader(8 * bytesize.KB)
130-
w.config.parquetParallelWriters = misc.SingleValueLoader(int64(8))
128+
w.config.parquetRowGroupSize = config.SingleValueLoader(512 * bytesize.MB)
129+
w.config.parquetPageSize = config.SingleValueLoader(8 * bytesize.KB)
130+
w.config.parquetParallelWriters = config.SingleValueLoader(int64(8))
131131

132132
require.NoError(t, w.encodeToParquet(fw, toEncode))
133133

@@ -713,9 +713,9 @@ func BenchmarkFileFormat(b *testing.B) {
713713
}
714714

715715
w := worker{}
716-
w.config.parquetRowGroupSize = misc.SingleValueLoader(512 * bytesize.MB)
717-
w.config.parquetPageSize = misc.SingleValueLoader(8 * bytesize.KB)
718-
w.config.parquetParallelWriters = misc.SingleValueLoader(int64(8))
716+
w.config.parquetRowGroupSize = config.SingleValueLoader(512 * bytesize.MB)
717+
w.config.parquetPageSize = config.SingleValueLoader(8 * bytesize.KB)
718+
w.config.parquetParallelWriters = config.SingleValueLoader(int64(8))
719719

720720
buf := bytes.NewBuffer(make([]byte, 0, 1024))
721721

‎enterprise/reporting/error_reporting.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"github.com/rudderlabs/rudder-go-kit/config"
2323
"github.com/rudderlabs/rudder-go-kit/logger"
2424
"github.com/rudderlabs/rudder-go-kit/stats"
25+
2526
migrator "github.com/rudderlabs/rudder-server/services/sql-migrator"
2627
"github.com/rudderlabs/rudder-server/utils/httputil"
27-
"github.com/rudderlabs/rudder-server/utils/misc"
2828
. "github.com/rudderlabs/rudder-server/utils/tx" //nolint:staticcheck
2929
"github.com/rudderlabs/rudder-server/utils/types"
3030
)
@@ -65,9 +65,9 @@ type ErrorDetailReporter struct {
6565

6666
instanceID string
6767
region string
68-
sleepInterval misc.ValueLoader[time.Duration]
69-
mainLoopSleepInterval misc.ValueLoader[time.Duration]
70-
maxConcurrentRequests misc.ValueLoader[int]
68+
sleepInterval config.ValueLoader[time.Duration]
69+
mainLoopSleepInterval config.ValueLoader[time.Duration]
70+
maxConcurrentRequests config.ValueLoader[int]
7171
maxOpenConnections int
7272

7373
httpClient *http.Client

‎enterprise/reporting/reporting.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"github.com/rudderlabs/rudder-go-kit/config"
2626
"github.com/rudderlabs/rudder-go-kit/logger"
2727
"github.com/rudderlabs/rudder-go-kit/stats"
28+
2829
migrator "github.com/rudderlabs/rudder-server/services/sql-migrator"
2930
"github.com/rudderlabs/rudder-server/utils/httputil"
30-
"github.com/rudderlabs/rudder-server/utils/misc"
3131
. "github.com/rudderlabs/rudder-server/utils/tx" //nolint:staticcheck
3232
"github.com/rudderlabs/rudder-server/utils/types"
3333
)
@@ -61,12 +61,12 @@ type DefaultReporter struct {
6161
instanceID string
6262
whActionsOnly bool
6363
region string
64-
sleepInterval misc.ValueLoader[time.Duration]
65-
mainLoopSleepInterval misc.ValueLoader[time.Duration]
64+
sleepInterval config.ValueLoader[time.Duration]
65+
mainLoopSleepInterval config.ValueLoader[time.Duration]
6666
dbQueryTimeout *config.Reloadable[time.Duration]
6767
sourcesWithEventNameTrackingDisabled []string
6868
maxOpenConnections int
69-
maxConcurrentRequests misc.ValueLoader[int]
69+
maxConcurrentRequests config.ValueLoader[int]
7070

7171
getMinReportedAtQueryTime stats.Measurement
7272
getReportsQueryTime stats.Measurement

‎enterprise/suppress-user/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func (m *Factory) retryIndefinitely(ctx context.Context, f func() error, wait ti
189189
}
190190
}
191191

192-
func (m *Factory) newSyncerWithBadgerRepo(repoPath string, seederSource func() (io.ReadCloser, error), maxSeedWaitTime time.Duration, identity identity.Identifier, pollInterval misc.ValueLoader[time.Duration]) (*Syncer, Repository, error) {
192+
func (m *Factory) newSyncerWithBadgerRepo(repoPath string, seederSource func() (io.ReadCloser, error), maxSeedWaitTime time.Duration, identity identity.Identifier, pollInterval config.ValueLoader[time.Duration]) (*Syncer, Repository, error) {
193193
repo, err := NewBadgerRepository(
194194
repoPath,
195195
m.Log,

‎gateway/gateway_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"time"
1818

1919
kithelper "github.com/rudderlabs/rudder-go-kit/testhelper"
20+
kituuid "github.com/rudderlabs/rudder-go-kit/uuid"
2021

2122
"github.com/golang/mock/gomock"
2223
"github.com/google/uuid"
@@ -30,6 +31,7 @@ import (
3031
"github.com/rudderlabs/rudder-go-kit/logger"
3132
"github.com/rudderlabs/rudder-go-kit/stats"
3233
"github.com/rudderlabs/rudder-go-kit/stats/memstats"
34+
3335
"github.com/rudderlabs/rudder-server/admin"
3436
"github.com/rudderlabs/rudder-server/app"
3537
backendconfig "github.com/rudderlabs/rudder-server/backend-config"
@@ -219,7 +221,7 @@ var _ = Describe("Reconstructing JSON for ServerSide SDK", func() {
219221
{"anonymousId":"anon_id_1","event":"event_1_3"}
220222
]}`
221223
response, payloadError := getUsersPayload([]byte(testValidBody))
222-
key, err := misc.GetMD5UUID(inputKey)
224+
key, err := kituuid.GetMD5UUID(inputKey)
223225
Expect(string(response[key.String()])).To(Equal(value))
224226
Expect(err).To(BeNil())
225227
Expect(payloadError).To(BeNil())

0 commit comments

Comments
 (0)