[v9.4.x] Chore: Upgrade Go to 1.20.1 and Alpine to 3.17 (#63891)

This commit is contained in:
Emil Tullstedt
2023-03-02 11:53:45 +01:00
committed by GitHub
parent eab26273d6
commit 4e687dfb6f
24 changed files with 416 additions and 302 deletions
@@ -173,7 +173,7 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, logger l
tracer.Inject(ctx, req.Header, span)
logger.Debug("AzureLogAnalytics", "Request ApiURL", req.URL.String())
res, err := client.Do(req)
res, err := client.Do(req) //nolint:bodyclose // fixed in main
if err != nil {
return dataResponseErrorWithExecuted(err)
}
@@ -178,7 +178,7 @@ func (e *AzureResourceGraphDatasource) executeQuery(ctx context.Context, logger
tracer.Inject(ctx, req.Header, span)
logger.Debug("AzureResourceGraph", "Request ApiURL", req.URL.String())
res, err := client.Do(req)
res, err := client.Do(req) //nolint:bodyclose // fixed in main
if err != nil {
return dataResponseErrorWithExecuted(err)
}
+3 -2
View File
@@ -15,10 +15,11 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"go.opentelemetry.io/otel/attribute"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/tsdb/intervalv2"
"go.opentelemetry.io/otel/attribute"
)
func addInterval(period string, field *data.Field) error {
@@ -81,7 +82,7 @@ func doRequestPage(ctx context.Context, logger log.Logger, r *http.Request, dsIn
r.Body = io.NopCloser(bytes.NewBuffer(buf))
r.Method = http.MethodPost
}
res, err := dsInfo.services[cloudMonitor].client.Do(r)
res, err := dsInfo.services[cloudMonitor].client.Do(r) //nolint:bodyclose // fixed in main
if err != nil {
return cloudMonitoringResponse{}, err
}
+1 -1
View File
@@ -151,7 +151,7 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
s.tracer.Inject(ctx, graphiteReq.Header, span)
res, err := dsInfo.HTTPClient.Do(graphiteReq)
res, err := dsInfo.HTTPClient.Do(graphiteReq) //nolint:bodyclose // fixed in main
if res != nil {
span.SetAttributes("graphite.response.code", res.StatusCode, attribute.Key("graphite.response.code").Int(res.StatusCode))
}
+1 -1
View File
@@ -93,7 +93,7 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
return &backend.QueryDataResponse{}, err
}
res, err := dsInfo.HTTPClient.Do(request)
res, err := dsInfo.HTTPClient.Do(request) //nolint:bodyclose // fixed in main
if err != nil {
return &backend.QueryDataResponse{}, err
}
+3
View File
@@ -155,6 +155,7 @@ func (s *QueryData) fetch(ctx context.Context, client *client.Client, q *models.
}
func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) (backend.DataResponse, error) {
//nolint:bodyclose // fixed in main
res, err := c.QueryRange(ctx, q)
if err != nil {
return backend.DataResponse{}, err
@@ -163,6 +164,7 @@ func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.
}
func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) (backend.DataResponse, error) {
//nolint:bodyclose // fixed in main
res, err := c.QueryInstant(ctx, q)
if err != nil {
return backend.DataResponse{}, err
@@ -171,6 +173,7 @@ func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *model
}
func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) (backend.DataResponse, error) {
//nolint:bodyclose // fixed in main
res, err := c.QueryExemplars(ctx, q)
if err != nil {
return backend.DataResponse{}, err
@@ -353,7 +353,7 @@ func executeWithHeaders(tctx *testContext, query backend.DataQuery, qr interface
Headers: headers,
}
promRes, err := toAPIResponse(qr)
promRes, err := toAPIResponse(qr) //nolint:bodyclose // fixed in main
if err != nil {
return nil, err
}