IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-18 09:05:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Plugins: Skip instrumenting plugin build info for core and bundled plugins (#66105)

Browse Source 
* only instrument plugin build for non core/bundled plugins

* fix import
This commit is contained in:
Will Browne
2023-04-06 12:50:50 +02:00
committed by GitHub
parent 988a120d6d
commit 7808e74260
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/plugins/manager/loader/loader.go
+4 -2
View File
@@ -166,8 +166,6 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun
if err != nil { if err != nil {
return nil, err 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 { 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) l.log.Warn("Declare plugin roles failed.", "pluginID", p.ID, "err", errDeclareRoles)
} }
@@ -177,6 +175,10 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun
if err := l.load(ctx, p); err != nil { if err := l.load(ctx, p); err != nil {
l.log.Error("Could not start plugin", "pluginId", p.ID, "err", err) 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 return verifiedPlugins, nil