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

Advisor: Use contextual logger (#104979)

Browse Source
This commit is contained in:
Andres Martinez Gotor
2025-05-06 13:58:29 +02:00
committed by GitHub
parent c36d84376b
commit 9b17cd44dc
15 changed files with 109 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/advisor/pkg/app/utils_test.go
+10 -9
View File
@@ -6,6 +6,7 @@ import (
"fmt"
"testing"
"github.com/grafana/grafana-app-sdk/logging"
"github.com/grafana/grafana-app-sdk/resource"
advisorv0alpha1 "github.com/grafana/grafana/apps/advisor/pkg/apis/advisor/v0alpha1"
"github.com/grafana/grafana/apps/advisor/pkg/app/checks"
@@ -62,7 +63,7 @@ func TestProcessCheck(t *testing.T) {
items: []any{"item"},
}
err = processCheck(ctx, client, obj, check)
err = processCheck(ctx, logging.DefaultLogger, client, obj, check)
assert.NoError(t, err)
assert.Equal(t, "processed", obj.GetAnnotations()[checks.StatusAnnotation])
}
@@ -89,7 +90,7 @@ func TestProcessMultipleCheckItems(t *testing.T) {
items: items,
}
err = processCheck(ctx, client, obj, check)
err = processCheck(ctx, logging.DefaultLogger, client, obj, check)
assert.NoError(t, err)
assert.Equal(t, "processed", obj.GetAnnotations()[checks.StatusAnnotation])
r := client.lastValue.(advisorv0alpha1.CheckV0alpha1StatusReport)
@@ -104,7 +105,7 @@ func TestProcessCheck_AlreadyProcessed(t *testing.T) {
ctx := context.TODO()
check := &mockCheck{}
err := processCheck(ctx, client, obj, check)
err := processCheck(ctx, logging.DefaultLogger, client, obj, check)
assert.NoError(t, err)
}
@@ -124,7 +125,7 @@ func TestProcessCheck_RunError(t *testing.T) {
err: errors.New("run error"),
}
err = processCheck(ctx, client, obj, check)
err = processCheck(ctx, logging.DefaultLogger, client, obj, check)
assert.Error(t, err)
assert.Equal(t, "error", obj.GetAnnotations()[checks.StatusAnnotation])
}
@@ -145,7 +146,7 @@ func TestProcessCheck_RunRecoversFromPanic(t *testing.T) {
runPanics: true,
}
err = processCheck(ctx, client, obj, check)
err = processCheck(ctx, logging.DefaultLogger, client, obj, check)
assert.Error(t, err)
assert.Contains(t, err.Error(), "panic recovered in step")
assert.Equal(t, "error", obj.GetAnnotations()[checks.StatusAnnotation])
@@ -164,7 +165,7 @@ func TestProcessCheckRetry_NoRetry(t *testing.T) {
check := &mockCheck{}
err = processCheckRetry(ctx, client, obj, check)
err = processCheckRetry(ctx, logging.DefaultLogger, client, obj, check)
assert.NoError(t, err)
}
@@ -187,7 +188,7 @@ func TestProcessCheckRetry_RetryError(t *testing.T) {
err: errors.New("retry error"),
}
err = processCheckRetry(ctx, client, obj, check)
err = processCheckRetry(ctx, logging.DefaultLogger, client, obj, check)
assert.Error(t, err)
assert.Equal(t, "error", obj.GetAnnotations()[checks.StatusAnnotation])
}
@@ -216,7 +217,7 @@ func TestProcessCheckRetry_Success(t *testing.T) {
items: []any{"item"},
}
err = processCheckRetry(ctx, client, obj, check)
err = processCheckRetry(ctx, logging.DefaultLogger, client, obj, check)
assert.NoError(t, err)
assert.Equal(t, "processed", obj.GetAnnotations()[checks.StatusAnnotation])
assert.Empty(t, obj.GetAnnotations()[checks.RetryAnnotation])
@@ -262,7 +263,7 @@ type mockStep struct {
panics bool
}
func (m *mockStep) Run(ctx context.Context, obj *advisorv0alpha1.CheckSpec, items any) (*advisorv0alpha1.CheckReportFailure, error) {
func (m *mockStep) Run(ctx context.Context, log logging.Logger, obj *advisorv0alpha1.CheckSpec, items any) (*advisorv0alpha1.CheckReportFailure, error) {
if m.panics {
panic("panic")
}