Skip to content

allow to diable sentry in client-cli-tfrobot #1356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

allow to diable sentry in client-cli-tfrobot #1356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions grid-cli/cmd/add_worker_kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ var addWorkerCmd = &cobra.Command{
if err != nil {
return err
}
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
return err
}

cfg, err := config.GetUserConfig()
if err != nil {
Expand All @@ -81,6 +85,10 @@ var addWorkerCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}

t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
16 changes: 15 additions & 1 deletion grid-cli/cmd/cancel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,21 @@ var cancelCmd = &cobra.Command{
log.Fatal().Err(err).Send()
}

t, err := deployer.NewTFPluginClient(cfg.Mnemonics, deployer.WithNetwork(cfg.Network), deployer.WithRMBTimeout(100))
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
log.Fatal().Err(err).Send()
}

opts := []deployer.PluginOpt{
deployer.WithNetwork(cfg.Network),
deployer.WithRMBTimeout(100),
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}

t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
}
Expand Down
16 changes: 15 additions & 1 deletion grid-cli/cmd/cancel_contracts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,26 @@ var cancelContracts = &cobra.Command{
return
}

disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
log.Fatal().Err(err).Send()
}

cfg, err := config.GetUserConfig()
if err != nil {
log.Fatal().Err(err).Send()
}

t, err := deployer.NewTFPluginClient(cfg.Mnemonics, deployer.WithNetwork(cfg.Network), deployer.WithRMBTimeout(100))
opts := []deployer.PluginOpt{
deployer.WithNetwork(cfg.Network),
deployer.WithRMBTimeout(100),
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}

t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
}
Expand Down
17 changes: 16 additions & 1 deletion grid-cli/cmd/delete_worker_kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,27 @@ var deleteWorkerCmd = &cobra.Command{
if err != nil {
return err
}

disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
log.Fatal().Err(err).Send()
}

cfg, err := config.GetUserConfig()
if err != nil {
log.Fatal().Err(err).Send()
}

t, err := deployer.NewTFPluginClient(cfg.Mnemonics, deployer.WithNetwork(cfg.Network), deployer.WithRMBTimeout(100))
opts := []deployer.PluginOpt{
deployer.WithNetwork(cfg.Network),
deployer.WithRMBTimeout(100),
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}

t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
}
Expand Down
7 changes: 7 additions & 0 deletions grid-cli/cmd/deploy_gateway_fqdn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ var deployGatewayFQDNCmd = &cobra.Command{
if err != nil {
return err
}
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
return err
}

gateway := workloads.GatewayFQDNProxy{
Name: name,
Expand All @@ -50,6 +54,9 @@ var deployGatewayFQDNCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}
t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
7 changes: 7 additions & 0 deletions grid-cli/cmd/deploy_gateway_name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ var deployGatewayNameCmd = &cobra.Command{
if err != nil {
return err
}
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
return err
}

cfg, err := config.GetUserConfig()
if err != nil {
Expand All @@ -49,6 +53,9 @@ var deployGatewayNameCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}
t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
7 changes: 7 additions & 0 deletions grid-cli/cmd/deploy_kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ var deployKubernetesCmd = &cobra.Command{
if err != nil {
return err
}
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
return err
}

