mirror of
https://github.com/grafana/grafana.git
synced 2024-11-29 20:24:18 -06:00
5148250366
* rendering service changes: - make node-renderer request timeout configurable - introduce optional RenderingSession providing a long-lived session key * remove console logs * added comment explaining empty "afterRequest" method * fix compilation error * update imports formatting * Update pkg/services/rendering/interface.go Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com> * Update pkg/services/rendering/rendering.go Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com> * review fix: extract renderKey related functions/structs to auth.go * #44449: private'd `rendering.getRequestTimeout` Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
106 lines
2.8 KiB
Go
106 lines
2.8 KiB
Go
package rendering
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"github.com/grafana/grafana/pkg/plugins/backendplugin/pluginextensionv2"
|
|
)
|
|
|
|
func (rs *RenderingService) startPlugin(ctx context.Context) error {
|
|
return rs.pluginInfo.Start(ctx)
|
|
}
|
|
|
|
func (rs *RenderingService) renderViaPlugin(ctx context.Context, renderKey string, opts Opts) (*RenderResult, error) {
|
|
// gives plugin some additional time to timeout and return possible errors.
|
|
ctx, cancel := context.WithTimeout(ctx, getRequestTimeout(opts.TimeoutOpts))
|
|
defer cancel()
|
|
|
|
filePath, err := rs.getNewFilePath(RenderPNG)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
headers := map[string]*pluginextensionv2.StringList{}
|
|
|
|
for k, values := range opts.Headers {
|
|
headers[k] = &pluginextensionv2.StringList{
|
|
Values: values,
|
|
}
|
|
}
|
|
|
|
req := &pluginextensionv2.RenderRequest{
|
|
Url: rs.getURL(opts.Path),
|
|
Width: int32(opts.Width),
|
|
Height: int32(opts.Height),
|
|
DeviceScaleFactor: float32(opts.DeviceScaleFactor),
|
|
FilePath: filePath,
|
|
Timeout: int32(opts.Timeout.Seconds()),
|
|
RenderKey: renderKey,
|
|
Timezone: isoTimeOffsetToPosixTz(opts.Timezone),
|
|
Domain: rs.domain,
|
|
Headers: headers,
|
|
}
|
|
rs.log.Debug("Calling renderer plugin", "req", req)
|
|
|
|
rsp, err := rs.pluginInfo.Renderer.Render(ctx, req)
|
|
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
|
|
rs.log.Info("Rendering timed out")
|
|
return nil, ErrTimeout
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if rsp.Error != "" {
|
|
return nil, fmt.Errorf("rendering failed: %s", rsp.Error)
|
|
}
|
|
|
|
return &RenderResult{FilePath: filePath}, err
|
|
}
|
|
|
|
func (rs *RenderingService) renderCSVViaPlugin(ctx context.Context, renderKey string, opts CSVOpts) (*RenderCSVResult, error) {
|
|
// gives plugin some additional time to timeout and return possible errors.
|
|
ctx, cancel := context.WithTimeout(ctx, getRequestTimeout(opts.TimeoutOpts))
|
|
defer cancel()
|
|
|
|
filePath, err := rs.getNewFilePath(RenderCSV)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
headers := map[string]*pluginextensionv2.StringList{}
|
|
for k, values := range opts.Headers {
|
|
headers[k] = &pluginextensionv2.StringList{
|
|
Values: values,
|
|
}
|
|
}
|
|
|
|
req := &pluginextensionv2.RenderCSVRequest{
|
|
Url: rs.getURL(opts.Path),
|
|
FilePath: filePath,
|
|
RenderKey: renderKey,
|
|
Domain: rs.domain,
|
|
Timeout: int32(opts.Timeout.Seconds()),
|
|
Timezone: isoTimeOffsetToPosixTz(opts.Timezone),
|
|
Headers: headers,
|
|
}
|
|
rs.log.Debug("Calling renderer plugin", "req", req)
|
|
|
|
rsp, err := rs.pluginInfo.Renderer.RenderCSV(ctx, req)
|
|
if err != nil {
|
|
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
|
|
rs.log.Info("Rendering timed out")
|
|
return nil, ErrTimeout
|
|
}
|
|
|
|
return nil, err
|
|
}
|
|
|
|
if rsp.Error != "" {
|
|
return nil, fmt.Errorf("rendering failed: %s", rsp.Error)
|
|
}
|
|
|
|
return &RenderCSVResult{FilePath: filePath, FileName: rsp.FileName}, nil
|
|
}
|