bring back WithPluginSentryDSN(), use CQ_SENTRY_ENABLED

Author: disq

go.mod

@@ -102,5 +102,3 @@ require (
 )
 
 replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240220124159-92878faa2a66
-
-replace github.com/cloudquery/plugin-pb-go => github.com/cloudquery/plugin-pb-go v1.27.6-0.20260109101738-6e12d05766f1

go.sum

@@ -60,6 +60,7 @@ github.com/cloudquery/codegen v0.3.35 h1:gRGTz1jHwLdyxciQGzXi9QeCy+XxRKt5nHeVvJJ
 github.com/cloudquery/codegen v0.3.35/go.mod h1:3OPYs+XD/W0OrtvxHyAkWNvrJphDvLVJEH48TjuYKPc=
 github.com/cloudquery/jsonschema v0.0.0-20240220124159-92878faa2a66 h1:OZLPSIBYEfvkAUeOeM8CwTgVQy5zhayI99ishCrsFV0=
 github.com/cloudquery/jsonschema v0.0.0-20240220124159-92878faa2a66/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34=
+github.com/cloudquery/plugin-pb-go v1.27.5/go.mod h1:80SQkYlFsm+vhPrba/eia5WWwctN6Azo9rbaZHZCyps=
 github.com/cloudquery/plugin-pb-go v1.27.6-0.20260109101738-6e12d05766f1 h1:jvdobvTNEGDtHxmOT4c6m9vDLVPWySdX5EcumGaOJ0s=
 github.com/cloudquery/plugin-pb-go v1.27.6-0.20260109101738-6e12d05766f1/go.mod h1:80SQkYlFsm+vhPrba/eia5WWwctN6Azo9rbaZHZCyps=
 github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U=

serve/plugin.go

@@ -2,10 +2,12 @@ package serve
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net"
 	"os"
 	"os/signal"
+	"strconv"
 	"strings"
 	"syscall"
 
@@ -38,13 +40,20 @@ type PluginServe struct {
 	plugin                *plugin.Plugin
 	args                  []string
 	destinationV0V1Server bool
+	sentryDSN             string
 	testListener          bool
 	testListenerConn      *bufconn.Listener
 	versions              []int
 }
 
 type PluginOption func(*PluginServe)
 
+func WithPluginSentryDSN(dsn string) PluginOption {
+	return func(s *PluginServe) {
+		s.sentryDSN = dsn
+	}
+}
+
 // WithDestinationV0V1Server is used to include destination v0 and v1 server to work
 // with older sources
 func WithDestinationV0V1Server() PluginOption {
@@ -106,7 +115,6 @@ func (s *PluginServe) newCmdPluginServe() *cobra.Command {
 	var address string
 	var network string
 	var noSentry bool
-	var sentryDSN string
 	var otelEndpoint string
 	var otelEndpointInsecure bool
 	var licenseFile string
@@ -125,6 +133,11 @@ func (s *PluginServe) newCmdPluginServe() *cobra.Command {
 		Long:  servePluginShort,
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, _ []string) error {
+			doSentry, _ := strconv.ParseBool(os.Getenv("CQ_SENTRY_ENABLED"))
+			if doSentry && noSentry {
+				return errors.New("CQ_SENTRY_ENABLED and --no-sentry cannot be used together")
+			}
+
 			zerologLevel, err := zerolog.ParseLevel(logLevel.String())
 			if err != nil {
 				return err
@@ -208,9 +221,9 @@ func (s *PluginServe) newCmdPluginServe() *cobra.Command {
 
 			version := s.plugin.Version()
 
-			if len(sentryDSN) > 0 && !strings.EqualFold(version, "development") && !noSentry {
+			if doSentry && len(s.sentryDSN) > 0 && !strings.EqualFold(version, "development") && !noSentry {
 				err = sentry.Init(sentry.ClientOptions{
-					Dsn:              sentryDSN,
+					Dsn:              s.sentryDSN,
 					Debug:            false,
 					AttachStacktrace: false,
 					Release:          version,
@@ -265,7 +278,6 @@ func (s *PluginServe) newCmdPluginServe() *cobra.Command {
 	cmd.Flags().StringVar(&otelEndpoint, "otel-endpoint", "", "Open Telemetry HTTP collector endpoint")
 	cmd.Flags().BoolVar(&otelEndpointInsecure, "otel-endpoint-insecure", false, "use Open Telemetry HTTP endpoint (for development only)")
 	cmd.Flags().BoolVar(&noSentry, "no-sentry", false, "disable sentry")
-	cmd.Flags().StringVar(&sentryDSN, "sentry-dsn", "", "Sentry DSN to use")
 	cmd.Flags().StringVar(&licenseFile, "license", "", "Path to offline license file or directory")
 
 	return cmd