mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
* define initial service and add to wire * update caching service interface * add skipQueryCache header handler and update metrics query function to use it * add caching service as a dependency to query service * working caching impl * propagate cache status to frontend in response * beginning of improvements suggested by Lean - separate caching logic from query logic. * more changes to simplify query function * Decided to revert renaming of function * Remove error status from cache request * add extra documentation * Move query caching duration metric to query package * add a little bit of documentation * wip: convert resource caching * Change return type of query service QueryData to a QueryDataResponse with Headers * update codeowners * change X-Cache value to const * use resource caching in endpoint handlers * write resource headers to response even if it's not a cache hit * fix panic caused by lack of nil check * update unit test * remove NONE header - shouldn't show up in OSS * Convert everything to use the plugin middleware * revert a few more things * clean up unused vars * start reverting resource caching, start to implement in plugin middleware * revert more, fix typo * Update caching interfaces - resource caching now has a separate cache method * continue wiring up new resource caching conventions - still in progress * add more safety to implementation * remove some unused objects * remove some code that I left in by accident * add some comments, fix codeowners, fix duplicate registration * fix source of panic in resource middleware * Update client decorator test to provide an empty response object * create tests for caching middleware * fix unit test * Update pkg/services/caching/service.go Co-authored-by: Arati R. <33031346+suntala@users.noreply.github.com> * improve error message in error log * quick docs update * Remove use of mockery. Update return signature to return an explicit hit/miss bool * create unit test for empty request context * rename caching metrics to make it clear they pertain to caching * Update pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Add clarifying comments to cache skip middleware func * Add comment pointing to the resource cache update call * fix unit tests (missing dependency) * try to fix mystery syntax error * fix a panic * Caching: Introduce feature toggle to caching service refactor (#66323) * introduce new feature toggle * hide calls to new service behind a feature flag * remove licensing flag from toggle (misunderstood what it was for) * fix unit tests * rerun toggle gen --------- Co-authored-by: Arati R. <33031346+suntala@users.noreply.github.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
127 lines
5.4 KiB
Go
127 lines
5.4 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"
|
|
pCfg "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/filestore"
|
|
"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/caching"
|
|
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
|
"github.com/grafana/grafana/pkg/services/oauthtoken"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/clientmiddleware"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
|
|
"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)),
|
|
filestore.ProvideService,
|
|
wire.Bind(new(plugins.FileStore), new(*filestore.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 *pCfg.Cfg,
|
|
pluginRegistry registry.Service,
|
|
oAuthTokenService oauthtoken.OAuthTokenService,
|
|
tracer tracing.Tracer,
|
|
cachingService caching.CachingService,
|
|
features *featuremgmt.FeatureManager,
|
|
) (*client.Decorator, error) {
|
|
return NewClientDecorator(cfg, pCfg, pluginRegistry, oAuthTokenService, tracer, cachingService, features)
|
|
}
|
|
|
|
func NewClientDecorator(
|
|
cfg *setting.Cfg, pCfg *pCfg.Cfg,
|
|
pluginRegistry registry.Service, oAuthTokenService oauthtoken.OAuthTokenService,
|
|
tracer tracing.Tracer, cachingService caching.CachingService, features *featuremgmt.FeatureManager,
|
|
) (*client.Decorator, error) {
|
|
c := client.ProvideService(pluginRegistry, pCfg)
|
|
middlewares := CreateMiddlewares(cfg, oAuthTokenService, tracer, cachingService, features)
|
|
|
|
return client.NewDecorator(c, middlewares...)
|
|
}
|
|
|
|
func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthTokenService, tracer tracing.Tracer, cachingService caching.CachingService, features *featuremgmt.FeatureManager) []plugins.ClientMiddleware {
|
|
skipCookiesNames := []string{cfg.LoginCookieName}
|
|
middlewares := []plugins.ClientMiddleware{
|
|
clientmiddleware.NewTracingMiddleware(tracer),
|
|
clientmiddleware.NewTracingHeaderMiddleware(),
|
|
clientmiddleware.NewClearAuthHeadersMiddleware(),
|
|
clientmiddleware.NewOAuthTokenMiddleware(oAuthTokenService),
|
|
clientmiddleware.NewCookiesMiddleware(skipCookiesNames),
|
|
}
|
|
|
|
// Placing the new service implementation behind a feature flag until it is known to be stable
|
|
if features.IsEnabled(featuremgmt.FlagUseCachingService) {
|
|
middlewares = append(middlewares, clientmiddleware.NewCachingMiddleware(cachingService))
|
|
}
|
|
|
|
if cfg.SendUserHeader {
|
|
middlewares = append(middlewares, clientmiddleware.NewUserHeaderMiddleware())
|
|
}
|
|
|
|
middlewares = append(middlewares, clientmiddleware.NewHTTPClientMiddleware())
|
|
|
|
return middlewares
|
|
}
|