From 43987e7f8c74796b291dac0f983651eba82d68b5 Mon Sep 17 00:00:00 2001
From: Will Browne <wbrowne@users.noreply.github.com>
Date: Fri, 2 Sep 2022 14:01:52 +0200
Subject: [PATCH] Plugins: Fix plugin registered startup log line (#54634)

* fix plugin registered log

* remove stale test
---
 pkg/plugins/manager/manager.go              |  5 +++++
 pkg/plugins/manager/process/process.go      |  9 ++++-----
 pkg/plugins/manager/process/process_test.go | 19 -------------------
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/pkg/plugins/manager/manager.go b/pkg/plugins/manager/manager.go
index ad5e908100f..a51cc92860b 100644
--- a/pkg/plugins/manager/manager.go
+++ b/pkg/plugins/manager/manager.go
@@ -211,6 +211,11 @@ func (m *PluginManager) registerAndStart(ctx context.Context, p *plugins.Plugin)
 	if err := m.pluginRegistry.Add(ctx, p); err != nil {
 		return err
 	}
+
+	if !p.IsCorePlugin() {
+		m.log.Info("Plugin registered", "pluginID", p.ID)
+	}
+
 	return m.processManager.Start(ctx, p.ID)
 }
 
diff --git a/pkg/plugins/manager/process/process.go b/pkg/plugins/manager/process/process.go
index e72b071123f..d23d23ad91c 100644
--- a/pkg/plugins/manager/process/process.go
+++ b/pkg/plugins/manager/process/process.go
@@ -48,11 +48,6 @@ func (m *Manager) Start(ctx context.Context, pluginID string) error {
 		return nil
 	}
 
-	if p.IsCorePlugin() {
-		return nil
-	}
-
-	m.log.Info("Plugin registered", "pluginID", p.ID)
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
@@ -106,6 +101,10 @@ func startPluginAndRestartKilledProcesses(ctx context.Context, p *plugins.Plugin
 		return err
 	}
 
+	if p.IsCorePlugin() {
+		return nil
+	}
+
 	go func(ctx context.Context, p *plugins.Plugin) {
 		if err := restartKilledProcess(ctx, p); err != nil {
 			p.Logger().Error("Attempt to restart killed plugin process failed", "error", err)
diff --git a/pkg/plugins/manager/process/process_test.go b/pkg/plugins/manager/process/process_test.go
index 805aa14668e..9560a9b091f 100644
--- a/pkg/plugins/manager/process/process_test.go
+++ b/pkg/plugins/manager/process/process_test.go
@@ -18,25 +18,6 @@ func TestProcessManager_Start(t *testing.T) {
 		require.ErrorIs(t, err, backendplugin.ErrPluginNotRegistered)
 	})
 
-	t.Run("Cannot start a core plugin", func(t *testing.T) {
-		pluginID := "core-datasource"
-
-		bp := newFakeBackendPlugin(true)
-		p := createPlugin(t, bp, func(plugin *plugins.Plugin) {
-			plugin.ID = pluginID
-			plugin.Class = plugins.Core
-			plugin.Backend = true
-		})
-
-		m := NewManager(newFakePluginRegistry(map[string]*plugins.Plugin{
-			pluginID: p,
-		}))
-		err := m.Start(context.Background(), pluginID)
-		require.NoError(t, err)
-		require.True(t, p.Exited())
-		require.Zero(t, bp.startCount)
-	})
-
 	t.Run("Plugin state determines process start", func(t *testing.T) {
 		tcs := []struct {
 			name               string