Skip to content

Commit fb78dd7

Browse files
mangalaman93mangalaman93
authored
Remove sentry integration from both Alpha & Zero (#9343) (#9344)
This PR removes the sentry integration from both alpha and zero. We keep the telemetry flag around so that existing deployment of dgraph do not break.
1 parent f140c24 commit fb78dd7

File tree

72 files changed

+461
-738
lines changed

Some content is hidden

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

72 files changed

+461
-738
lines changed

‎.vscode/launch.json‎

Lines changed: 59 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,59 @@
1-
{
2-
"version": "0.2.0",
3-
"configurations": [
4-
{
5-
"name": "Alpha",
6-
"type": "go",
7-
"request": "launch",
8-
"mode": "debug",
9-
"program": "${workspaceRoot}/dgraph/",
10-
"env": {},
11-
"args": ["alpha", "--trace", "jaeger=http://localhost:14268; ratio=0.99;", "--telemetry", "sentry=false;", "--security", "whitelist=0.0.0.0/0;"],
12-
"showLog": true
13-
},
14-
{
15-
"name": "Zero",
16-
"type": "go",
17-
"request": "launch",
18-
"mode": "debug",
19-
"program": "${workspaceRoot}/dgraph/",
20-
"env": {},
21-
"args": ["zero"],
22-
"showLog": true
23-
},
24-
{
25-
"name": "AlphaACL",
26-
"type": "go",
27-
"request": "launch",
28-
"mode": "debug",
29-
"program": "${workspaceRoot}/dgraph/",
30-
"env": {},
31-
"args": ["alpha", "--trace", "jaeger=http://localhost:14268; ratio=0.99;", "--telemetry", "sentry=false;", "--security", "whitelist=0.0.0.0/0;", "--acl", "secret-file=../ee/acl/hmac-secret; access-ttl=300000s;"],
32-
"showLog": true
33-
}
34-
],
35-
"compounds": [
36-
{
37-
"name": "normal",
38-
"configurations": ["Alpha", "Zero"]
39-
},
40-
{
41-
"name": "ACL",
42-
"configurations": ["AlphaACL", "Zero"]
43-
}
44-
]
45-
}
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "Alpha",
6+
"type": "go",
7+
"request": "launch",
8+
"mode": "debug",
9+
"program": "${workspaceRoot}/dgraph/",
10+
"env": {},
11+
"args": [
12+
"alpha",
13+
"--trace",
14+
"jaeger=http://localhost:14268; ratio=0.99;",
15+
"--security",
16+
"whitelist=0.0.0.0/0;"
17+
],
18+
"showLog": true
19+
},
20+
{
21+
"name": "Zero",
22+
"type": "go",
23+
"request": "launch",
24+
"mode": "debug",
25+
"program": "${workspaceRoot}/dgraph/",
26+
"env": {},
27+
"args": ["zero"],
28+
"showLog": true
29+
},
30+
{
31+
"name": "AlphaACL",
32+
"type": "go",
33+
"request": "launch",
34+
"mode": "debug",
35+
"program": "${workspaceRoot}/dgraph/",
36+
"env": {},
37+
"args": [
38+
"alpha",
39+
"--trace",
40+
"jaeger=http://localhost:14268; ratio=0.99;",
41+
"--security",
42+
"whitelist=0.0.0.0/0;",
43+
"--acl",
44+
"secret-file=../ee/acl/hmac-secret; access-ttl=300000s;"
45+
],
46+
"showLog": true
47+
}
48+
],
49+
"compounds": [
50+
{
51+
"name": "normal",
52+
"configurations": ["Alpha", "Zero"]
53+
},
54+
{
55+
"name": "ACL",
56+
"configurations": ["AlphaACL", "Zero"]
57+
}
58+
]
59+
}