var seed []byte
if mycelium {
Expand Down Expand Up @@ -172,6 +176,9 @@ var deployKubernetesCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}
t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
7 changes: 7 additions & 0 deletions grid-cli/cmd/deploy_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ var deployVMCmd = &cobra.Command{
if err != nil {
return err
}
disableSentry, err := cmd.Parent().Flags().GetBool("disable-sentry")
if err != nil {
return err
}

var seed []byte
if mycelium {
Expand All @@ -140,6 +144,9 @@ var deployVMCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}
t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
7 changes: 7 additions & 0 deletions grid-cli/cmd/deploy_zdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ var deployZDBCmd = &cobra.Command{
if err != nil {
return err
}
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
return err
}

if len(names) > 0 && len(names) != count {
return fmt.Errorf("please provide '%d' names not '%d'", count, len(names))
Expand Down Expand Up @@ -119,6 +123,9 @@ var deployZDBCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}
t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
7 changes: 7 additions & 0 deletions grid-cli/cmd/get_contract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ var getContractCmd = &cobra.Command{
if err != nil {
log.Fatal().Err(err).Send()
}
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
log.Fatal().Err(err).Send()
}

cfg, err := config.GetUserConfig()
if err != nil {
Expand All @@ -36,6 +40,9 @@ var getContractCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}
t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
7 changes: 7 additions & 0 deletions grid-cli/cmd/get_contracts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ var getContractsCmd = &cobra.Command{
if err != nil {
log.Fatal().Err(err).Send()
}
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
log.Fatal().Err(err).Send()
}

cfg, err := config.GetUserConfig()
if err != nil {
Expand All @@ -37,6 +41,9 @@ var getContractsCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}
t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
7 changes: 7 additions & 0 deletions grid-cli/cmd/get_gateway_fqdn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ var getGatewayFQDNCmd = &cobra.Command{
if err != nil {
log.Fatal().Err(err).Send()
}
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
log.Fatal().Err(err).Send()
}

cfg, err := config.GetUserConfig()
if err != nil {
Expand All @@ -35,6 +39,9 @@ var getGatewayFQDNCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}
t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
7 changes: 7 additions & 0 deletions grid-cli/cmd/get_gateway_name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ var getGatewayNameCmd = &cobra.Command{
if err != nil {
log.Fatal().Err(err).Send()
}
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
log.Fatal().Err(err).Send()
}

cfg, err := config.GetUserConfig()
if err != nil {
Expand All @@ -35,6 +39,9 @@ var getGatewayNameCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}
t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
7 changes: 7 additions & 0 deletions grid-cli/cmd/get_kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ var getKubernetesCmd = &cobra.Command{
if err != nil {
log.Fatal().Err(err).Send()
}
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
log.Fatal().Err(err).Send()
}

cfg, err := config.GetUserConfig()
if err != nil {
Expand All @@ -36,6 +40,9 @@ var getKubernetesCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}
t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
7 changes: 7 additions & 0 deletions grid-cli/cmd/get_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ var getVMCmd = &cobra.Command{
if err != nil {
log.Fatal().Err(err).Send()
}
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
log.Fatal().Err(err).Send()
}
cfg, err := config.GetUserConfig()
if err != nil {
log.Fatal().Err(err).Send()
Expand All @@ -35,6 +39,9 @@ var getVMCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}
t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
7 changes: 7 additions & 0 deletions grid-cli/cmd/get_zdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ var getZDBCmd = &cobra.Command{
if err != nil {
log.Fatal().Err(err).Send()
}
disableSentry, err := cmd.Flags().GetBool("disable-sentry")
if err != nil {
log.Fatal().Err(err).Send()
}

cfg, err := config.GetUserConfig()
if err != nil {
Expand All @@ -36,6 +40,9 @@ var getZDBCmd = &cobra.Command{
opts = append(opts, deployer.WithNoColorLogs())
}

if disableSentry {
opts = append(opts, deployer.WithDisableSentry())
}
t, err := deployer.NewTFPluginClient(cfg.Mnemonics, opts...)
if err != nil {
log.Fatal().Err(err).Send()
Expand Down
1 change: 1 addition & 0 deletions grid-cli/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ func Execute() {
func init() {
zerolog.SetGlobalLevel(zerolog.InfoLevel)
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
rootCmd.PersistentFlags().Bool("disable-sentry", false, "disable sentry")
}
12 changes: 7 additions & 5 deletions grid-client/deployer/sentry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@ func initSentry(twinID uint32, network string) (gridSentry, error) {
}

func (s *gridSentry) error(err error) error {
sentry.WithScope(func(scope *sentry.Scope) {
scope.SetContext("user", map[string]interface{}{
"twin": s.twinID,
if s.twinID != 0 {
sentry.WithScope(func(scope *sentry.Scope) {
scope.SetContext("user", map[string]interface{}{
"twin": s.twinID,
})
})
})
sentry.CaptureException(err)
sentry.CaptureException(err)
}

return err
}
Loading
Loading