Skip to content

Commit 33a2f17

Browse files
rawdaGastanrawdaGastan
committed
add sentry to grid deployer
1 parent 22c5317 commit 33a2f17

26 files changed

+252
-165
lines changed

‎grid-cli/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ require (
2626
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
2727
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
2828
github.com/ethereum/go-ethereum v1.11.6 // indirect
29+
github.com/getsentry/sentry-go v0.29.1 // indirect
2930
github.com/go-stack/stack v1.8.1 // indirect
3031
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
3132
github.com/gomodule/redigo v2.0.0+incompatible // indirect
@@ -53,6 +54,7 @@ require (
5354
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
5455
golang.org/x/sync v0.8.0 // indirect
5556
golang.org/x/sys v0.26.0 // indirect
57+
golang.org/x/text v0.19.0 // indirect
5658
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200609130330-bd2cb7843e1b // indirect
5759
gonum.org/v1/gonum v0.15.0 // indirect
5860
google.golang.org/protobuf v1.34.1 // indirect

‎grid-cli/go.sum

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnN
3232
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
3333
github.com/ethereum/go-ethereum v1.11.6 h1:2VF8Mf7XiSUfmoNOy3D+ocfl9Qu8baQBrCNbo2CXQ8E=
3434
github.com/ethereum/go-ethereum v1.11.6/go.mod h1:+a8pUj1tOyJ2RinsNQD4326YS+leSoKGiG/uVVb0x6Y=
35+
github.com/getsentry/sentry-go v0.29.1 h1:DyZuChN8Hz3ARxGVV8ePaNXh1dQ7d76AiB117xcREwA=
36+
github.com/getsentry/sentry-go v0.29.1/go.mod h1:x3AtIzN01d6SiWkderzaH28Tm0lgkafpJ5Bm3li39O0=
37+
github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
38+
github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
3539
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
3640
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
3741
github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
@@ -93,6 +97,8 @@ github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b h1:QrHweqAtyJ9EwCaG
9397
github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b/go.mod h1:xxLb2ip6sSUts3g1irPVHyk/DGslwQsNOo9I7smJfNU=
9498
github.com/pierrec/xxHash v0.1.5 h1:n/jBpwTHiER4xYvK3/CdPVnLDPchj8eTJFFLUb4QHBo=
9599
github.com/pierrec/xxHash v0.1.5/go.mod h1:w2waW5Zoa/Wc4Yqe0wgrIYAGKqRMf7czn2HNKXmuL+I=
100+
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
101+
github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
96102
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
97103
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
98104
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -161,6 +167,8 @@ golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
161167
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
162168
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
163169
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
170+
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
171+
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
164172
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
165173
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
166174
golang.zx2c4.com/wireguard v0.0.20200121/go.mod h1:P2HsVp8SKwZEufsnezXZA4GRX/T49/HlU7DGuelXsU4=

‎grid-client/deployer/deployment_deployer.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ func NewDeploymentDeployer(tfPluginClient *TFPluginClient) DeploymentDeployer {
3131
// Validate validates a deployment deployer
3232
func (d *DeploymentDeployer) Validate(ctx context.Context, dls []*workloads.Deployment) error {
3333
if err := validateAccountBalanceForExtrinsics(d.tfPluginClient.SubstrateConn, d.tfPluginClient.Identity); err != nil {
34-
return err
34+
return d.tfPluginClient.sentry.error(err)
3535
}
3636

3737
for _, dl := range dls {
3838
if err := dl.Validate(); err != nil {
39-
return err
39+
return d.tfPluginClient.sentry.error(err)
4040
}
4141
}
4242

4343
return nil
4444
}
4545

4646
// GenerateVersionlessDeployments generates a new deployment without a version
47-
func (d *DeploymentDeployer) GenerateVersionlessDeployments(ctx context.Context, dls []*workloads.Deployment) (map[uint32][]zos.Deployment, error) {
47+
func (d *DeploymentDeployer) generateVersionlessDeployments(ctx context.Context, dls []*workloads.Deployment) (map[uint32][]zos.Deployment, error) {
4848
gridDlsPerNodes := make(map[uint32][]zos.Deployment)
4949

5050
var wg sync.WaitGroup
@@ -107,16 +107,16 @@ func (d *DeploymentDeployer) GenerateVersionlessDeployments(ctx context.Context,
107107
// Deploy deploys a new deployment
108108
func (d *DeploymentDeployer) Deploy(ctx context.Context, dl *workloads.Deployment) error {
109109
if err := d.Validate(ctx, []*workloads.Deployment{dl}); err != nil {
110-
return fmt.Errorf("invalid deployment: %w", err)
110+
return d.tfPluginClient.sentry.error(fmt.Errorf("invalid deployment: %w", err))
111111
}
112112

113-
dlsPerNodes, err := d.GenerateVersionlessDeployments(ctx, []*workloads.Deployment{dl})
113+
dlsPerNodes, err := d.generateVersionlessDeployments(ctx, []*workloads.Deployment{dl})
114114
if err != nil {
115-
return errors.Wrap(err, "could not generate deployments data")
115+
return d.tfPluginClient.sentry.error(errors.Wrap(err, "could not generate deployments data"))
116116
}
117117

118118
if len(dlsPerNodes[dl.NodeID]) == 0 {
119-
return fmt.Errorf("failed to generate the grid deployment")
119+
return d.tfPluginClient.sentry.error(fmt.Errorf("failed to generate the grid deployment"))
120120
}
121121

122122
dl.NodeDeploymentID, err = d.deployer.Deploy(
@@ -132,7 +132,7 @@ func (d *DeploymentDeployer) Deploy(ctx context.Context, dl *workloads.Deploymen
132132
d.tfPluginClient.State.StoreContractIDs(dl.NodeID, dl.ContractID)
133133
}
134134

135-
return err
135+
return d.tfPluginClient.sentry.error(err)
136136
}
137137

138138
// BatchDeploy deploys multiple deployments using the deployer
@@ -144,13 +144,13 @@ func (d *DeploymentDeployer) BatchDeploy(ctx context.Context, dls []*workloads.D
144144
multiErr = multierror.Append(multiErr, fmt.Errorf("invalid deployments: %w", err))
145145
}
146146

147-
newDeployments, err := d.GenerateVersionlessDeployments(ctx, dls)
147+
newDeployments, err := d.generateVersionlessDeployments(ctx, dls)
148148
if err != nil {
149149
multiErr = multierror.Append(multiErr, fmt.Errorf("could not generate grid deployments: %w", err))
150150
}
151151

152152
if len(newDeployments) == 0 {
153-
return errors.Wrap(multiErr, "failed to generate the grid deployments")
153+
return d.tfPluginClient.sentry.error(errors.Wrap(multiErr, "failed to generate the grid deployments"))
154154
}
155155

156156
newDls, err := d.deployer.BatchDeploy(ctx, newDeployments, newDeploymentsSolutionProvider)
@@ -166,18 +166,18 @@ func (d *DeploymentDeployer) BatchDeploy(ctx context.Context, dls []*workloads.D
166166
}
167167
}
168168

169-
return multiErr
169+
return d.tfPluginClient.sentry.error(multiErr)
170170
}
171171

172172
// Cancel cancels deployments
173173
func (d *DeploymentDeployer) Cancel(ctx context.Context, dl *workloads.Deployment) error {
174174
if err := d.Validate(ctx, []*workloads.Deployment{dl}); err != nil {
175-
return err
175+
return d.tfPluginClient.sentry.error(err)
176176
}
177177

178178
err := d.deployer.Cancel(ctx, dl.ContractID)
179179
if err != nil {
180-
return err
180+
return d.tfPluginClient.sentry.error(err)
181181
}
182182

183183
// update state
@@ -374,11 +374,11 @@ func (d *DeploymentDeployer) syncContract(dl *workloads.Deployment) error {
374374
func (d *DeploymentDeployer) Sync(ctx context.Context, dl *workloads.Deployment) error {
375375
err := d.syncContract(dl)
376376
if err != nil {
377-
return err
377+
return d.tfPluginClient.sentry.error(err)
378378
}
379379
currentDeployments, err := d.deployer.GetDeployments(ctx, dl.NodeDeploymentID)
380380
if err != nil {
381-
return errors.Wrap(err, "failed to get deployments to update local state")
381+
return d.tfPluginClient.sentry.error(errors.Wrap(err, "failed to get deployments to update local state"))
382382
}
383383

384384
deployment := currentDeployments[dl.NodeID]

‎grid-client/deployer/deployment_deployer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ func TestDeploymentDeployerDeploy(t *testing.T) {
353353
return nil
354354
}).AnyTimes()
355355

356-
dls, err := d.GenerateVersionlessDeployments(context.Background(), []*workloads.Deployment{&dl})
356+
dls, err := d.generateVersionlessDeployments(context.Background(), []*workloads.Deployment{&dl})
357357
assert.NoError(t, err)
358358

359359
assert.Equal(t, len(gridDl.Workloads), len(dls[dl.NodeID][0].Workloads))
@@ -528,7 +528,7 @@ func TestDeploymentDeployerSync(t *testing.T) {
528528
return nil
529529
})
530530

531-
dls, err := d.GenerateVersionlessDeployments(context.Background(), []*workloads.Deployment{&dl})
531+
dls, err := d.generateVersionlessDeployments(context.Background(), []*workloads.Deployment{&dl})
532532
assert.NoError(t, err)
533533

534534
gridDl := dls[dl.NodeID][0]

‎grid-client/deployer/gateway_fqdn_deployer.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,32 +30,32 @@ func NewGatewayFqdnDeployer(tfPluginClient *TFPluginClient) GatewayFQDNDeployer
3030
func (d *GatewayFQDNDeployer) Validate(ctx context.Context, gw *workloads.GatewayFQDNProxy) error {
3131
sub := d.tfPluginClient.SubstrateConn
3232
if err := validateAccountBalanceForExtrinsics(sub, d.tfPluginClient.Identity); err != nil {
33-
return err
33+
return d.tfPluginClient.sentry.error(err)
3434
}
3535

3636
if err := gw.Validate(); err != nil {
37-
return err
37+
return d.tfPluginClient.sentry.error(err)
3838
}
3939

4040
nodeClient, err := d.tfPluginClient.NcPool.GetNodeClient(sub, gw.NodeID)
4141
if err != nil {
42-
return errors.Wrapf(err, "failed to get node client with ID %d", gw.NodeID)
42+
return d.tfPluginClient.sentry.error(errors.Wrapf(err, "failed to get node client with ID %d", gw.NodeID))
4343
}
4444

4545
cfg, err := nodeClient.NetworkGetPublicConfig(ctx)
4646
if err != nil {
47-
return errors.Wrapf(err, "couldn't get node %d public config", gw.NodeID)
47+
return d.tfPluginClient.sentry.error(errors.Wrapf(err, "couldn't get node %d public config", gw.NodeID))
4848
}
4949

5050
if cfg.IPv4.IP == nil {
51-
return errors.Errorf("node %d doesn't contain a public IP in its public config", gw.NodeID)
51+
return d.tfPluginClient.sentry.error(errors.Errorf("node %d doesn't contain a public IP in its public config", gw.NodeID))
5252
}
5353

54-
return client.AreNodesUp(ctx, sub, []uint32{gw.NodeID}, d.tfPluginClient.NcPool)
54+
return d.tfPluginClient.sentry.error(client.AreNodesUp(ctx, sub, []uint32{gw.NodeID}, d.tfPluginClient.NcPool))
5555
}
5656

5757
// GenerateVersionlessDeployments generates deployments for gatewayFqdn deployer without versions
58-
func (d *GatewayFQDNDeployer) GenerateVersionlessDeployments(ctx context.Context, gw *workloads.GatewayFQDNProxy) (map[uint32]zosTypes.Deployment, error) {
58+
func (d *GatewayFQDNDeployer) generateVersionlessDeployments(ctx context.Context, gw *workloads.GatewayFQDNProxy) (map[uint32]zosTypes.Deployment, error) {
5959
deployments := make(map[uint32]zosTypes.Deployment)
6060
var err error
6161

@@ -74,12 +74,12 @@ func (d *GatewayFQDNDeployer) GenerateVersionlessDeployments(ctx context.Context
7474
// Deploy deploys the GatewayFQDN deployments using the deployer
7575
func (d *GatewayFQDNDeployer) Deploy(ctx context.Context, gw *workloads.GatewayFQDNProxy) error {
7676
if err := d.Validate(ctx, gw); err != nil {
77-
return err
77+
return d.tfPluginClient.sentry.error(err)
7878
}
7979

80-
newDeployments, err := d.GenerateVersionlessDeployments(ctx, gw)
80+
newDeployments, err := d.generateVersionlessDeployments(ctx, gw)
8181
if err != nil {
82-
return errors.Wrap(err, "could not generate deployments data")
82+
return d.tfPluginClient.sentry.error(errors.Wrap(err, "could not generate deployments data"))
8383
}
8484

8585
// TODO: solution providers
@@ -97,7 +97,7 @@ func (d *GatewayFQDNDeployer) Deploy(ctx context.Context, gw *workloads.GatewayF
9797
}
9898
}
9999

100-
return err
100+
return d.tfPluginClient.sentry.error(err)
101101
}
102102

103103
// BatchDeploy deploys multiple deployments using the deployer
@@ -107,12 +107,12 @@ func (d *GatewayFQDNDeployer) BatchDeploy(ctx context.Context, gws []*workloads.
107107

108108
for _, gw := range gws {
109109
if err := d.Validate(ctx, gw); err != nil {
110-
return err
110+
return d.tfPluginClient.sentry.error(err)
111111
}
112112

113-
dls, err := d.GenerateVersionlessDeployments(ctx, gw)
113+
dls, err := d.generateVersionlessDeployments(ctx, gw)
114114
if err != nil {
115-
return errors.Wrap(err, "could not generate deployments data")
115+
return d.tfPluginClient.sentry.error(errors.Wrap(err, "could not generate deployments data"))
116116
}
117117

118118
for nodeID, dl := range dls {
@@ -133,23 +133,23 @@ func (d *GatewayFQDNDeployer) BatchDeploy(ctx context.Context, gws []*workloads.
133133
// error is not returned immediately before updating state because of untracked failed deployments
134134
for _, gw := range gws {
135135
if err := d.updateStateFromDeployments(gw, newDls); err != nil {
136-
return errors.Wrapf(err, "failed to update gateway fqdn '%s' state", gw.Name)
136+
return d.tfPluginClient.sentry.error(errors.Wrapf(err, "failed to update gateway fqdn '%s' state", gw.Name))
137137
}
138138
}
139139

140-
return err
140+
return d.tfPluginClient.sentry.error(err)
141141
}
142142

143143
// Cancel cancels a gateway deployment
144144
func (d *GatewayFQDNDeployer) Cancel(ctx context.Context, gw *workloads.GatewayFQDNProxy) (err error) {
145145
if err := d.Validate(ctx, gw); err != nil {
146-
return err
146+
return d.tfPluginClient.sentry.error(err)
147147
}
148148

149149
contractID := gw.NodeDeploymentID[gw.NodeID]
150150
err = d.deployer.Cancel(ctx, contractID)
151151
if err != nil {
152-
return err
152+
return d.tfPluginClient.sentry.error(err)
153153
}
154154

155155
// update state
@@ -198,12 +198,12 @@ func (d *GatewayFQDNDeployer) syncContracts(ctx context.Context, gw *workloads.G
198198
// Sync syncs the gateway deployments
199199
func (d *GatewayFQDNDeployer) Sync(ctx context.Context, gw *workloads.GatewayFQDNProxy) error {
200200
if err := d.syncContracts(ctx, gw); err != nil {
201-
return errors.Wrap(err, "could not sync contracts")
201+
return d.tfPluginClient.sentry.error(errors.Wrap(err, "could not sync contracts"))
202202
}
203203

204204
dls, err := d.deployer.GetDeployments(ctx, gw.NodeDeploymentID)
205205
if err != nil {
206-
return errors.Wrap(err, "could not get deployment objects")
206+
return d.tfPluginClient.sentry.error(errors.Wrap(err, "could not get deployment objects"))
207207
}
208208

209209
dl := dls[gw.NodeID]
@@ -225,7 +225,7 @@ func (d *GatewayFQDNDeployer) Sync(ctx context.Context, gw *workloads.GatewayFQD
225225
gw.Network = gwWorkload.Network
226226

227227
if err != nil {
228-
return err
228+
return d.tfPluginClient.sentry.error(err)
229229
}
230230
}
231231

‎grid-client/deployer/gateway_fqdn_deployer_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func TestFQDNDeployer(t *testing.T) {
126126
})
127127

128128
t.Run("test generate", func(t *testing.T) {
129-
dls, err := d.GenerateVersionlessDeployments(context.Background(), &gw)
129+
dls, err := d.generateVersionlessDeployments(context.Background(), &gw)
130130
assert.NoError(t, err)
131131

132132
testDl := workloads.NewGridDeployment(twinID, 0, []zosTypes.Workload{
@@ -151,7 +151,7 @@ func TestFQDNDeployer(t *testing.T) {
151151
})
152152

153153
t.Run("test deploy", func(t *testing.T) {
154-
dls, err := d.GenerateVersionlessDeployments(context.Background(), &gw)
154+
dls, err := d.generateVersionlessDeployments(context.Background(), &gw)
155155
assert.NoError(t, err)
156156

157157
mockValidation(d.tfPluginClient.Identity, cl, sub, ncPool, proxyCl)
@@ -175,7 +175,7 @@ func TestFQDNDeployer(t *testing.T) {
175175

176176
gw.NodeDeploymentID = map[uint32]uint64{nodeID: contractID}
177177

178-
dls, err := d.GenerateVersionlessDeployments(context.Background(), &gw)
178+
dls, err := d.generateVersionlessDeployments(context.Background(), &gw)
179179
assert.NoError(t, err)
180180

181181
mockValidation(d.tfPluginClient.Identity, cl, sub, ncPool, proxyCl)
@@ -198,7 +198,7 @@ func TestFQDNDeployer(t *testing.T) {
198198

199199
gw.NodeDeploymentID = map[uint32]uint64{nodeID: contractID}
200200

201-
dls, err := d.GenerateVersionlessDeployments(context.Background(), &gw)
201+
dls, err := d.generateVersionlessDeployments(context.Background(), &gw)
202202
assert.NoError(t, err)
203203

204204
mockValidation(d.tfPluginClient.Identity, cl, sub, ncPool, proxyCl)
@@ -316,7 +316,7 @@ func TestFQDNDeployer(t *testing.T) {
316316
gw.ContractID = contractID
317317
gw.NodeDeploymentID = map[uint32]uint64{nodeID: contractID}
318318

319-
dls, err := d.GenerateVersionlessDeployments(context.Background(), &gw)
319+
dls, err := d.generateVersionlessDeployments(context.Background(), &gw)
320320
assert.NoError(t, err)
321321

322322
dl := dls[nodeID]
@@ -346,7 +346,7 @@ func TestFQDNDeployer(t *testing.T) {
346346
gw.ContractID = contractID
347347
gw.NodeDeploymentID = map[uint32]uint64{nodeID: contractID}
348348

349-
dls, err := d.GenerateVersionlessDeployments(context.Background(), &gw)
349+
dls, err := d.generateVersionlessDeployments(context.Background(), &gw)
350350
assert.NoError(t, err)
351351

352352
dl := dls[nodeID]

0 commit comments

Comments
 (0)