‎dgraph/cmd/alpha/mutations_mode/docker-compose.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ services:
1717
target: /gobin
1818
read_only: true
1919
command:
20-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false; sentry=false;"
21-
--my=alpha1:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --security
20+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080
21+
--zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --security
2222
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --limit "mutations=disallow;"
2323
alpha2:
2424
image: dgraph/dgraph:local
@@ -34,8 +34,8 @@ services:
3434
target: /gobin
3535
read_only: true
3636
command:
37-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false; sentry=false;"
38-
--my=alpha2:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --security
37+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080
38+
--zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --security
3939
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --limit "mutations=strict;"
4040
alpha3:
4141
image: dgraph/dgraph:local
@@ -51,8 +51,8 @@ services:
5151
target: /gobin
5252
read_only: true
5353
command:
54-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false; sentry=false;"
55-
--my=alpha3:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --security
54+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080
55+
--zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --security
5656
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --limit "mutations=strict;"
5757
zero1:
5858
image: dgraph/dgraph:local
@@ -68,8 +68,8 @@ services:
6868
target: /gobin
6969
read_only: true
7070
command:
71-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false; sentry=false;" --raft
72-
"idx=1;" --my=zero1:5080 --replicas=1 --logtostderr -v=2 --bindall
71+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --raft "idx=1;"
72+
--my=zero1:5080 --replicas=1 --logtostderr -v=2 --bindall
7373
zero2:
7474
image: dgraph/dgraph:local
7575
working_dir: /data/zero2
@@ -86,8 +86,8 @@ services:
8686
target: /gobin
8787
read_only: true
8888
command:
89-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false; sentry=false;" --raft
90-
"idx=2;" --my=zero2:5080 --replicas=1 --logtostderr -v=2 --peer=zero1:5080
89+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --raft "idx=2;"
90+
--my=zero2:5080 --replicas=1 --logtostderr -v=2 --peer=zero1:5080
9191
zero3:
9292
image: dgraph/dgraph:local
9393
working_dir: /data/zero3
@@ -104,6 +104,6 @@ services:
104104
target: /gobin
105105
read_only: true
106106
command:
107-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false; sentry=false;" --raft
108-
"idx=3;" --my=zero3:5080 --replicas=1 --logtostderr -v=2 --peer=zero1:5080
107+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --raft "idx=3;"
108+
--my=zero3:5080 --replicas=1 --logtostderr -v=2 --peer=zero1:5080
109109
volumes: {}

