From a013ee7be4093d7eeccc490980643bf838776a1a Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 6 Apr 2023 13:11:25 +0200 Subject: [PATCH] [v9.5.x] Plugins: Skip instrumenting plugin build info for core and bundled plugins (#66113) Plugins: Skip instrumenting plugin build info for core and bundled plugins (#66105) * only instrument plugin build for non core/bundled plugins * fix import (cherry picked from commit 7808e74260037a63dfd1188363125f242818b4d8) Co-authored-by: Will Browne --- pkg/plugins/manager/loader/loader.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/plugins/manager/loader/loader.go b/pkg/plugins/manager/loader/loader.go index adfa11d1742..558d0cc6efb 100644 --- a/pkg/plugins/manager/loader/loader.go +++ b/pkg/plugins/manager/loader/loader.go @@ -177,8 +177,6 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun if err != nil { return nil, err } - metrics.SetPluginBuildInformation(p.ID, string(p.Type), p.Info.Version, string(p.Signature)) - if errDeclareRoles := l.roleRegistry.DeclarePluginRoles(ctx, p.ID, p.Name, p.Roles); errDeclareRoles != nil { l.log.Warn("Declare plugin roles failed.", "pluginID", p.ID, "err", errDeclareRoles) } @@ -188,6 +186,10 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun if err := l.load(ctx, p); err != nil { l.log.Error("Could not start plugin", "pluginId", p.ID, "err", err) } + + if !p.IsCorePlugin() && !p.IsBundledPlugin() { + metrics.SetPluginBuildInformation(p.ID, string(p.Type), p.Info.Version, string(p.Signature)) + } } return verifiedPlugins, nil