remove all zap references

controllers/grafana_controller.go

@@ -4,14 +4,14 @@ package controllers
 
 import (
 	"context"
+	"log/slog"
 
 	"github.com/go-logr/logr"
 	grafanav1alpha1 "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1"
 	grafanaconfig "github.com/grafana-operator/grafana-operator/v4/controllers/config"
 	"github.com/grafana-operator/grafana-operator/v4/controllers/grafana"
 	"github.com/grafana-operator/grafana-operator/v4/controllers/grafanadashboard"
 	"github.com/grafana-operator/grafana-operator/v4/controllers/grafanadatasource"
-	"go.uber.org/zap/zapcore"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
@@ -55,7 +55,7 @@ type GrafanaDatasourceReconciler struct {
 func (r *GrafanaReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	r.Client = mgr.GetClient()
 	r.scheme = mgr.GetScheme()
-	r.Log = mgr.GetLogger().WithName("controllers").WithName("Grafana").V(int(zapcore.WarnLevel))
+	r.Log = mgr.GetLogger().WithName("controllers").WithName("Grafana").V(int(slog.LevelWarn))
 	ctx, ca := context.WithCancel(context.Background())
 	gc := &grafana.ReconcileGrafana{
 		Client:   r.Client,
@@ -82,7 +82,7 @@ func (r *GrafanaReconciler) SetupWithManager(mgr ctrl.Manager) error {
 func (r *GrafanaDashboardReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	r.Client = mgr.GetClient()
 	r.scheme = mgr.GetScheme()
-	r.Log = mgr.GetLogger().WithName("controllers").WithName("GrafanaDashboard").V(int(zapcore.WarnLevel))
+	r.Log = mgr.GetLogger().WithName("controllers").WithName("GrafanaDashboard").V(int(slog.LevelWarn))
 
 	reconciler := grafanadashboard.NewReconciler(mgr)
 	reconciler.(*grafanadashboard.GrafanaDashboardReconciler).Log = r.Log
@@ -93,7 +93,7 @@ func (r *GrafanaDashboardReconciler) SetupWithManager(mgr ctrl.Manager) error {
 func (r *GrafanaDatasourceReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	r.Client = mgr.GetClient()
 	r.scheme = mgr.GetScheme()
-	r.Log = mgr.GetLogger().WithName("controllers").WithName("GrafanaDatasource").V(int(zapcore.WarnLevel))
+	r.Log = mgr.GetLogger().WithName("controllers").WithName("GrafanaDatasource").V(int(slog.LevelWarn))
 	ctx, ca := context.WithCancel(context.Background())
 	gc := &grafanadatasource.GrafanaDatasourceReconciler{
 		Client:   r.Client,

go.mod

@@ -163,7 +163,10 @@ require (
 	sigs.k8s.io/yaml v1.3.0
 )
 
-require github.com/go-logr/zapr v1.2.4 // indirect
+require (
+	github.com/go-logr/zapr v1.2.4 // indirect
+	go.uber.org/zap v1.25.0 // indirect
+)
 
 require (
 	cloud.google.com/go v0.110.7 // indirect

pkg/alerting/drivers/backend/api.go

@@ -19,7 +19,6 @@ import (
 	corev1 "github.com/rancher/opni/pkg/apis/core/v1"
 	// "github.com/rancher/opni/pkg/logger"
 	// "github.com/samber/lo"
-	// "go.uber.org/zap"
 	// "slices"
 	// "google.golang.org/protobuf/encoding/protojson"
 	// "google.golang.org/protobuf/proto"

pkg/update/kubernetes/client/client.go

@@ -271,7 +271,7 @@ func init() {
 	update.RegisterAgentSyncHandlerBuilder(kubernetes.UpdateStrategy, func(args ...any) (update.SyncHandler, error) {
 		lg, ok := args[0].(*slog.Logger)
 		if !ok {
-			return nil, fmt.Errorf("expected *zap.Logger, got %T", args[0])
+			return nil, fmt.Errorf("expected *slog.Logger, got %T", args[0])
 		}
 
 		var opts []KubernetesOption

pkg/update/patch/client/client.go

@@ -440,7 +440,7 @@ func init() {
 		}
 		lg, ok := args[1].(*slog.Logger)
 		if !ok {
-			return nil, fmt.Errorf("expected *zap.Logger, got %T", args[1])
+			return nil, fmt.Errorf("expected *slog.Logger, got %T", args[1])
 		}
 
 		var opts []PatchClientOption

test/integration/gateway_ratelimit_test.go

@@ -4,15 +4,13 @@ import (
 	"context"
 	"time"
 
-	"github.com/kralicky/totem"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	managementv1 "github.com/rancher/opni/pkg/apis/management/v1"
 	"github.com/rancher/opni/pkg/config/v1beta1"
 	"github.com/rancher/opni/pkg/test"
 	"github.com/rancher/opni/pkg/test/testruntime"
 	"github.com/rancher/opni/pkg/test/testutil"
-	"go.uber.org/zap/zapcore"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/protobuf/types/known/emptypb"
 )
@@ -22,7 +20,6 @@ var _ = Describe("Gateway - Gateway rate limit tests", Ordered, testruntime.Enab
 	var client managementv1.ManagementClient
 	var fingerprint string
 	BeforeAll(func() {
-		totem.LogLevel.SetLevel(zapcore.ErrorLevel) // suppress noisy warnings we are expecting to get here
 		environment = &test.Environment{}
 		Expect(environment.Start(test.WithStorageBackend(v1beta1.StorageTypeEtcd))).To(Succeed())
 		client = environment.NewManagementClient()
@@ -33,7 +30,6 @@ var _ = Describe("Gateway - Gateway rate limit tests", Ordered, testruntime.Enab
 		Expect(fingerprint).NotTo(BeEmpty())
 
 		DeferCleanup(func() {
-			totem.LogLevel.SetLevel(zapcore.WarnLevel)
 			environment.Stop()
 		})
 	})