diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod index 8eadeaaabc9..8461b5c93a5 100644 --- a/pkg/promlib/go.mod +++ b/pkg/promlib/go.mod @@ -6,7 +6,6 @@ require ( github.com/grafana/dskit v0.0.0-20240905221822-931a021fb06b github.com/grafana/grafana-plugin-sdk-go v0.260.3 github.com/json-iterator/go v1.1.12 - github.com/patrickmn/go-cache v2.1.0+incompatible github.com/prometheus/client_golang v1.20.5 github.com/prometheus/common v0.61.0 github.com/prometheus/prometheus v1.8.2-0.20221021121301-51a44e6657c3 diff --git a/pkg/promlib/go.sum b/pkg/promlib/go.sum index 767e03c2064..f0286a21c4a 100644 --- a/pkg/promlib/go.sum +++ b/pkg/promlib/go.sum @@ -195,8 +195,6 @@ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= -github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= diff --git a/pkg/promlib/library.go b/pkg/promlib/library.go index 1f35360be54..111e0a51986 100644 --- a/pkg/promlib/library.go +++ b/pkg/promlib/library.go @@ -5,14 +5,12 @@ import ( "errors" "fmt" "strings" - "time" "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/backend/datasource" sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient" "github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt" "github.com/grafana/grafana-plugin-sdk-go/backend/log" - "github.com/patrickmn/go-cache" apiv1 "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/grafana/grafana/pkg/promlib/client" @@ -27,9 +25,8 @@ type Service struct { } type instance struct { - queryData *querydata.QueryData - resource *resource.Resource - versionCache *cache.Cache + queryData *querydata.QueryData + resource *resource.Resource } type ExtendOptions func(ctx context.Context, settings backend.DataSourceInstanceSettings, clientOpts *sdkhttpclient.Options, log log.Logger) error @@ -77,9 +74,8 @@ func newInstanceSettings(httpClientProvider *sdkhttpclient.Provider, log log.Log } return instance{ - queryData: qd, - resource: r, - versionCache: cache.New(time.Minute*1, time.Minute*5), + queryData: qd, + resource: r, }, nil } } @@ -110,19 +106,6 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq } switch { - case strings.EqualFold(req.Path, "version-detect"): - versionObj, found := i.versionCache.Get("version") - if found { - return sender.Send(versionObj.(*backend.CallResourceResponse)) - } - - vResp, err := i.resource.DetectVersion(ctx, req) - if err != nil { - return err - } - i.versionCache.Set("version", vResp, cache.DefaultExpiration) - return sender.Send(vResp) - case strings.EqualFold(req.Path, "suggestions"): resp, err := i.resource.GetSuggestions(ctx, req) if err != nil {