@@ -11,7 +11,6 @@ import (
1111 "strings"
1212 "time"
1313
14- "github.com/Knetic/govaluate"
1514 "github.com/bitly/go-simplejson"
1615 "github.com/grafadruid/go-druid"
1716 druidquerybuilder "github.com/grafadruid/go-druid/builder"
@@ -196,7 +195,7 @@ type grafanaMetricFindValue struct {
196195}
197196
198197func (ds * Service ) QueryVariableData (ctx context.Context , req * backend.CallResourceRequest ) ([]grafanaMetricFindValue , error ) {
199- s , err := ds .settings (req .PluginContext )
198+ s , err := ds .settings (req .PluginContext , ctx )
200199 if err != nil {
201200 return []grafanaMetricFindValue {}, err
202201 }
@@ -286,7 +285,7 @@ func (ds *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequ
286285 Message : "Can't connect to Druid" ,
287286 }
288287
289- i , err := ds .im .Get (req .PluginContext )
288+ i , err := ds .im .Get (ctx , req .PluginContext )
290289 if err != nil {
291290 result .Message = "Can't get Druid instance"
292291 return result , nil
@@ -305,7 +304,7 @@ func (ds *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthRequ
305304
306305func (ds * Service ) QueryData (ctx context.Context , req * backend.QueryDataRequest ) (* backend.QueryDataResponse , error ) {
307306 response := backend .NewQueryDataResponse ()
308- s , err := ds .settings (req .PluginContext )
307+ s , err := ds .settings (req .PluginContext , ctx )
309308 if err != nil {
310309 return response , err
311310 }
@@ -342,8 +341,8 @@ func toHTTPHeaders(rawOriginal interface{}) http.Header {
342341 return headers
343342}
344343
345- func (ds * Service ) settings (ctx backend.PluginContext ) (* druidInstanceSettings , error ) {
346- s , err := ds .im .Get (ctx )
344+ func (ds * Service ) settings (ctx backend.PluginContext , getCtx context. Context ) (* druidInstanceSettings , error ) {
345+ s , err := ds .im .Get (getCtx , ctx )
347346 if err != nil {
348347 return nil , err
349348 }
@@ -441,9 +440,6 @@ func (ds *Service) prepareQuery(qry []byte, s *druidInstanceSettings) (druidquer
441440 defaultQueryContext ,
442441 ds .prepareQueryContext (queryContextParameters .([]interface {})))
443442 }
444- if g , ok := q .Builder ["granularity" ].(map [string ]any ); ok {
445- q .Builder ["granularity" ] = resolveGranularity (g )
446- }
447443 jsonQuery , err := json .Marshal (q .Builder )
448444 if err != nil {
449445 return nil , nil , err
@@ -453,28 +449,6 @@ func (ds *Service) prepareQuery(qry []byte, s *druidInstanceSettings) (druidquer
453449 return query , mergeSettings (s .defaultQuerySettings , q .Settings ), err
454450}
455451
456- func resolveGranularity (m map [string ]any ) map [string ]any {
457- // granularity is optional, so return early if not set and is of wrong type
458- if m == nil || m ["type" ] != "duration" {
459- return m
460- }
461- expr , ok := m ["duration" ].(string )
462- if ! ok {
463- return m
464- }
465-
466- eval , err := govaluate .NewEvaluableExpression (expr )
467- if err != nil {
468- return m
469- }
470- result , err := eval .Evaluate (nil )
471- if err != nil {
472- return m
473- }
474- m ["duration" ] = result
475- return m
476- }
477-
478452func (ds * Service ) prepareQueryContext (parameters []interface {}) map [string ]interface {} {
479453 ctx := make (map [string ]interface {})
480454 for _ , parameter := range parameters {
@@ -499,21 +473,21 @@ func (ds *Service) executeQuery(
499473 return nil , errors .New ("not implemented" )
500474 case "timeseries" :
501475 var r result.TimeseriesResult
502- _ , err := s .client .Query ().Execute (q , & r , headers )
476+ _ , err := s .client .Query ().Execute (q , & r )
503477 if err != nil {
504478 return nil , fmt .Errorf ("Query error: %w" , err )
505479 }
506480 resultFramer = & r
507481 case "topN" :
508482 var r result.TopNResult
509- _ , err := s .client .Query ().Execute (q , & r , headers )
483+ _ , err := s .client .Query ().Execute (q , & r )
510484 if err != nil {
511485 return nil , fmt .Errorf ("Query error: %w" , err )
512486 }
513487 resultFramer = & r
514488 case "groupBy" :
515489 var r result.GroupByResult
516- _ , err := s .client .Query ().Execute (q , & r , headers )
490+ _ , err := s .client .Query ().Execute (q , & r )
517491 if err != nil {
518492 return nil , fmt .Errorf ("Query error: %w" , err )
519493 }
@@ -548,7 +522,7 @@ func (ds *Service) oldExecuteQuery(queryRef string, q druidquerybuilder.Query, s
548522 q .(* druidquery.Scan ).SetResultFormat ("compactedList" )
549523 }
550524 var res json.RawMessage
551- _ , err := s .client .Query ().Execute (q , & res , headers )
525+ _ , err := s .client .Query ().Execute (q , & res )
552526 if err != nil {
553527 return r , err
554528 }
0 commit comments