PostgreSQL: Read postgresDSUsePGX from config (#112170)

* PostgreSQL: Read `postgresDSUsePGX` from config

* Update plugins_test

pkg/plugins/backendplugin/coreplugin/registry.go

@@ -237,7 +237,7 @@ func NewPlugin(pluginID string, cfg *setting.Cfg, httpClientProvider *httpclient
 	case Tempo:
 		svc = tempo.ProvideService(httpClientProvider, tracer)
 	case PostgreSQL:
-		svc = postgres.ProvideService(cfg, features)
+		svc = postgres.ProvideService(cfg)
 	case MySQL:
 		svc = mysql.ProvideService()
 	case MSSQL:

pkg/server/wire_gen.go

@@ -392,7 +392,7 @@ func Initialize(ctx context.Context, cfg *setting.Cfg, opts Options, apiOpts api
 	prometheusService := prometheus.ProvideService(httpclientProvider)
 	tempoService := tempo.ProvideService(httpclientProvider, tracer)
 	testdatasourceService := testdatasource.ProvideService()
-	postgresService := postgres.ProvideService(cfg, featureToggles)
+	postgresService := postgres.ProvideService(cfg)
 	mysqlService := mysql.ProvideService()
 	mssqlService := mssql.ProvideService(cfg)
 	entityEventsService := store.ProvideEntityEventsService(cfg, sqlStore, featureToggles)
@@ -994,7 +994,7 @@ func InitializeForTest(ctx context.Context, t sqlutil.ITestDB, testingT interfac
 	prometheusService := prometheus.ProvideService(httpclientProvider)
 	tempoService := tempo.ProvideService(httpclientProvider, tracer)
 	testdatasourceService := testdatasource.ProvideService()
-	postgresService := postgres.ProvideService(cfg, featureToggles)
+	postgresService := postgres.ProvideService(cfg)
 	mysqlService := mysql.ProvideService()
 	mssqlService := mssql.ProvideService(cfg)
 	entityEventsService := store.ProvideEntityEventsService(cfg, sqlStore, featureToggles)

pkg/services/pluginsintegration/plugintest/plugins_test.go

@@ -161,7 +161,7 @@ func TestIntegrationPluginManager(t *testing.T) {
 	pr := prometheus.ProvideService(hcp)
 	tmpo := tempo.ProvideService(hcp, tracer)
 	td := testdatasource.ProvideService()
-	pg := postgres.ProvideService(cfg, features)
+	pg := postgres.ProvideService(cfg)
 	my := mysql.ProvideService()
 	ms := mssql.ProvideService(cfg)
 	db := db.InitTestDB(t, sqlstore.InitTestDBOpt{Cfg: cfg})

pkg/tsdb/grafana-postgresql-datasource/postgres.go

@@ -128,7 +128,7 @@ func newPostgresPGX(ctx context.Context, userFacingDefaultError string, rowLimit
 	return p, handler, nil
 }
 
-func NewInstanceSettings(logger log.Logger, usePGX bool, dataPath string) datasource.InstanceFactoryFunc {
+func NewInstanceSettings(logger log.Logger, dataPath string) datasource.InstanceFactoryFunc {
 	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		cfg := backend.GrafanaConfigFromContext(ctx)
 		sqlCfg, err := cfg.SQL()
@@ -171,6 +171,8 @@ func NewInstanceSettings(logger log.Logger, usePGX bool, dataPath string) dataso
 			return nil, err
 		}
 
+		usePGX := cfg.FeatureToggles().IsEnabled("postgresDSUsePGX")
+
 		if usePGX {
 			pgxlogger := logger.FromContext(ctx).With("driver", "pgx")
 			pgxTlsManager := newPgxTlsManager(pgxlogger)

pkg/tsdb/grafana-postgresql-datasource/postgres_service.go

@@ -7,30 +7,27 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
 
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 	sqlengpgx "github.com/grafana/grafana/pkg/tsdb/grafana-postgresql-datasource/pgx"
 	"github.com/grafana/grafana/pkg/tsdb/grafana-postgresql-datasource/sqleng"
 )
 
 type Service struct {
-	im       instancemgmt.InstanceManager
+	im instancemgmt.InstanceManager
-	features featuremgmt.FeatureToggles
 }
 
-func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles) *Service {
+func ProvideService(cfg *setting.Cfg) *Service {
 	logger := backend.NewLoggerWith("logger", "tsdb.postgres")
-	usePGX := features.IsEnabled(context.Background(), featuremgmt.FlagPostgresDSUsePGX)
 	s := &Service{
-		im:       datasource.NewInstanceManager(NewInstanceSettings(logger, usePGX, cfg.DataPath)),
+		im: datasource.NewInstanceManager(NewInstanceSettings(logger, cfg.DataPath)),
-		features: features,
 	}
 	return s
 }
 
 // NOTE: do not put any business logic into this method. it's whole job is to forward the call "inside"
 func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
-	if s.features.IsEnabled(ctx, featuremgmt.FlagPostgresDSUsePGX) {
+	cfg := backend.GrafanaConfigFromContext(ctx)
+	if cfg.FeatureToggles().IsEnabled("postgresDSUsePGX") {
 		dsHandler, err := s.getDSInfoPGX(ctx, req.PluginContext)
 		if err != nil {
 			return sqlengpgx.ErrToHealthCheckResult(err)
@@ -47,7 +44,8 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 
 // NOTE: do not put any business logic into this method. it's whole job is to forward the call "inside"
 func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	if s.features.IsEnabled(ctx, featuremgmt.FlagPostgresDSUsePGX) {
+	cfg := backend.GrafanaConfigFromContext(ctx)
+	if cfg.FeatureToggles().IsEnabled("postgresDSUsePGX") {
 		dsInfo, err := s.getDSInfoPGX(ctx, req.PluginContext)
 		if err != nil {
 			return nil, err

pkg/tsdb/grafana-postgresql-datasource/standalone/main.go

@@ -15,7 +15,7 @@ func main() {
 	logger := backend.NewLoggerWith()
 	// TODO: get rid of setting.NewCfg() once PostgresDSUsePGX is removed
 	cfg := setting.NewCfg()
-	if err := datasource.Manage("grafana-postgresql-datasource", postgres.NewInstanceSettings(logger, true, cfg.DataPath), datasource.ManageOpts{}); err != nil {
+	if err := datasource.Manage("grafana-postgresql-datasource", postgres.NewInstanceSettings(logger, cfg.DataPath), datasource.ManageOpts{}); err != nil {
 		log.DefaultLogger.Error(err.Error())
 		os.Exit(1)
 	}