fix: Optionally send --no-sentry when using managed plugins (#3762)

hermanschaaf · web-flow · commit ac93ddfb4fba · 2022-11-08T15:39:21.000Z
This fixes a bug where panics in plugins would be sent to Sentry even though telemetry-level was set to `none` at the CLI level. Related PR: cloudquery/plugin-sdk#363
diff --git a/cli/cmd/clients.go b/cli/cmd/clients.go
@@ -22,10 +22,14 @@ func newDestinationClients(ctx context.Context, sourceSpec specs.Source, destina
 	}()
 
 	for i, destinationSpec := range destinationsSpecs {
-		destClients[i], err = clients.NewDestinationClient(ctx, destinationSpec.Registry, destinationSpec.Path, destinationSpec.Version,
+		opts := []clients.DestinationClientOption{
 			clients.WithDestinationLogger(log.Logger),
 			clients.WithDestinationDirectory(cqDir),
-		)
+		}
+		if disableSentry {
+			opts = append(opts, clients.WithDestinationNoSentry())
+		}
+		destClients[i], err = clients.NewDestinationClient(ctx, destinationSpec.Registry, destinationSpec.Path, destinationSpec.Version, opts...)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create destination plugin client for %s: %w", destinationSpec.Name, err)
 		}
diff --git a/cli/cmd/root.go b/cli/cmd/root.go
@@ -25,6 +25,7 @@ Open source data integration at scale.
 Find more information at:
 	https://www.cloudquery.io`
 
+	disableSentry   = false
 	analyticsClient *AnalyticsClient
 )
 
@@ -88,6 +89,8 @@ func NewCmdRoot() *cobra.Command {
 					// we don't fail on sentry init errors as there might be no connection or sentry can be blocked.
 					log.Warn().Err(err).Msg("failed to initialize sentry")
 				}
+			} else {
+				disableSentry = true
 			}
 
 			return nil
diff --git a/cli/cmd/sync.go b/cli/cmd/sync.go
@@ -75,10 +75,14 @@ func sync(cmd *cobra.Command, args []string) error {
 			}
 			destinationsSpecs = append(destinationsSpecs, *spec)
 		}
-		sourceClient, err := clients.NewSourceClient(ctx, sourceSpec.Registry, sourceSpec.Path, sourceSpec.Version,
+		opts := []clients.SourceClientOption{
 			clients.WithSourceLogger(log.Logger),
 			clients.WithSourceDirectory(cqDir),
-		)
+		}
+		if disableSentry {
+			opts = append(opts, clients.WithSourceNoSentry())
+		}
+		sourceClient, err := clients.NewSourceClient(ctx, sourceSpec.Registry, sourceSpec.Path, sourceSpec.Version, opts...)
 		if err != nil {
 			return fmt.Errorf("failed to get source plugin client for %s: %w", sourceSpec.Name, err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ Open source data integration at scale.`
`25`	`25`	`Find more information at:`
`26`	`26`	https://www.cloudquery.io`
`27`	`27`
	`28`	`+ disableSentry = false`
`28`	`29`	`analyticsClient *AnalyticsClient`
`29`	`30`	`)`
`30`	`31`
`@@ -88,6 +89,8 @@ func NewCmdRoot() *cobra.Command {`
`88`	`89`	`// we don't fail on sentry init errors as there might be no connection or sentry can be blocked.`
`89`	`90`	`log.Warn().Err(err).Msg("failed to initialize sentry")`
`90`	`91`	`}`
	`92`	`+ } else {`
	`93`	`+ disableSentry = true`
`91`	`94`	`}`
`92`	`95`
`93`	`96`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,14 @@ func sync(cmd *cobra.Command, args []string) error {`
`75`	`75`	`}`
`76`	`76`	`destinationsSpecs = append(destinationsSpecs, *spec)`
`77`	`77`	`}`
`78`		`- sourceClient, err := clients.NewSourceClient(ctx, sourceSpec.Registry, sourceSpec.Path, sourceSpec.Version,`
	`78`	`+ opts := []clients.SourceClientOption{`
`79`	`79`	`clients.WithSourceLogger(log.Logger),`
`80`	`80`	`clients.WithSourceDirectory(cqDir),`
`81`		`- )`
	`81`	`+ }`
	`82`	`+ if disableSentry {`
	`83`	`+ opts = append(opts, clients.WithSourceNoSentry())`
	`84`	`+ }`
	`85`	`+ sourceClient, err := clients.NewSourceClient(ctx, sourceSpec.Registry, sourceSpec.Path, sourceSpec.Version, opts...)`
`82`	`86`	`if err != nil {`
`83`	`87`	`return fmt.Errorf("failed to get source plugin client for %s: %w", sourceSpec.Name, err)`
`84`	`88`	`}`