PluginManager: Make Plugins, Renderer and DataSources non-global (#31866)

* PluginManager: Make Plugins and DataSources non-global Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Replace outdated command Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DashboardService: Ensure it gets constructed with necessary parameters Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix build Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DashboardService: Ensure it gets constructed with necessary parameters Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove dead code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove FocusConvey Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove dead code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Undo interface changes Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Backend: Move tsdbifaces.RequestHandler to plugins.DataRequestHandler Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Rename to DataSourceCount Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Consolidate dashboard interfaces into one Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix dashboard integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2021-03-17 16:06:10 +01:00
parent f1df32ac03
commit 87c3a2b790
95 changed files with 2455 additions and 2426 deletions
@@ -8,6 +8,7 @@ import (
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/sqlstore"

@@ -38,6 +39,7 @@ type UsageStatsService struct {
 	SQLStore           *sqlstore.SQLStore         `inject:""`
 	AlertingUsageStats alerting.UsageStatsQuerier `inject:""`
 	License            models.Licensing           `inject:""`
+	PluginManager      plugins.Manager            `inject:""`

 	log log.Logger

@@ -58,7 +58,7 @@ func (uss *UsageStatsService) GetUsageReport(ctx context.Context) (UsageReport,
 	metrics["stats.playlist.count"] = statsQuery.Result.Playlists
 	metrics["stats.plugins.apps.count"] = len(manager.Apps)
 	metrics["stats.plugins.panels.count"] = len(manager.Panels)
-	metrics["stats.plugins.datasources.count"] = len(manager.DataSources)
+	metrics["stats.plugins.datasources.count"] = uss.PluginManager.DataSourceCount()
 	metrics["stats.alerts.count"] = statsQuery.Result.Alerts
 	metrics["stats.active_users.count"] = statsQuery.Result.ActiveUsers
 	metrics["stats.datasources.count"] = statsQuery.Result.Datasources
@@ -329,8 +329,8 @@ func (uss *UsageStatsService) updateTotalStats() {
 }

 func (uss *UsageStatsService) shouldBeReported(dsType string) bool {
-	ds, ok := manager.DataSources[dsType]
-	if !ok {
+	ds := uss.PluginManager.GetDataSource(dsType)
+	if ds == nil {
 		return false
 	}

@@ -296,7 +296,7 @@ func TestMetrics(t *testing.T) {
 			assert.Equal(t, getSystemStatsQuery.Result.Playlists, metrics.Get("stats.playlist.count").MustInt64())
 			assert.Equal(t, len(manager.Apps), metrics.Get("stats.plugins.apps.count").MustInt())
 			assert.Equal(t, len(manager.Panels), metrics.Get("stats.plugins.panels.count").MustInt())
-			assert.Equal(t, len(manager.DataSources), metrics.Get("stats.plugins.datasources.count").MustInt())
+			assert.Equal(t, uss.PluginManager.DataSourceCount(), metrics.Get("stats.plugins.datasources.count").MustInt())
 			assert.Equal(t, getSystemStatsQuery.Result.Alerts, metrics.Get("stats.alerts.count").MustInt64())
 			assert.Equal(t, getSystemStatsQuery.Result.ActiveUsers, metrics.Get("stats.active_users.count").MustInt64())
 			assert.Equal(t, getSystemStatsQuery.Result.Datasources, metrics.Get("stats.datasources.count").MustInt64())
@@ -542,37 +542,51 @@ func (aum *alertingUsageMock) QueryUsageStats() (*alerting.UsageStats, error) {
 	}, nil
 }

+type fakePluginManager struct {
+	manager.PluginManager
+
+	dataSources map[string]*plugins.DataSourcePlugin
+}
+
+func (pm fakePluginManager) DataSourceCount() int {
+	return len(pm.dataSources)
+}
+
+func (pm fakePluginManager) GetDataSource(id string) *plugins.DataSourcePlugin {
+	return pm.dataSources[id]
+}
+
 func setupSomeDataSourcePlugins(t *testing.T, uss *UsageStatsService) {
 	t.Helper()

-	originalDataSources := manager.DataSources
-	t.Cleanup(func() { manager.DataSources = originalDataSources })
-	manager.DataSources = map[string]*plugins.DataSourcePlugin{
-		models.DS_ES: {
-			FrontendPluginBase: plugins.FrontendPluginBase{
-				PluginBase: plugins.PluginBase{
-					Signature: "internal",
+	uss.PluginManager = &fakePluginManager{
+		dataSources: map[string]*plugins.DataSourcePlugin{
+			models.DS_ES: {
+				FrontendPluginBase: plugins.FrontendPluginBase{
+					PluginBase: plugins.PluginBase{
+						Signature: "internal",
+					},
 				},
 			},
-		},
-		models.DS_PROMETHEUS: {
-			FrontendPluginBase: plugins.FrontendPluginBase{
-				PluginBase: plugins.PluginBase{
-					Signature: "internal",
+			models.DS_PROMETHEUS: {
+				FrontendPluginBase: plugins.FrontendPluginBase{
+					PluginBase: plugins.PluginBase{
+						Signature: "internal",
+					},
 				},
 			},
-		},
-		models.DS_GRAPHITE: {
-			FrontendPluginBase: plugins.FrontendPluginBase{
-				PluginBase: plugins.PluginBase{
-					Signature: "internal",
+			models.DS_GRAPHITE: {
+				FrontendPluginBase: plugins.FrontendPluginBase{
+					PluginBase: plugins.PluginBase{
+						Signature: "internal",
+					},
 				},
 			},
-		},
-		models.DS_MYSQL: {
-			FrontendPluginBase: plugins.FrontendPluginBase{
-				PluginBase: plugins.PluginBase{
-					Signature: "internal",
+			models.DS_MYSQL: {
+				FrontendPluginBase: plugins.FrontendPluginBase{
+					PluginBase: plugins.PluginBase{
+						Signature: "internal",
+					},
 				},
 			},
 		},
@@ -595,5 +609,6 @@ func createService(t *testing.T, cfg setting.Cfg) *UsageStatsService {
 		License:            &licensing.OSSLicensingService{},
 		AlertingUsageStats: &alertingUsageMock{},
 		externalMetrics:    make(map[string]MetricFunc),
+		PluginManager:      &fakePluginManager{},
 	}
 }