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

refactor

Browse Source
This commit is contained in:
Alexander Zobnin
2024-09-05 15:02:36 +02:00
parent 3f35e9a771
commit 4a2b25c5f7
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/dashboards/service/dashboard_service.go
+1 -1
View File
@@ -721,7 +721,7 @@ func (dr *DashboardServiceImpl) SearchDashboards(ctx context.Context, query *das
var res []dashboards.DashboardSearchProjection
var err error
if dr.features.IsEnabled(ctx, featuremgmt.FlagZanzana) {
res, err = dr.FindDashboardsZanzanaCompare(ctx, query)
res, err = dr.FindDashboardsZanzana(ctx, query)
} else {
res, err = dr.FindDashboards(ctx, query)
}
pkg/services/dashboards/service/zanzana.go
+25 -8
View File
@@ -22,7 +22,21 @@ type searchResult struct {
duration time.Duration
}
func (dr *DashboardServiceImpl) FindDashboardsZanzanaCompare(ctx context.Context, query *dashboards.FindPersistedDashboardsQuery) ([]dashboards.DashboardSearchProjection, error) {
func (dr *DashboardServiceImpl) FindDashboardsZanzana(ctx context.Context, query *dashboards.FindPersistedDashboardsQuery) ([]dashboards.DashboardSearchProjection, error) {
if dr.cfg.Zanzana.SingleRead {
return dr.findDashboardsZanzanaSingleRead(ctx, query)
}
return dr.findDashboardsZanzanaCompare(ctx, query)
}
func (dr *DashboardServiceImpl) findDashboardsZanzanaSingleRead(ctx context.Context, query *dashboards.FindPersistedDashboardsQuery) ([]dashboards.DashboardSearchProjection, error) {
timer := prometheus.NewTimer(dr.metrics.searchRequestsDuration.WithLabelValues("zanzana"))
defer timer.ObserveDuration()
return dr.findDashboardsZanzana(ctx, query)
}
func (dr *DashboardServiceImpl) findDashboardsZanzanaCompare(ctx context.Context, query *dashboards.FindPersistedDashboardsQuery) ([]dashboards.DashboardSearchProjection, error) {
result := make(chan searchResult, 2)
go func() {
@@ -31,7 +45,7 @@ func (dr *DashboardServiceImpl) FindDashboardsZanzanaCompare(ctx context.Context
defer timer.ObserveDuration()
queryZanzana := *query
res, err := dr.FindDashboardsZanzana(ctx, &queryZanzana)
res, err := dr.findDashboardsZanzana(ctx, &queryZanzana)
result <- searchResult{"zanzana", res, err, time.Since(start)}
}()
@@ -68,15 +82,15 @@ func (dr *DashboardServiceImpl) FindDashboardsZanzanaCompare(ctx context.Context
return first.result, first.err
}
func (dr *DashboardServiceImpl) FindDashboardsZanzana(ctx context.Context, query *dashboards.FindPersistedDashboardsQuery) ([]dashboards.DashboardSearchProjection, error) {
func (dr *DashboardServiceImpl) findDashboardsZanzana(ctx context.Context, query *dashboards.FindPersistedDashboardsQuery) ([]dashboards.DashboardSearchProjection, error) {
if len(query.Title) > 8 {
return dr.FindDashboardsZanzanaCheck(ctx, query)
return dr.findDashboardsZanzanaCheck(ctx, query)
}
return dr.FindDashboardsZanzanaList(ctx, query)
return dr.findDashboardsZanzanaList(ctx, query)
}
func (dr *DashboardServiceImpl) FindDashboardsZanzanaList(ctx context.Context, query *dashboards.FindPersistedDashboardsQuery) ([]dashboards.DashboardSearchProjection, error) {
ctx, span := tracer.Start(ctx, "dashboards.service.FindDashboardsZanzanaList")
func (dr *DashboardServiceImpl) findDashboardsZanzanaList(ctx context.Context, query *dashboards.FindPersistedDashboardsQuery) ([]dashboards.DashboardSearchProjection, error) {
ctx, span := tracer.Start(ctx, "dashboards.service.findDashboardsZanzanaList")
defer span.End()
res, err := dr.acService.ListObjects(ctx, &openfgav1.ListObjectsRequest{
@@ -107,7 +121,10 @@ func (dr *DashboardServiceImpl) FindDashboardsZanzanaList(ctx context.Context, q
return dr.dashboardStore.FindDashboards(ctx, query)
}
func (dr *DashboardServiceImpl) FindDashboardsZanzanaCheck(ctx context.Context, query *dashboards.FindPersistedDashboardsQuery) ([]dashboards.DashboardSearchProjection, error) {
func (dr *DashboardServiceImpl) findDashboardsZanzanaCheck(ctx context.Context, query *dashboards.FindPersistedDashboardsQuery) ([]dashboards.DashboardSearchProjection, error) {
ctx, span := tracer.Start(ctx, "dashboards.service.findDashboardsZanzanaCheck")
defer span.End()
query.SkipAccessControlFilter = true
findRes, err := dr.dashboardStore.FindDashboards(ctx, query)
if err != nil {