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

Prometheus: (Chore) Switch from infra to sdk logger (#76827)

Browse Source
This commit is contained in:
Kyle Brandt
2023-10-20 08:54:27 -05:00
committed by GitHub
parent 7759e2f8a3
commit 6dea3102cb
14 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/prometheus/middleware/custom_query_params.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana-plugin-sdk-go/backend/log"
)
const (
pkg/tsdb/prometheus/middleware/custom_query_params_test.go
+7 -8
View File
@@ -6,10 +6,9 @@ import (
"strings"
"testing"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/infra/log"
)
func TestCustomQueryParametersMiddleware(t *testing.T) {
@@ -20,7 +19,7 @@ func TestCustomQueryParametersMiddleware(t *testing.T) {
})
t.Run("Without custom query parameters set should not apply middleware", func(t *testing.T) {
mw := CustomQueryParameters(log.New("test"))
mw := CustomQueryParameters(backend.NewLoggerWith("logger", "test"))
rt := mw.CreateMiddleware(httpclient.Options{}, finalRoundTripper)
require.NotNil(t, rt)
middlewareName, ok := mw.(httpclient.MiddlewareName)
@@ -40,7 +39,7 @@ func TestCustomQueryParametersMiddleware(t *testing.T) {
})
t.Run("Without custom query parameters set as string should not apply middleware", func(t *testing.T) {
mw := CustomQueryParameters(log.New("test"))
mw := CustomQueryParameters(backend.NewLoggerWith("logger", "test"))
rt := mw.CreateMiddleware(httpclient.Options{
CustomOptions: map[string]any{
customQueryParametersKey: 64,
@@ -64,7 +63,7 @@ func TestCustomQueryParametersMiddleware(t *testing.T) {
})
t.Run("With custom query parameters set as empty string should not apply middleware", func(t *testing.T) {
mw := CustomQueryParameters(log.New("test"))
mw := CustomQueryParameters(backend.NewLoggerWith("logger", "test"))
rt := mw.CreateMiddleware(httpclient.Options{
CustomOptions: map[string]any{
customQueryParametersKey: "",
@@ -88,7 +87,7 @@ func TestCustomQueryParametersMiddleware(t *testing.T) {
})
t.Run("With custom query parameters set as invalid query string should not apply middleware", func(t *testing.T) {
mw := CustomQueryParameters(log.New("test"))
mw := CustomQueryParameters(backend.NewLoggerWith("logger", "test"))
rt := mw.CreateMiddleware(httpclient.Options{
CustomOptions: map[string]any{
customQueryParametersKey: "custom=%%abc&test=abc",
@@ -112,7 +111,7 @@ func TestCustomQueryParametersMiddleware(t *testing.T) {
})
t.Run("With custom query parameters set should apply middleware for request URL containing query parameters ", func(t *testing.T) {
mw := CustomQueryParameters(log.New("test"))
mw := CustomQueryParameters(backend.NewLoggerWith("logger", "test"))
rt := mw.CreateMiddleware(httpclient.Options{
CustomOptions: map[string]any{
grafanaDataKey: map[string]any{
@@ -144,7 +143,7 @@ func TestCustomQueryParametersMiddleware(t *testing.T) {
})
t.Run("With custom query parameters set should apply middleware for request URL not containing query parameters", func(t *testing.T) {
mw := CustomQueryParameters(log.New("test"))
mw := CustomQueryParameters(backend.NewLoggerWith("logger", "test"))
rt := mw.CreateMiddleware(httpclient.Options{
CustomOptions: map[string]any{
grafanaDataKey: map[string]any{
pkg/tsdb/prometheus/middleware/force_http_get.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana-plugin-sdk-go/backend/log"
)
func ForceHttpGet(logger log.Logger) sdkhttpclient.Middleware {
pkg/tsdb/prometheus/middleware/force_http_get_test.go
+3 -4
View File
@@ -4,10 +4,9 @@ import (
"net/http"
"testing"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/infra/log"
)
func TestEnsureHttpMethodMiddleware(t *testing.T) {
@@ -15,7 +14,7 @@ func TestEnsureHttpMethodMiddleware(t *testing.T) {
finalRoundTripper := httpclient.RoundTripperFunc(func(req *http.Request) (*http.Response, error) {
return &http.Response{StatusCode: http.StatusOK}, nil
})
mw := ForceHttpGet(log.New("test"))
mw := ForceHttpGet(backend.NewLoggerWith("logger", "test"))
rt := mw.CreateMiddleware(httpclient.Options{}, finalRoundTripper)
require.NotNil(t, rt)
middlewareName, ok := mw.(httpclient.MiddlewareName)
@@ -28,7 +27,7 @@ func TestEnsureHttpMethodMiddleware(t *testing.T) {
return &http.Response{StatusCode: http.StatusOK}, nil
})
mw := ForceHttpGet(log.New("test"))
mw := ForceHttpGet(backend.NewLoggerWith("logger", "test"))
rt := mw.CreateMiddleware(httpclient.Options{}, finalRoundTripper)
require.NotNil(t, rt)