public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

datasources: querier: refactor: simplify (#110516)

Browse Source
This commit is contained in:
Gábor Farkas
2025-09-09 13:27:52 +02:00
committed by GitHub
parent b1a059ac4e
commit 95489fdca8
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/query/client/instance_provider.go
+18 -20
View File
@@ -14,15 +14,13 @@ import (
)
type singleTenantInstanceProvider struct {
client clientapi.QueryDataClient
features featuremgmt.FeatureToggles
cfg *setting.Cfg
client clientapi.QueryDataClient
instanceConf clientapi.InstanceConfigurationSettings
}
type singleTenantInstance struct {
client clientapi.QueryDataClient
features featuremgmt.FeatureToggles
cfg *setting.Cfg
client clientapi.QueryDataClient
instanceConf clientapi.InstanceConfigurationSettings
}
func (t *singleTenantInstance) GetDataSourceClient(_ context.Context, _ data.DataSourceRef) (clientapi.QueryDataClient, error) {
@@ -30,30 +28,30 @@ func (t *singleTenantInstance) GetDataSourceClient(_ context.Context, _ data.Dat
}
func NewSingleTenantInstanceProvider(cfg *setting.Cfg, features featuremgmt.FeatureToggles, p plugins.Client, ctxProv *plugincontext.Provider, accessControl accesscontrol.AccessControl) clientapi.InstanceProvider {
conf := clientapi.InstanceConfigurationSettings{
FeatureToggles: features,
SQLExpressionCellLimit: cfg.SQLExpressionCellLimit,
SQLExpressionOutputCellLimit: cfg.SQLExpressionOutputCellLimit,
SQLExpressionQueryLengthLimit: cfg.SQLExpressionQueryLengthLimit,
SQLExpressionTimeout: cfg.SQLExpressionTimeout,
ExpressionsEnabled: cfg.ExpressionsEnabled,
}
return &singleTenantInstanceProvider{
cfg: cfg,
features: features,
client: newQueryClientForPluginClient(p, ctxProv, accessControl),
instanceConf: conf,
client: newQueryClientForPluginClient(p, ctxProv, accessControl),
}
}
func (s *singleTenantInstanceProvider) GetInstance(_ context.Context, _ map[string]string) (clientapi.Instance, error) {
return &singleTenantInstance{
client: s.client,
features: s.features,
cfg: s.cfg,
client: s.client,
instanceConf: s.instanceConf,
}, nil
}
func (s *singleTenantInstance) GetSettings() clientapi.InstanceConfigurationSettings {
return clientapi.InstanceConfigurationSettings{
FeatureToggles: s.features,
SQLExpressionCellLimit: s.cfg.SQLExpressionCellLimit,
SQLExpressionOutputCellLimit: s.cfg.SQLExpressionOutputCellLimit,
SQLExpressionQueryLengthLimit: s.cfg.SQLExpressionQueryLengthLimit,
SQLExpressionTimeout: s.cfg.SQLExpressionTimeout,
ExpressionsEnabled: s.cfg.ExpressionsEnabled,
}
return s.instanceConf
}
func (s *singleTenantInstance) GetLogger(parent log.Logger) log.Logger {