Skip to content

Commit 881365d

Browse files
achettyiitrachettyiitr
committed
chore: review comments
1 parent 8548efb commit 881365d

File tree

13 files changed

+51
-55
lines changed

13 files changed

+51
-55
lines changed

‎app/apphandlers/embeddedAppHandler.go

+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
"github.com/rudderlabs/rudder-server/archiver"

‎cmd/backupfilemigrator/file_migrator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func (m *fileMigrator) convertToNewFormat(lineBytes []byte, createdAt time.Time)
118118
j.UserID = userID
119119
j.EventPayload = payloadBytes
120120
j.CreatedAt = createdAt
121-
j.MessageID = stringify.Data(singleEvent["messageId"])
121+
j.MessageID = stringify.Any(singleEvent["messageId"])
122122
listOfNewEvents = append(listOfNewEvents, j)
123123
}
124124
return listOfNewEvents, nil

‎gateway/handle.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import (
1717
"github.com/tidwall/gjson"
1818
"github.com/tidwall/sjson"
1919

20+
kitip "github.com/rudderlabs/rudder-go-kit/ip"
21+
2022
"github.com/rudderlabs/rudder-go-kit/sanitize"
2123
"github.com/rudderlabs/rudder-go-kit/stringify"
2224
kituuid "github.com/rudderlabs/rudder-go-kit/uuid"
@@ -334,8 +336,8 @@ func (gw *Handle) getJobDataFromRequest(req *webRequestT) (jobData *jobFromReq,
334336
return
335337
}
336338

337-
anonIDFromReq := strings.TrimSpace(sanitize.Unicode(stringify.Data(toSet["anonymousId"])))
338-
userIDFromReq := strings.TrimSpace(sanitize.Unicode(stringify.Data(toSet["userId"])))
339+
anonIDFromReq := strings.TrimSpace(sanitize.Unicode(stringify.Any(toSet["anonymousId"])))
340+
userIDFromReq := strings.TrimSpace(sanitize.Unicode(stringify.Any(toSet["userId"])))
339341
eventTypeFromReq, _ := misc.MapLookup(
340342
toSet,
341343
"type",
@@ -600,7 +602,7 @@ func (gw *Handle) addToWebRequestQ(_ *http.ResponseWriter, req *http.Request, do
600602
gw.emptyAnonIdHeaderStat.Increment()
601603
}
602604
userWebRequestWorker := gw.findUserWebRequestWorker(workerKey)
603-
ipAddr := misc.GetIPFromReq(req)
605+
ipAddr := kitip.FromReq(req)
604606

605607
traceParent := stats.GetTraceParentFromContext(req.Context())
606608
if traceParent == "" {
@@ -668,7 +670,7 @@ func (gw *Handle) internalBatchHandlerFunc() http.HandlerFunc {
668670
gw.newSourceStatTagsWithReason(arctx, reqType, ""),
669671
).Increment()
670672
gw.logger.Debugn("response",
671-
logger.NewStringField("ip", misc.GetIPFromReq(r)),
673+
logger.NewStringField("ip", kitip.FromReq(r)),
672674
logger.NewStringField("path", r.URL.Path),
673675
logger.NewIntField("status", int64(status)),
674676
logger.NewStringField("body", responseBody),
@@ -686,7 +688,7 @@ func (gw *Handle) internalBatchHandlerFunc() http.HandlerFunc {
686688
gw.newSourceStatTagsWithReason(arctx, reqType, errorMessage),
687689
).Increment()
688690
gw.logger.Infon("response",
689-
logger.NewStringField("ip", misc.GetIPFromReq(r)),
691+
logger.NewStringField("ip", kitip.FromReq(r)),
690692
logger.NewStringField("path", r.URL.Path),
691693
logger.NewIntField("status", int64(status)),
692694
logger.NewStringField("body", responseBody),

‎gateway/handle_http.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import (
55
"net/http"
66
"time"
77

8+
kitip "github.com/rudderlabs/rudder-go-kit/ip"
89
"github.com/rudderlabs/rudder-go-kit/stats"
10+
911
gwtypes "github.com/rudderlabs/rudder-server/gateway/internal/types"
1012
"github.com/rudderlabs/rudder-server/gateway/response"
11-
"github.com/rudderlabs/rudder-server/utils/misc"
1213
)
1314

1415
// webAudienceListHandler - handler for audience list requests
@@ -104,7 +105,7 @@ func (gw *Handle) webRequestHandler(rh RequestHandler, w http.ResponseWriter, r
104105
status := response.GetErrorStatusCode(errorMessage)
105106
responseBody := response.GetStatus(errorMessage)
106107
gw.logger.Infow("response",
107-
"ip", misc.GetIPFromReq(r),
108+
"ip", kitip.FromReq(r),
108109
"path", r.URL.Path,
109110
"status", status,
110111
"body", responseBody)
@@ -125,7 +126,7 @@ func (gw *Handle) webRequestHandler(rh RequestHandler, w http.ResponseWriter, r
125126

126127
responseBody := response.GetStatus(response.Ok)
127128
gw.logger.Debugw("response",
128-
"ip", misc.GetIPFromReq(r),
129+
"ip", kitip.FromReq(r),
129130
"path", r.URL.Path,
130131
"status", http.StatusOK,
131132
"body", responseBody)

‎gateway/handle_http_auth.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ import (
66

77
"github.com/samber/lo"
88

9+
kitip "github.com/rudderlabs/rudder-go-kit/ip"
10+
911
gwCtx "github.com/rudderlabs/rudder-server/gateway/internal/context"
1012

1113
backendconfig "github.com/rudderlabs/rudder-server/backend-config"
1214
gwstats "github.com/rudderlabs/rudder-server/gateway/internal/stats"
1315
gwtypes "github.com/rudderlabs/rudder-server/gateway/internal/types"
1416
"github.com/rudderlabs/rudder-server/gateway/response"
15-
"github.com/rudderlabs/rudder-server/utils/misc"
1617
)
1718

1819
// writeKeyAuth middleware to authenticate writeKey in the Authorization header.
@@ -247,7 +248,7 @@ func (gw *Handle) handleHttpError(w http.ResponseWriter, r *http.Request, errorM
247248
status := response.GetErrorStatusCode(errorMessage)
248249
responseBody := response.GetStatus(errorMessage)
249250
gw.logger.Infow("response",
250-
"ip", misc.GetIPFromReq(r),
251+
"ip", kitip.FromReq(r),
251252
"path", r.URL.Path,
252253
"status", status,
253254
"body", responseBody)

‎gateway/handle_http_beacon.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package gateway
33
import (
44
"net/http"
55

6+
kitip "github.com/rudderlabs/rudder-go-kit/ip"
7+
68
gwstats "github.com/rudderlabs/rudder-server/gateway/internal/stats"
79
"github.com/rudderlabs/rudder-server/gateway/response"
8-
"github.com/rudderlabs/rudder-server/utils/misc"
910
)
1011

1112
// beaconBatchHandler can handle beacon batch requests where writeKey is passed as a query param
@@ -35,7 +36,7 @@ func (gw *Handle) beaconInterceptor(delegate http.HandlerFunc) http.HandlerFunc
3536
stat.RequestFailed("invalidWriteKey")
3637
stat.Report(gw.stats)
3738
gw.logger.Infow("response",
38-
"ip", misc.GetIPFromReq(r),
39+
"ip", kitip.FromReq(r),
3940
"path", r.URL.Path,
4041
"status", status,
4142
"body", responseBody)

‎gateway/handle_http_pixel.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ import (
1010

1111
"github.com/tidwall/sjson"
1212

13+
kitip "github.com/rudderlabs/rudder-go-kit/ip"
14+
1315
gwstats "github.com/rudderlabs/rudder-server/gateway/internal/stats"
1416

1517
"github.com/rudderlabs/rudder-server/gateway/response"
16-
"github.com/rudderlabs/rudder-server/utils/misc"
1718
)
1819

1920
// pixelPageHandler can handle pixel page requests where everything is passed as query params.
@@ -62,7 +63,7 @@ func (gw *Handle) pixelInterceptor(reqType string, next http.HandlerFunc) http.H
6263
next(pw, pr)
6364
if pw.status != http.StatusOK {
6465
gw.logger.Infow("Error while handling request",
65-
"ip", misc.GetIPFromReq(r),
66+
"ip", kitip.FromReq(r),
6667
"path", r.URL.Path,
6768
"status", pw.status,
6869
"body", string(pw.body))
@@ -78,7 +79,7 @@ func (gw *Handle) pixelInterceptor(reqType string, next http.HandlerFunc) http.H
7879
stat.RequestFailed("NoWriteKeyInQueryParams")
7980
stat.Report(gw.stats)
8081
gw.logger.Infow("Error while handling request",
81-
"ip", misc.GetIPFromReq(r),
82+
"ip", kitip.FromReq(r),
8283
"path", r.URL.Path,
8384
"body", response.NoWriteKeyInQueryParams)
8485
}

‎gateway/webhook/webhook.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ import (
1919
"github.com/hashicorp/go-retryablehttp"
2020
"github.com/samber/lo"
2121

22+
kitip "github.com/rudderlabs/rudder-go-kit/ip"
23+
2224
"github.com/rudderlabs/rudder-go-kit/config"
2325
"github.com/rudderlabs/rudder-go-kit/logger"
2426
"github.com/rudderlabs/rudder-go-kit/stats"
27+
2528
gwtypes "github.com/rudderlabs/rudder-server/gateway/internal/types"
2629
"github.com/rudderlabs/rudder-server/gateway/response"
2730
"github.com/rudderlabs/rudder-server/gateway/webhook/model"
28-
"github.com/rudderlabs/rudder-server/utils/misc"
2931
)
3032

3133
type webhookT struct {
@@ -98,7 +100,7 @@ func (webhook *HandleT) failRequest(w http.ResponseWriter, r *http.Request, reas
98100
if code != 0 {
99101
statusCode = code
100102
}
101-
webhook.logger.Infof("IP: %s -- %s -- Response: %d, %s", misc.GetIPFromReq(r), r.URL.Path, code, reason)
103+
webhook.logger.Infof("IP: %s -- %s -- Response: %d, %s", kitip.FromReq(r), r.URL.Path, code, reason)
102104
http.Error(w, reason, statusCode)
103105
}
104106

@@ -209,7 +211,7 @@ func (webhook *HandleT) RequestHandler(w http.ResponseWriter, r *http.Request) {
209211
if resp.StatusCode != 0 {
210212
code = resp.StatusCode
211213
}
212-
webhook.logger.Infof("IP: %s -- %s -- Response: %d, %s", misc.GetIPFromReq(r), r.URL.Path, code, resp.Err)
214+
webhook.logger.Infof("IP: %s -- %s -- Response: %d, %s", kitip.FromReq(r), r.URL.Path, code, resp.Err)
213215
http.Error(w, resp.Err, code)
214216
ss.RequestFailed("error")
215217
ss.Report(webhook.stats)
@@ -221,7 +223,7 @@ func (webhook *HandleT) RequestHandler(w http.ResponseWriter, r *http.Request) {
221223
payload = resp.OutputToSource.Body
222224
w.Header().Set("Content-Type", resp.OutputToSource.ContentType)
223225
}
224-
webhook.logger.Debugf("IP: %s -- %s -- Response: 200, %s", misc.GetIPFromReq(r), r.URL.Path, response.GetStatus(response.Ok))
226+
webhook.logger.Debugf("IP: %s -- %s -- Response: 200, %s", kitip.FromReq(r), r.URL.Path, response.GetStatus(response.Ok))
225227
_, _ = w.Write(payload)
226228
ss.RequestSucceeded()
227229
ss.Report(webhook.stats)

‎go.mod

+6-7
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ require (
4040
github.com/allisson/go-pglock/v2 v2.0.1
4141
github.com/apache/pulsar-client-go v0.12.1
4242
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
43-
github.com/aws/aws-sdk-go v1.51.15
43+
github.com/aws/aws-sdk-go v1.51.16
4444
github.com/bugsnag/bugsnag-go/v2 v2.3.1
4545
github.com/cenkalti/backoff v2.2.1+incompatible
4646
github.com/cenkalti/backoff/v4 v4.3.0
@@ -83,7 +83,7 @@ require (
8383
github.com/rudderlabs/analytics-go v3.3.3+incompatible
8484
github.com/rudderlabs/bing-ads-go-sdk v0.2.1
8585
github.com/rudderlabs/compose-test v0.1.3
86-
github.com/rudderlabs/rudder-go-kit v0.24.1-0.20240408104154-c069c80ce29d
86+
github.com/rudderlabs/rudder-go-kit v0.24.1-0.20240408193511-d160a18ce79f
8787
github.com/rudderlabs/rudder-observability-kit v0.0.3
8888
github.com/rudderlabs/sql-tunnels v0.1.6
8989
github.com/samber/lo v1.39.0
@@ -110,8 +110,8 @@ require (
110110
go.uber.org/automaxprocs v1.5.3
111111
go.uber.org/goleak v1.3.0
112112
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
113-
golang.org/x/oauth2 v0.18.0
114-
golang.org/x/sync v0.6.0
113+
golang.org/x/oauth2 v0.19.0
114+
golang.org/x/sync v0.7.0
115115
google.golang.org/api v0.172.0
116116
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237
117117
google.golang.org/grpc v1.62.1
@@ -294,16 +294,15 @@ require (
294294
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
295295
go.uber.org/multierr v1.11.0 // indirect
296296
go.uber.org/zap v1.27.0 // indirect
297-
golang.org/x/crypto v0.21.0 // indirect
297+
golang.org/x/crypto v0.22.0 // indirect
298298
golang.org/x/mod v0.14.0 // indirect
299299
golang.org/x/net v0.22.0 // indirect
300-
golang.org/x/sys v0.18.0 // indirect
300+
golang.org/x/sys v0.19.0 // indirect
301301
golang.org/x/term v0.15.0 // indirect
302302
golang.org/x/text v0.14.0 // indirect
303303
golang.org/x/time v0.5.0 // indirect
304304
golang.org/x/tools v0.17.0 // indirect
305305
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
306-
google.golang.org/appengine v1.6.8 // indirect
307306
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
308307
google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c // indirect
309308
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect

‎go.sum

+10-11
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ github.com/aws/aws-sdk-go v1.30.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZve
211211
github.com/aws/aws-sdk-go v1.32.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
212212
github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
213213
github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
214-
github.com/aws/aws-sdk-go v1.51.15 h1:rxRcn4hmkhxUfIQrmnFfOOW4NQRiRve7GlgQcor13JE=
215-
github.com/aws/aws-sdk-go v1.51.15/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
214+
github.com/aws/aws-sdk-go v1.51.16 h1:vnWKK8KjbftEkuPX8bRj3WHsLy1uhotn0eXptpvrxJI=
215+
github.com/aws/aws-sdk-go v1.51.16/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
216216
github.com/aws/aws-sdk-go-v2 v1.16.2/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU=
217217
github.com/aws/aws-sdk-go-v2 v1.23.0 h1:PiHAzmiQQr6JULBUdvR8fKlA+UPKLT/8KbiqpFBWiAo=
218218
github.com/aws/aws-sdk-go-v2 v1.23.0/go.mod h1:i1XDttT4rnf6vxc9AuskLc6s7XBee8rlLilKlc03uAA=
@@ -950,8 +950,8 @@ github.com/rudderlabs/compose-test v0.1.3 h1:uyep6jDCIF737sfv4zIaMsKRQKX95IDz5Xb
950950
github.com/rudderlabs/compose-test v0.1.3/go.mod h1:tuvS1eQdSfwOYv1qwyVAcpdJxPLQXJgy5xGDd/9XmMg=
951951
github.com/rudderlabs/parquet-go v0.0.2 h1:ZXRdZdimB0PdJtmxeSSxfI0fDQ3kZjwzBxRi6Ut1J8k=
952952
github.com/rudderlabs/parquet-go v0.0.2/go.mod h1:g6guum7o8uhj/uNhunnt7bw5Vabu/goI5i21/3fnxWQ=
953-
github.com/rudderlabs/rudder-go-kit v0.24.1-0.20240408104154-c069c80ce29d h1:1GXy0AulBxe7u65oURHorRaLOMyQVb8MHR/dEPsmRiA=
954-
github.com/rudderlabs/rudder-go-kit v0.24.1-0.20240408104154-c069c80ce29d/go.mod h1:b+zGxDSxH8Me6rfsWE5VyuJsy57m4c8/Xa2eEq+PP4M=
953+
github.com/rudderlabs/rudder-go-kit v0.24.1-0.20240408193511-d160a18ce79f h1:Fo6JkacMgWEkqIev8C0zzvS0LyP+3okxHa8h7NcGTps=
954+
github.com/rudderlabs/rudder-go-kit v0.24.1-0.20240408193511-d160a18ce79f/go.mod h1:4WYy8ny5JMymWYNd4WWiLR8W+QfOQ5tuhG/Z0WphyLs=
955955
github.com/rudderlabs/rudder-observability-kit v0.0.3 h1:vZtuZRkGX+6rjaeKtxxFE2YYP6QlmAcVcgecTOjvz+Q=
956956
github.com/rudderlabs/rudder-observability-kit v0.0.3/go.mod h1:6UjAh3H6rkE0fFLh7z8ZGQEQbKtUkRfhWOf/OUhfqW8=
957957
github.com/rudderlabs/sql-tunnels v0.1.6 h1:v2KA2cq8ZV5LXRJQpqigq1Q4V64oDL+XlfckW/0K2/4=
@@ -1234,8 +1234,8 @@ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ
12341234
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
12351235
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
12361236
golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk=
1237-
golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
1238-
golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
1237+
golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg=
1238+
golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8=
12391239
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
12401240
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
12411241
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1250,8 +1250,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
12501250
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
12511251
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
12521252
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1253-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
1254-
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
1253+
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
1254+
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
12551255
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
12561256
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
12571257
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1338,8 +1338,9 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13381338
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13391339
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13401340
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1341-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
13421341
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1342+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
1343+
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
13431344
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
13441345
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
13451346
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
@@ -1482,8 +1483,6 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
14821483
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
14831484
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
14841485
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
1485-
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
1486-
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
14871486
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
14881487
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
14891488
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=

‎processor/processor.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ func makeCommonMetadataFromSingularEvent(singularEvent types.SingularEventT, bat
919919
commonMetadata.InstanceID = misc.GetInstanceID()
920920
commonMetadata.RudderID = batchEvent.UserID
921921
commonMetadata.JobID = batchEvent.JobID
922-
commonMetadata.MessageID = stringify.Data(singularEvent["messageId"])
922+
commonMetadata.MessageID = stringify.Any(singularEvent["messageId"])
923923
commonMetadata.ReceivedAt = receivedAt.Format(misc.RFC3339Milli)
924924
commonMetadata.SourceType = source.SourceDefinition.Name
925925
commonMetadata.SourceCategory = source.SourceDefinition.Category
@@ -1010,8 +1010,8 @@ func (proc *Handle) recordEventDeliveryStatus(jobsByDestID map[string][]*jobsdb.
10101010
continue
10111011
}
10121012

1013-
eventName := stringify.Data(gjson.GetBytes(eventPayload, "event").String())
1014-
eventType := stringify.Data(gjson.GetBytes(eventPayload, "type").String())
1013+
eventName := stringify.Any(gjson.GetBytes(eventPayload, "event").String())
1014+
eventType := stringify.Any(gjson.GetBytes(eventPayload, "type").String())
10151015
deliveryStatus := destinationdebugger.DeliveryStatusT{
10161016
EventName: eventName,
10171017
EventType: eventType,
@@ -1638,7 +1638,7 @@ func (proc *Handle) processJobsForDest(partition string, subJobs subJob) *transf
16381638

16391639
// Iterate through all the events in the batch
16401640
for _, singularEvent := range gatewayBatchEvent.Batch {
1641-
messageId := stringify.Data(singularEvent["messageId"])
1641+
messageId := stringify.Any(singularEvent["messageId"])
16421642

16431643
payloadFunc := ro.Memoize(func() json.RawMessage {
16441644
payloadBytes, err := jsonfast.Marshal(singularEvent)

‎services/debugger/source/eventUploader.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ func (e *EventUploader) Transform(eventBuffer []*GatewayEventBatchT) ([]byte, er
206206
event := map[string]interface{}{
207207
"payload": ev,
208208
"receivedAt": receivedAtStr,
209-
"eventName": stringify.Data(ev["event"]),
210-
"eventType": stringify.Data(ev["type"]),
209+
"eventName": stringify.Any(ev["event"]),
210+
"eventType": stringify.Any(ev["type"]),
211211
"errorResponse": make(map[string]interface{}),
212212
"errorCode": 200,
213213
}

‎utils/misc/misc.go

-11
Original file line numberDiff line numberDiff line change
@@ -350,17 +350,6 @@ func Copy(dst, src interface{}) {
350350
}
351351
}
352352

353-
// GetIPFromReq gets ip address from request
354-
func GetIPFromReq(req *http.Request) string {
355-
addresses := strings.Split(req.Header.Get("X-Forwarded-For"), ",")
356-
if addresses[0] == "" {
357-
splits := strings.Split(req.RemoteAddr, ":")
358-
return strings.Join(splits[:len(splits)-1], ":") // When there is no load-balancer
359-
}
360-
361-
return strings.ReplaceAll(addresses[0], " ", "")
362-
}
363-
364353
//  Returns chronological timestamp of the event using the formula
365354
//  timestamp = receivedAt - (sentAt - originalTimestamp)
366355
func GetChronologicalTimeStamp(receivedAt, sentAt, originalTimestamp time.Time) time.Time {

0 commit comments

Comments
 (0)