From 4ab61cea0ee4d99046df6fcf0a74b362a5f77bcd Mon Sep 17 00:00:00 2001 From: Andreas Christou Date: Mon, 9 Sep 2024 14:02:09 +0100 Subject: [PATCH] MSSQL: Add errorsource (#92152) * Add errorsource to mssql * Fix args * Use fmt.Errorf --- pkg/tsdb/mssql/sqleng/sql_engine.go | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkg/tsdb/mssql/sqleng/sql_engine.go b/pkg/tsdb/mssql/sqleng/sql_engine.go index f129383b440..cf4ed354181 100644 --- a/pkg/tsdb/mssql/sqleng/sql_engine.go +++ b/pkg/tsdb/mssql/sqleng/sql_engine.go @@ -217,10 +217,13 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG logger.Error("ExecuteQuery panic", "error", r, "stack", string(debug.Stack())) if theErr, ok := r.(error); ok { queryResult.dataResponse.Error = theErr + queryResult.dataResponse.ErrorSource = backend.ErrorSourcePlugin } else if theErrString, ok := r.(string); ok { queryResult.dataResponse.Error = errors.New(theErrString) + queryResult.dataResponse.ErrorSource = backend.ErrorSourcePlugin } else { queryResult.dataResponse.Error = fmt.Errorf("unexpected error - %s", e.userError) + queryResult.dataResponse.ErrorSource = backend.ErrorSourceDownstream } ch <- queryResult } @@ -232,12 +235,13 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG 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 emptyFrame.SetMeta(&data.FrameMeta{ ExecutedQueryString: query, }) queryResult.dataResponse.Error = fmt.Errorf("%s: %w", frameErr, err) + queryResult.dataResponse.ErrorSource = source queryResult.dataResponse.Frames = data.Frames{&emptyFrame} ch <- queryResult } @@ -248,13 +252,13 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG // data source specific substitutions interpolatedQuery, err := e.macroEngine.Interpolate(&query, timeRange, interpolatedQuery) if err != nil { - errAppendDebug("interpolation failed", e.TransformQueryError(logger, err), interpolatedQuery) + errAppendDebug("interpolation failed", e.TransformQueryError(logger, err), interpolatedQuery, backend.ErrorSourcePlugin) return } rows, err := e.db.QueryContext(queryContext, interpolatedQuery) if err != nil { - errAppendDebug("db query error", e.TransformQueryError(logger, err), interpolatedQuery) + errAppendDebug("db query error", e.TransformQueryError(logger, err), interpolatedQuery, backend.ErrorSourceDownstream) return } defer func() { @@ -265,7 +269,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG qm, err := e.newProcessCfg(query, queryContext, rows, interpolatedQuery) if err != nil { - errAppendDebug("failed to get configurations", err, interpolatedQuery) + errAppendDebug("failed to get configurations", err, interpolatedQuery, backend.ErrorSourcePlugin) return } @@ -273,7 +277,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG stringConverters := e.queryResultTransformer.GetConverterList() frame, err := sqlutil.FrameFromRows(rows, e.rowLimit, sqlutil.ToConverters(stringConverters...)...) if err != nil { - errAppendDebug("convert frame from rows error", err, interpolatedQuery) + errAppendDebug("convert frame from rows error", err, interpolatedQuery, backend.ErrorSourcePlugin) return } @@ -295,14 +299,14 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG } if err := convertSQLTimeColumnsToEpochMS(frame, qm); err != nil { - errAppendDebug("converting time columns failed", err, interpolatedQuery) + errAppendDebug("converting time columns failed", err, interpolatedQuery, backend.ErrorSourcePlugin) return } if qm.Format == dataQueryFormatSeries { // time series has to have time column 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("no time column found"), interpolatedQuery, backend.ErrorSourceDownstream) return } @@ -320,7 +324,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG var err error 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 } } @@ -331,7 +335,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG originalData := frame frame, err = data.LongToWide(frame, qm.FillMissing) 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 }