IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

MySQL: add error source to QueryData (#96769)

Browse Source 
* add error source to mysql

* Update pkg/tsdb/mysql/sqleng/sql_engine.go

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

---------

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
This commit is contained in:
Gareth Dawson 2024-11-26 10:25:48 +00:00 committed by GitHub
parent 754fce648c
commit 3b8499eaee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/tsdb/mysql/sqleng/sql_engine.go
View File

@ -208,10 +208,13 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
logger.Error("ExecuteQuery panic", "error", r, "stack", string(debug.Stack())) logger.Error("ExecuteQuery panic", "error", r, "stack", string(debug.Stack()))
if theErr, ok := r.(error); ok { if theErr, ok := r.(error); ok {
queryResult.dataResponse.Error = theErr queryResult.dataResponse.Error = theErr
queryResult.dataResponse.ErrorSource = backend.ErrorSourcePlugin
} else if theErrString, ok := r.(string); ok { } else if theErrString, ok := r.(string); ok {
queryResult.dataResponse.Error = errors.New(theErrString) queryResult.dataResponse.Error = errors.New(theErrString)
queryResult.dataResponse.ErrorSource = backend.ErrorSourcePlugin
} else { } else {
queryResult.dataResponse.Error = fmt.Errorf("unexpected error - %s", e.userError) queryResult.dataResponse.Error = fmt.Errorf("unexpected error - %s", e.userError)
queryResult.dataResponse.ErrorSource = backend.ErrorSourceDownstream
} }
ch <- queryResult ch <- queryResult
} }
@ -223,12 +226,13 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
timeRange := query.TimeRange timeRange := query.TimeRange
errAppendDebug := func(frameErr string, err error, query string) { errAppendDebug := func(frameErr string, err error, query string, source backend.ErrorSource) {
var emptyFrame data.Frame var emptyFrame data.Frame
emptyFrame.SetMeta(&data.FrameMeta{ emptyFrame.SetMeta(&data.FrameMeta{
ExecutedQueryString: query, ExecutedQueryString: query,
}) })
queryResult.dataResponse.Error = fmt.Errorf("%s: %w", frameErr, err) queryResult.dataResponse.Error = fmt.Errorf("%s: %w", frameErr, err)
queryResult.dataResponse.ErrorSource = source
queryResult.dataResponse.Frames = data.Frames{&emptyFrame} queryResult.dataResponse.Frames = data.Frames{&emptyFrame}
ch <- queryResult ch <- queryResult
} }
@ -239,13 +243,13 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
// data source specific substitutions // data source specific substitutions
interpolatedQuery, err := e.macroEngine.Interpolate(&query, timeRange, interpolatedQuery) interpolatedQuery, err := e.macroEngine.Interpolate(&query, timeRange, interpolatedQuery)
if err != nil { if err != nil {
errAppendDebug("interpolation failed", e.TransformQueryError(logger, err), interpolatedQuery) errAppendDebug("interpolation failed", e.TransformQueryError(logger, err), interpolatedQuery, backend.ErrorSourcePlugin)
return return
} }
rows, err := e.db.QueryContext(queryContext, interpolatedQuery) rows, err := e.db.QueryContext(queryContext, interpolatedQuery)
if err != nil { if err != nil {
errAppendDebug("db query error", e.TransformQueryError(logger, err), interpolatedQuery) errAppendDebug("db query error", e.TransformQueryError(logger, err), interpolatedQuery, backend.ErrorSourceDownstream)
return return
} }
defer func() { defer func() {
@ -256,7 +260,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
qm, err := e.newProcessCfg(query, queryContext, rows, interpolatedQuery) qm, err := e.newProcessCfg(query, queryContext, rows, interpolatedQuery)
if err != nil { if err != nil {
errAppendDebug("failed to get configurations", err, interpolatedQuery) errAppendDebug("failed to get configurations", err, interpolatedQuery, backend.ErrorSourcePlugin)
return return
} }
@ -264,7 +268,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
stringConverters := e.queryResultTransformer.GetConverterList() stringConverters := e.queryResultTransformer.GetConverterList()
frame, err := sqlutil.FrameFromRows(rows, e.rowLimit, sqlutil.ToConverters(stringConverters...)...) frame, err := sqlutil.FrameFromRows(rows, e.rowLimit, sqlutil.ToConverters(stringConverters...)...)
if err != nil { if err != nil {
errAppendDebug("convert frame from rows error", err, interpolatedQuery) errAppendDebug("convert frame from rows error", err, interpolatedQuery, backend.ErrorSourcePlugin)
return return
} }
@ -286,14 +290,14 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
} }
if err := convertSQLTimeColumnsToEpochMS(frame, qm); err != nil { if err := convertSQLTimeColumnsToEpochMS(frame, qm); err != nil {
errAppendDebug("converting time columns failed", err, interpolatedQuery) errAppendDebug("converting time columns failed", err, interpolatedQuery, backend.ErrorSourcePlugin)
return return
} }
if qm.Format == dataQueryFormatSeries { if qm.Format == dataQueryFormatSeries {
// time series has to have time column // time series has to have time column
if qm.timeIndex == -1 { if qm.timeIndex == -1 {
errAppendDebug("db has no time column", errors.New("no time column found"), interpolatedQuery) errAppendDebug("db has no time column", errors.New("time column is missing; make sure your data includes a time column for time series format or switch to a table format that doesn't require it"), interpolatedQuery, backend.ErrorSourceDownstream)
return return
} }
@ -311,7 +315,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
var err error var err error
if frame, err = convertSQLValueColumnToFloat(frame, i); err != nil { if frame, err = convertSQLValueColumnToFloat(frame, i); err != nil {
errAppendDebug("convert value to float failed", err, interpolatedQuery) errAppendDebug("convert value to float failed", err, interpolatedQuery, backend.ErrorSourcePlugin)
return return
} }
} }
@ -322,7 +326,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
originalData := frame originalData := frame
frame, err = data.LongToWide(frame, qm.FillMissing) frame, err = data.LongToWide(frame, qm.FillMissing)
if err != nil { if err != nil {
errAppendDebug("failed to convert long to wide series when converting from dataframe", err, interpolatedQuery) errAppendDebug("failed to convert long to wide series when converting from dataframe", err, interpolatedQuery, backend.ErrorSourcePlugin)
return return
} }