public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plugins: Add statusSource to partial data response error log (#78057)

Browse Source 
* Plugins: Add statusSource to partial data response error log

* Introduce DefaultStatusSource

* Add StatusSourceFromPluginErrorSource

* Moved StatusSourceFromPluginErrorSource

* Update pkg/services/pluginsintegration/clientmiddleware/logger_middleware.go
This commit is contained in:
Giuseppe Guerra
2023-11-14 16:27:48 +02:00
committed by GitHub
parent 53758ad764
commit ab4fc07cc7
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/pluginsintegration/clientmiddleware/logger_middleware.go
+6 -2
View File
@@ -51,7 +51,7 @@ func (m *LoggerMiddleware) logRequest(ctx context.Context, fn func(ctx context.C
logParams = append(logParams, "error", err)
}
if m.features.IsEnabled(featuremgmt.FlagPluginsInstrumentationStatusSource) {
logParams = append(logParams, "status_source", pluginrequestmeta.StatusSourceFromContext(ctx))
logParams = append(logParams, "statusSource", pluginrequestmeta.StatusSourceFromContext(ctx))
}
ctxLogger := m.logger.FromContext(ctx)
@@ -81,7 +81,11 @@ func (m *LoggerMiddleware) QueryData(ctx context.Context, req *backend.QueryData
ctxLogger := m.logger.FromContext(ctx)
for refID, dr := range resp.Responses {
if dr.Error != nil {
ctxLogger.Error("Partial data response error", "refID", refID, "error", dr.Error)
logParams := []any{"refID", refID, "status", int(dr.Status), "error", dr.Error}
if m.features.IsEnabled(featuremgmt.FlagPluginsInstrumentationStatusSource) {
logParams = append(logParams, "statusSource", pluginrequestmeta.StatusSourceFromPluginErrorSource(dr.ErrorSource))
}
ctxLogger.Error("Partial data response error", logParams...)
}
}
pkg/services/pluginsintegration/clientmiddleware/plugin_request_meta_middleware.go
+1 -1
View File
@@ -16,7 +16,7 @@ func NewPluginRequestMetaMiddleware() plugins.ClientMiddleware {
return plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
return &PluginRequestMetaMiddleware{
next: next,
defaultStatusSource: pluginrequestmeta.StatusSourcePlugin,
defaultStatusSource: pluginrequestmeta.DefaultStatusSource,
}
})
}