mirror of
https://github.com/grafana/grafana.git
synced 2025-02-12 00:25:46 -06:00
a89202eab2
* WIP: Plugins tracing * Trace ID middleware * Add prometheus metrics and tracing to plugins updater * Add TODOs * Add instrumented http client * Add tracing to grafana update checker * Goimports * Moved plugins tracing to middleware * goimports, fix tests * Removed X-Trace-Id header * Fix comment in NewTracingHeaderMiddleware * Add metrics to instrumented http client * Add instrumented http client options * Removed unused function * Switch to contextual logger * Refactoring, fix tests * Moved InstrumentedHTTPClient and PrometheusMetrics to their own package * Tracing middleware: handle errors * Report span status codes when recording errors * Add tests for tracing middleware * Moved fakeSpan and fakeTracer to pkg/infra/tracing * Add TestHTTPClientTracing * Lint * Changes after PR review * Tests: Made "ended" in FakeSpan private, allow calling End only once * Testing: panic in FakeSpan if span already ended * Refactoring: Simplify Grafana updater checks * Refactoring: Simplify plugins updater error checks and logs * Fix wrong call to checkForUpdates -> instrumentedCheckForUpdates * Tests: Fix wrong call to checkForUpdates -> instrumentedCheckForUpdates * Log update checks duration, use Info log level for check succeeded logs * Add plugin context span attributes in tracing_middleware * Refactor prometheus metrics as httpclient middleware * Fix call to ProvidePluginsService in plugins_test.go * Propagate context to update checker outgoing http requests * Plugin client tracing middleware: Removed operation name in status * Fix tests * Goimports tracing_middleware.go * Goimports * Fix imports * Changed span name to plugins client middleware * Add span name assertion in TestTracingMiddleware * Removed Prometheus metrics middleware from grafana and plugins updatechecker * Add span attributes for ds name, type, uid, panel and dashboard ids * Fix http header reading in tracing middlewares * Use contexthandler.FromContext, add X-Query-Group-Id * Add test for RunStream * Fix imports * Changes from PR review * TestTracingMiddleware: Changed assert to require for didPanic assertion * Lint * Fix imports
111 lines
4.6 KiB
Go
111 lines
4.6 KiB
Go
package pluginsintegration
|
|
|
|
import (
|
|
"github.com/google/wire"
|
|
|
|
"github.com/grafana/grafana/pkg/infra/tracing"
|
|
"github.com/grafana/grafana/pkg/plugins"
|
|
"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
|
|
"github.com/grafana/grafana/pkg/plugins/backendplugin/provider"
|
|
"github.com/grafana/grafana/pkg/plugins/config"
|
|
"github.com/grafana/grafana/pkg/plugins/manager"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/client"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/loader"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/loader/assetpath"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/loader/finder"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/process"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/registry"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/signature"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/sources"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/store"
|
|
"github.com/grafana/grafana/pkg/plugins/pluginscdn"
|
|
"github.com/grafana/grafana/pkg/plugins/repo"
|
|
"github.com/grafana/grafana/pkg/services/oauthtoken"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/clientmiddleware"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/licensing"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
|
|
pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
|
|
"github.com/grafana/grafana/pkg/setting"
|
|
)
|
|
|
|
// WireSet provides a wire.ProviderSet of plugin providers.
|
|
var WireSet = wire.NewSet(
|
|
config.ProvideConfig,
|
|
store.ProvideService,
|
|
wire.Bind(new(plugins.Store), new(*store.Service)),
|
|
wire.Bind(new(plugins.RendererManager), new(*store.Service)),
|
|
wire.Bind(new(plugins.SecretsPluginManager), new(*store.Service)),
|
|
wire.Bind(new(plugins.StaticRouteResolver), new(*store.Service)),
|
|
ProvideClientDecorator,
|
|
wire.Bind(new(plugins.Client), new(*client.Decorator)),
|
|
process.ProvideService,
|
|
wire.Bind(new(process.Service), new(*process.Manager)),
|
|
coreplugin.ProvideCoreRegistry,
|
|
pluginscdn.ProvideService,
|
|
assetpath.ProvideService,
|
|
loader.ProvideService,
|
|
wire.Bind(new(loader.Service), new(*loader.Loader)),
|
|
wire.Bind(new(plugins.ErrorResolver), new(*loader.Loader)),
|
|
manager.ProvideInstaller,
|
|
wire.Bind(new(plugins.Installer), new(*manager.PluginInstaller)),
|
|
registry.ProvideService,
|
|
wire.Bind(new(registry.Service), new(*registry.InMemory)),
|
|
repo.ProvideService,
|
|
wire.Bind(new(repo.Service), new(*repo.Manager)),
|
|
plugincontext.ProvideService,
|
|
licensing.ProvideLicensing,
|
|
wire.Bind(new(plugins.Licensing), new(*licensing.Service)),
|
|
wire.Bind(new(sources.Registry), new(*sources.Service)),
|
|
sources.ProvideService,
|
|
pluginSettings.ProvideService,
|
|
wire.Bind(new(pluginsettings.Service), new(*pluginSettings.Service)),
|
|
)
|
|
|
|
// WireExtensionSet provides a wire.ProviderSet of plugin providers that can be
|
|
// extended.
|
|
var WireExtensionSet = wire.NewSet(
|
|
provider.ProvideService,
|
|
wire.Bind(new(plugins.BackendFactoryProvider), new(*provider.Service)),
|
|
signature.ProvideOSSAuthorizer,
|
|
wire.Bind(new(plugins.PluginLoaderAuthorizer), new(*signature.UnsignedPluginAuthorizer)),
|
|
wire.Bind(new(finder.Finder), new(*finder.Local)),
|
|
finder.NewLocalFinder,
|
|
)
|
|
|
|
func ProvideClientDecorator(cfg *setting.Cfg, pCfg *config.Cfg,
|
|
pluginRegistry registry.Service,
|
|
oAuthTokenService oauthtoken.OAuthTokenService,
|
|
tracer tracing.Tracer) (*client.Decorator, error) {
|
|
return NewClientDecorator(cfg, pCfg, pluginRegistry, oAuthTokenService, tracer)
|
|
}
|
|
|
|
func NewClientDecorator(cfg *setting.Cfg, pCfg *config.Cfg,
|
|
pluginRegistry registry.Service,
|
|
oAuthTokenService oauthtoken.OAuthTokenService,
|
|
tracer tracing.Tracer) (*client.Decorator, error) {
|
|
c := client.ProvideService(pluginRegistry, pCfg)
|
|
middlewares := CreateMiddlewares(cfg, oAuthTokenService, tracer)
|
|
|
|
return client.NewDecorator(c, middlewares...)
|
|
}
|
|
|
|
func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthTokenService, tracer tracing.Tracer) []plugins.ClientMiddleware {
|
|
skipCookiesNames := []string{cfg.LoginCookieName}
|
|
middlewares := []plugins.ClientMiddleware{
|
|
clientmiddleware.NewTracingMiddleware(tracer),
|
|
clientmiddleware.NewTracingHeaderMiddleware(),
|
|
clientmiddleware.NewClearAuthHeadersMiddleware(),
|
|
clientmiddleware.NewOAuthTokenMiddleware(oAuthTokenService),
|
|
clientmiddleware.NewCookiesMiddleware(skipCookiesNames),
|
|
}
|
|
|
|
if cfg.SendUserHeader {
|
|
middlewares = append(middlewares, clientmiddleware.NewUserHeaderMiddleware())
|
|
}
|
|
|
|
middlewares = append(middlewares, clientmiddleware.NewHTTPClientMiddleware())
|
|
|
|
return middlewares
|
|
}
|