‎dgraph/cmd/alpha/run.go‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ import (
5555
"github.com/hypermodeinc/dgraph/v24/edgraph"
5656
"github.com/hypermodeinc/dgraph/v24/ee"
5757
"github.com/hypermodeinc/dgraph/v24/ee/audit"
58-
"github.com/hypermodeinc/dgraph/v24/ee/enc"
5958
"github.com/hypermodeinc/dgraph/v24/graphql/admin"
6059
"github.com/hypermodeinc/dgraph/v24/posting"
6160
"github.com/hypermodeinc/dgraph/v24/schema"
@@ -626,15 +625,8 @@ func setupServer(closer *z.Closer) {
626625
func run() {
627626
var err error
628627

629-
telemetry := z.NewSuperFlag(Alpha.Conf.GetString("telemetry")).MergeAndCheckDefault(
630-
x.TelemetryDefaults)
631-
if telemetry.GetBool("sentry") {
632-
x.InitSentry(enc.EeBuild)
633-
defer x.FlushSentry()
634-
x.ConfigureSentryScope("alpha")
635-
x.WrapPanics()
636-
x.SentryOptOutNote()
637-
}
628+
telemetry := z.NewSuperFlag(Alpha.Conf.GetString("telemetry")).
629+
MergeAndCheckDefault(x.TelemetryDefaults)
638630

639631
bindall = Alpha.Conf.GetBool("bindall")
640632
cache := z.NewSuperFlag(Alpha.Conf.GetString("cache")).MergeAndCheckDefault(
@@ -865,7 +857,6 @@ func run() {
865857
audit.Close()
866858

867859
worker.State.Dispose()
868-
x.RemoveCidFile()
869860
glog.Info("worker.State disposed.")
870861

871862
updaters.Wait()

‎dgraph/cmd/zero/run.go‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,9 @@ func (st *state) serveGRPC(l net.Listener, store *raftwal.DiskStorage) {
213213
}
214214

215215
func run() {
216-
telemetry := z.NewSuperFlag(Zero.Conf.GetString("telemetry")).MergeAndCheckDefault(
217-
x.TelemetryDefaults)
218-
if telemetry.GetBool("sentry") {
219-
x.InitSentry(enc.EeBuild)
220-
defer x.FlushSentry()
221-
x.ConfigureSentryScope("zero")
222-
x.WrapPanics()
223-
x.SentryOptOutNote()
224-
}
216+
// keeping this flag for backward compatibility
217+
telemetry := z.NewSuperFlag(Zero.Conf.GetString("telemetry")).
218+
MergeAndCheckDefault(x.TelemetryDefaults)
225219

226220
x.PrintVersion()
227221
tlsConf, err := x.LoadClientTLSConfigForInternalPort(Zero.Conf)
@@ -376,8 +370,6 @@ func run() {
376370
st.node.closer.SignalAndWait()
377371
// Stop all internal requests.
378372
_ = grpcListener.Close()
379-
380-
x.RemoveCidFile()
381373
}()
382374

383375
st.zero.closer.AddRunning(2)

‎dgraph/docker-compose.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ services:
1515
target: /gobin
1616
read_only: true
1717
command:
18-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false; sentry=false;"
19-
--my=zero1:5080 --replicas 3 --raft="idx=1" --logtostderr -v=2 --bindall --expose_trace
20-
--profile_mode block --block_rate 10
18+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --my=zero1:5080 --replicas
19+
3 --raft="idx=1" --logtostderr -v=2 --bindall --expose_trace --profile_mode block --block_rate
20+
10
2121

2222
zero2:
2323
image: dgraph/dgraph:local
@@ -36,8 +36,8 @@ services:
3636
target: /gobin
3737
read_only: true
3838
command:
39-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false; sentry=false;"
40-
--my=zero2:5080 --replicas 3 --raft="idx=2" --logtostderr -v=2 --peer=zero1:5080
39+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --my=zero2:5080
40+
--replicas 3 --raft="idx=2" --logtostderr -v=2 --peer=zero1:5080
4141

4242
zero3:
4343
image: dgraph/dgraph:local
@@ -56,8 +56,8 @@ services:
5656
target: /gobin
5757
read_only: true
5858
command:
59-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false; sentry=false;"
60-
--my=zero3:5080 --replicas 3 --raft="idx=3" --logtostderr -v=2 --peer=zero1:5080
59+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --my=zero3:5080 --replicas
60+
3 --raft="idx=3" --logtostderr -v=2 --peer=zero1:5080
6161

6262
alpha1:
6363
image: dgraph/dgraph:local
@@ -82,10 +82,10 @@ services:
8282
cluster: test
8383
service: alpha
8484
command:
85-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false; sentry=false;"
86-
--encryption "key-file=/dgraph-enc/enc-key;" --my=alpha1:7080
87-
--zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block --block_rate 10
88-
--logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
85+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
86+
"key-file=/dgraph-enc/enc-key;" --my=alpha1:7080 --zero=zero1:5080,zero2:5080,zero3:5080
87+
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
88+
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
8989
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
9090

9191
alpha2:
@@ -113,10 +113,10 @@ services:
113113
cluster: test
114114
service: alpha
115115
command:
116-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false; sentry=false;"
117-
--encryption "key-file=/dgraph-enc/enc-key;" --my=alpha2:7080
118-
--zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block --block_rate 10
119-
--logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
116+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
117+
"key-file=/dgraph-enc/enc-key;" --my=alpha2:7080 --zero=zero1:5080,zero2:5080,zero3:5080
118+
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
119+
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
120120
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
121121

122122
alpha3:
@@ -144,10 +144,10 @@ services:
144144
cluster: test
145145
service: alpha
146146
command:
147-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false; sentry=false;"
148-
--encryption "key-file=/dgraph-enc/enc-key;" --my=alpha3:7080
149-
--zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block --block_rate 10
150-
--logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
147+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
148+
"key-file=/dgraph-enc/enc-key;" --my=alpha3:7080 --zero=zero1:5080,zero2:5080,zero3:5080
149+
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
150+
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
151151
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
152152

153153
alpha4:
@@ -175,10 +175,10 @@ services:
175175
cluster: test
176176
service: alpha
177177
command:
178-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false; sentry=false;"
179-
--encryption "key-file=/dgraph-enc/enc-key;" --my=alpha4:7080
180-
--zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block --block_rate 10
181-
--logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
178+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
179+
"key-file=/dgraph-enc/enc-key;" --my=alpha4:7080 --zero=zero1:5080,zero2:5080,zero3:5080
180+
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
181+
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
182182
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
183183

184184
alpha5:
@@ -206,10 +206,10 @@ services:
206206
cluster: test
207207
service: alpha
208208
command:
209-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false; sentry=false;"
210-
--encryption "key-file=/dgraph-enc/enc-key;" --my=alpha5:7080
211-
--zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block --block_rate 10
212-
--logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
209+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
210+
"key-file=/dgraph-enc/enc-key;" --my=alpha5:7080 --zero=zero1:5080,zero2:5080,zero3:5080
211+
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
212+
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
213213
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
214214

215215
alpha6:
@@ -237,10 +237,10 @@ services:
237237
cluster: test
238238
service: alpha
239239
command:
240-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false; sentry=false;"
241-
--encryption "key-file=/dgraph-enc/enc-key;" --my=alpha6:7080
242-
--zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block --block_rate 10
243-
--logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
240+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
241+
"key-file=/dgraph-enc/enc-key;" --my=alpha6:7080 --zero=zero1:5080,zero2:5080,zero3:5080
242+
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
243+
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
244244
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
245245

246246
minio:

‎dgraphtest/dgraph.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func (z *zero) cmd(c *LocalCluster) []string {
142142
if c.lowerThanV21 {
143143
zcmd = append(zcmd, fmt.Sprintf(`--idx=%v`, z.id+1), "--telemetry=false")
144144
} else {
145-
zcmd = append(zcmd, fmt.Sprintf(`--raft=idx=%v`, z.id+1), "--telemetry=reports=false;sentry=false;",
145+
zcmd = append(zcmd, fmt.Sprintf(`--raft=idx=%v`, z.id+1), "--telemetry=reports=false;",
146146
fmt.Sprintf(`--limit=refill-interval=%v;uid-lease=%v`, c.conf.refillInterval, c.conf.uidLease))
147147
}
148148

@@ -247,7 +247,7 @@ func (a *alpha) cmd(c *LocalCluster) []string {
247247
acmd = append(acmd, `--whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16`, "--telemetry=false")
248248
} else {
249249
acmd = append(acmd, `--security=whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16`,
250-
"--telemetry=reports=false;sentry=false;")
250+
"--telemetry=reports=false;")
251251
}
252252

253253
if c.conf.lambdaURL != "" {

‎go.mod‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ require (
2222
github.com/docker/docker v27.5.1+incompatible
2323
github.com/docker/go-connections v0.5.0
2424
github.com/dustin/go-humanize v1.0.1
25-
github.com/getsentry/sentry-go v0.31.1
26-
github.com/go-jose/go-jose/v4 v4.0.4
27-
github.com/go-sql-driver/mysql v1.8.1
25+
github.com/go-jose/go-jose/v4 v4.0.5
26+
github.com/go-sql-driver/mysql v1.9.0
2827
github.com/golang-jwt/jwt/v5 v5.2.1
2928
github.com/golang/geo v0.0.0-20230421003525-6adc56603217
3029
github.com/golang/glog v1.2.4
@@ -36,7 +35,6 @@ require (
3635
github.com/graph-gophers/graphql-go v1.5.0
3736
github.com/hashicorp/vault/api v1.15.0
3837
github.com/minio/minio-go/v6 v6.0.57
39-
github.com/mitchellh/panicwrap v1.0.0
4038
github.com/paulmach/go.geojson v1.5.0
4139
github.com/pkg/errors v0.9.1
4240
github.com/pkg/profile v1.7.0

0 commit comments

Comments
 (0)