operator: Replace otelutil/log with controller-runtime/pkg/log

Work around the noisy "ctx" key-value pair that common-go's otelutil/log
appends to every log line, serializing the full context.Context wrapper
chain (e.g. "context.Background.WithCancel.WithCancel.WithValue(...)").

Switch all call sites from log.Info(ctx, ...) / log.Error(ctx, err, ...)
to the standard controller-runtime pattern: log := log.FromContext(ctx)
followed by log.Info(...) / log.Error(err, ...).

This is a temporary workaround until redpanda-data/common-go#160 lands,
after which we can revert back to otelutil/log.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: RafalKorepta

operator/cmd/run/run.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/cockroachdb/errors"
 	"github.com/redpanda-data/common-go/kube"
-	"github.com/redpanda-data/common-go/otelutil/log"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
@@ -30,6 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/certwatcher"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
+	controllerlog "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
@@ -560,7 +560,8 @@ func Run(
 // runnables for the custom resources in the vectorized group, AKA the V1
 // operator.
 func setupVectorizedControllers(ctx context.Context, mgr ctrl.Manager, factory internalclient.ClientFactory, cloudExpander *pkgsecrets.CloudExpander, opts *RunOptions) error {
-	log.Info(ctx, "Starting Vectorized (V1) Controllers")
+	log := controllerlog.FromContext(ctx)
+	log.Info("Starting Vectorized (V1) Controllers")
 
 	configurator := resources.ConfiguratorSettings{
 		ConfiguratorBaseImage:        opts.configuratorBaseImage,
@@ -589,20 +590,20 @@ func setupVectorizedControllers(ctx context.Context, mgr ctrl.Manager, factory i
 		CloudSecretsExpander:      cloudExpander,
 		Timeout:                   opts.rpClientTimeout,
 	}).WithClusterDomain(opts.clusterDomain).WithConfiguratorSettings(configurator).SetupWithManager(mgr); err != nil {
-		log.Error(ctx, err, "Unable to create controller", "controller", "Cluster")
+		log.Error(err, "Unable to create controller", "controller", "Cluster")
 		return err
 	}
 
 	if err := vectorizedcontrollers.NewClusterMetricsController(mgr.GetClient()).SetupWithManager(mgr); err != nil {
-		log.Error(ctx, err, "Unable to create controller", "controller", "ClustersMetrics")
+		log.Error(err, "Unable to create controller", "controller", "ClustersMetrics")
 		return err
 	}
 
 	// Setup webhooks
 	if opts.webhookEnabled {
-		log.Info(ctx, "Setup webhook")
+		log.Info("Setup webhook")
 		if err := (&vectorizedv1alpha1.Cluster{}).SetupWebhookWithManager(mgr); err != nil {
-			log.Error(ctx, err, "Unable to create webhook", "webhook", "RedpandaCluster")
+			log.Error(err, "Unable to create webhook", "webhook", "RedpandaCluster")
 			return err
 		}
 	}
@@ -626,7 +627,7 @@ func setupVectorizedControllers(ctx context.Context, mgr ctrl.Manager, factory i
 		)
 
 		if err := d.SetupWithManager(mgr); err != nil {
-			log.Error(ctx, err, "unable to create controller", "controller", "StatefulSetDecommissioner")
+			log.Error(err, "unable to create controller", "controller", "StatefulSetDecommissioner")
 			return err
 		}
 	}

operator/cmd/supervisor/supervisor.go

@@ -19,9 +19,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/redpanda-data/common-go/otelutil/log"
 	"github.com/spf13/cobra"
 	"golang.org/x/time/rate"
+	//"github.com/redpanda-data/common-go/otelutil/log" bring back after https://github.com/redpanda-data/common-go/pull/160
+	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func Command() *cobra.Command {
@@ -51,6 +52,7 @@ The default retry parameters are tuned for a a long running process, such as the
 
 			ctx, cancel := signal.NotifyContext(cmd.Context(), os.Interrupt, syscall.SIGTERM)
 			defer cancel()
+			log := log.FromContext(ctx)
 
 			limiter := rate.NewLimiter(rate.Every(retryRate), retryBurst)
 			runner := Runner{
@@ -80,13 +82,13 @@ The default retry parameters are tuned for a a long running process, such as the
 				delay := reservation.Delay()
 
 				if delay > 0 {
-					log.Info(ctx, "backing off retries", "delay", delay.String())
+					log.Info( "backing off retries", "delay", delay.String())
 				}
 
 				// Otherwise wait until we have a retry "credit" available.
 				select {
 				case <-ctx.Done():
-					log.Info(ctx, "shutting down")
+					log.Info( "shutting down")
 					return
 
 				case <-time.After(reservation.Delay()):
@@ -117,7 +119,8 @@ type Runner struct {
 func (r *Runner) Run(
 	ctx context.Context,
 ) (cont bool) {
-	log.Info(ctx, "starting process", "command", r.Command)
+	log := log.FromContext(ctx)
+	log.Info("starting process", "command", r.Command)
 
 	//nolint:gosec // This is running with a users permissions, nothing to exploit here.
 	subprocess := exec.Command(r.Command[0], r.Command[1:]...)
@@ -127,7 +130,7 @@ func (r *Runner) Run(
 	subprocess.Stdout = r.Stdout
 
 	if err := subprocess.Start(); err != nil {
-		log.Error(ctx, err, "failed to start process", "command", r.Command)
+		log.Error(err, "failed to start process", "command", r.Command)
 		// If we fail to startup the provided process, don't continue to retry
 		// as it's exceptionally unlikely this type of issue will resolve
 		// itself.
@@ -142,19 +145,19 @@ func (r *Runner) Run(
 	for {
 		select {
 		case err := <-doneCh:
-			log.Error(ctx, err, "process exited")
+			log.Error(err, "process exited")
 			return true // Continue to re-run on any process crashes.
 
 		case sig := <-r.Signals:
 			// Forward signals onto our child process.
-			log.Info(ctx, "forwarding signal", "signal", sig)
+			log.Info("forwarding signal", "signal", sig)
 			if err := subprocess.Process.Signal(sig); err != nil {
-				log.Error(ctx, err, "failed to forward signal to subprocess", "signal", sig)
+				log.Error(err, "failed to forward signal to subprocess", "signal", sig)
 			}
 			continue
 
 		case <-ctx.Done():
-			log.Info(ctx, "terminating process")
+			log.Info("terminating process")
 
 			// Initiate the shutdown process by sending SIGTERM to match
 			// Kubernetes' behavior[1] (in most cases).
@@ -167,10 +170,10 @@ func (r *Runner) Run(
 			// before KILL'ing it.
 			select {
 			case <-doneCh:
-				log.Info(ctx, "process gracefully terminated")
+				log.Info("process gracefully terminated")
 			case <-time.After(r.GracePeriod):
 				_ = subprocess.Process.Kill()
-				log.Info(ctx, "process killed")
+				log.Info("process killed")
 			}
 
 			// If the context has been cancelled, don't continue the loop.

operator/cmd/syncclusterconfig/superusers.go

@@ -17,7 +17,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/redpanda-data/common-go/otelutil/log"
+	//"github.com/redpanda-data/common-go/otelutil/log" bring back after https://github.com/redpanda-data/common-go/pull/160
+	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 // NormalizeSuperusers de-duplicates and sorts the superusers

operator/internal/controller/console/controller.go

@@ -22,7 +22,6 @@ import (
 	"github.com/imdario/mergo"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"github.com/redpanda-data/common-go/kube"
-	"github.com/redpanda-data/common-go/otelutil/log"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -32,6 +31,8 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	//"github.com/redpanda-data/common-go/otelutil/log" bring back after https://github.com/redpanda-data/common-go/pull/160
+	"sigs.k8s.io/controller-runtime/pkg/log"
 	mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
 	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
 
@@ -134,7 +135,7 @@ func (c *Controller) Reconcile(ctx context.Context, req mcreconcile.Request) (ct
 	// so we don't NEED to use a finalizer. It's here to prevent accidents if
 	// we need cluster scoped resources one day.
 	if !cr.DeletionTimestamp.IsZero() {
-		log.Info(ctx, "GC'ing Console", "key", kube.AsKey(cr))
+		log.FromContext(ctx).Info("GC'ing Console", "key", kube.AsKey(cr))
 
 		if controllerutil.RemoveFinalizer(cr, finalizerKey) {
 			if _, err := syncer.DeleteAll(ctx); err != nil {
@@ -160,7 +161,7 @@ func (c *Controller) Reconcile(ctx context.Context, req mcreconcile.Request) (ct
 		return ctrl.Result{}, nil
 	}
 
-	log.Info(ctx, "reconciling Console", "key", kube.AsKey(cr))
+	log.FromContext(ctx).Info("reconciling Console", "key", kube.AsKey(cr))
 
 	// Add the finalizer, if not present.
 	if controllerutil.AddFinalizer(cr, finalizerKey) {
@@ -342,7 +343,7 @@ func (c *Controller) skipServiceMonitorWatchIfNotInstalled(ctx context.Context)
 	if errors.Is(err, &meta.NoKindMatchError{}) {
 		return true
 	} else if err != nil {
-		log.Error(ctx, err, "could not list ServiceMonitors")
+		log.FromContext(ctx).Error(err, "could not list ServiceMonitors")
 		return true
 	}
 	return false

operator/internal/controller/redpanda/log_test.go

@@ -0,0 +1,26 @@
+package redpanda
+
+import (
+	"log/slog"
+	"testing"
+
+	"github.com/redpanda-data/common-go/otelutil/log"
+	// Remove controller-runtime logger after https://github.com/redpanda-data/common-go/pull/160
+	controllerlog "sigs.k8s.io/controller-runtime/pkg/log"
+)
+
+func TestLogger(t *testing.T) {
+	log.FromContext(t.Context()).Info("test from otelutil")
+	controllerlog.FromContext(t.Context()).Info("test from controller")
+
+	log.FromContext(t.Context()).V(log.VerboseLevel).Info("test from verbose in otelutil")
+	log.FromContext(t.Context()).V(log.TimingLevel).Info("test from timing in otelutil")
+	log.FromContext(t.Context()).V(log.TraceLevel).Info("test from trace in otelutil")
+	log.FromContext(t.Context()).V(log.DebugLevel).Info("test from debug in otelutil")
+	log.FromContext(t.Context()).V(log.InfoLevel).Info("test from info in otelutil")
+
+	controllerlog.FromContext(t.Context()).V(int(slog.LevelError)).Info("test from error in otelutil")
+	controllerlog.FromContext(t.Context()).V(int(slog.LevelWarn)).Info("test from warn in otelutil")
+	controllerlog.FromContext(t.Context()).V(int(slog.LevelInfo)).Info("test from info in otelutil")
+	controllerlog.FromContext(t.Context()).V(int(slog.LevelDebug)).Info("test from debug in otelutil")
+}

operator/internal/controller/redpanda/multicluster_controller.go

@@ -32,6 +32,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/cluster"
 	ctrlcontroller "sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	controllerlog "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
 	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
@@ -82,7 +83,7 @@ type stretchClusterReconciliationFn func(ctx context.Context, state *stretchClus
 
 func (r *MulticlusterReconciler) Reconcile(ctx context.Context, req mcreconcile.Request) (result ctrl.Result, err error) {
 	start := time.Now()
-	l := log.FromContext(ctx).WithName("MulticlusterReconciler.Reconcile")
+	l := controllerlog.FromContext(ctx).WithName("MulticlusterReconciler.Reconcile")
 
 	l.V(1).Info("Starting reconcile loop")
 	defer func() {
@@ -228,7 +229,7 @@ func (r *MulticlusterReconciler) Reconcile(ctx context.Context, req mcreconcile.
 // persists the status, and returns drifted=true so the caller can abort reconciliation.
 // When specs are aligned it sets SpecSynced=True.
 func (r *MulticlusterReconciler) checkSpecConsistency(ctx context.Context, state *stretchClusterReconciliationState, sc *redpandav1alpha2.StretchCluster) (drifted bool, _ ctrl.Result, _ error) {
-	l := log.FromContext(ctx).WithName("checkSpecConsistency")
+	l := controllerlog.FromContext(ctx).WithName("checkSpecConsistency")
 
 	localSpec := sc.Spec
 	var driftDetails []string
@@ -285,7 +286,7 @@ func specDiffFields(a, b redpandav1alpha2.StretchClusterSpec) []string {
 }
 
 func (r *MulticlusterReconciler) fetchInitialState(ctx context.Context, sc *redpandav1alpha2.StretchCluster) (*stretchClusterReconciliationState, error) {
-	logger := log.FromContext(ctx)
+	logger := controllerlog.FromContext(ctx)
 	logger.V(log.DebugLevel).Info("fetchInitialState")
 
 	sccluster := lifecycle.NewStretchClusterWithPools(sc, r.Manager.GetClusterNames())
@@ -343,7 +344,7 @@ func bootstrapSecretName(sc *redpandav1alpha2.StretchCluster) string {
 
 func (r *MulticlusterReconciler) syncBootstrapUser(ctx context.Context, state *stretchClusterReconciliationState, _ cluster.Cluster) (_ ctrl.Result, err error) {
 	ctx, span := trace.Start(ctx, "syncBootstrapUser")
-	logger := log.FromContext(ctx)
+	logger := controllerlog.FromContext(ctx)
 
 	defer func() {
 		if err != nil {
@@ -454,7 +455,7 @@ func (r *MulticlusterReconciler) syncBootstrapUser(ctx context.Context, state *s
 
 func (r *MulticlusterReconciler) reconcileResources(ctx context.Context, state *stretchClusterReconciliationState, cluster cluster.Cluster) (_ ctrl.Result, err error) {
 	ctx, span := trace.Start(ctx, "reconcileResources")
-	logger := log.FromContext(ctx)
+	logger := controllerlog.FromContext(ctx)
 
 	defer func() {
 		if err != nil {
@@ -477,7 +478,7 @@ func (r *MulticlusterReconciler) reconcileResources(ctx context.Context, state *
 
 func (r *MulticlusterReconciler) reconcilePools(ctx context.Context, state *stretchClusterReconciliationState, cluster cluster.Cluster) (_ ctrl.Result, err error) {
 	ctx, span := trace.Start(ctx, "reconcilePools")
-	logger := log.FromContext(ctx)
+	logger := controllerlog.FromContext(ctx)
 
 	defer func() {
 		if err != nil {
@@ -542,7 +543,7 @@ func (r *MulticlusterReconciler) initAdminClient(ctx context.Context, state *str
 		return ctrl.Result{}, nil
 	}
 
-	logger := log.FromContext(ctx)
+	logger := controllerlog.FromContext(ctx)
 	adminAPIEndpoints := r.LifecycleClient.GetAdminAPIEndpoints(state.cluster)
 	if len(adminAPIEndpoints) == 0 {
 		return ctrl.Result{}, fmt.Errorf("no admin API endpoints found for cluster %s", state.cluster.Name)
@@ -561,7 +562,7 @@ func (r *MulticlusterReconciler) reconcileDecommission(ctx context.Context, stat
 	var health rpadmin.ClusterHealthOverview
 
 	ctx, span := trace.Start(ctx, "reconcileDecommission")
-	logger := log.FromContext(ctx)
+	logger := controllerlog.FromContext(ctx)
 
 	defer func() {
 		if err != nil {
@@ -683,7 +684,7 @@ func (r *MulticlusterReconciler) reconcileLicense(ctx context.Context, state *st
 	var license *redpandav1alpha2.RedpandaLicenseStatus
 
 	ctx, span := trace.Start(ctx, "reconcileLicense")
-	logger := log.FromContext(ctx)
+	logger := controllerlog.FromContext(ctx)
 
 	defer func() {
 		if err != nil {
@@ -775,7 +776,7 @@ func (r *MulticlusterReconciler) reconcileLicense(ctx context.Context, state *st
 
 func (r *MulticlusterReconciler) reconcileClusterConfig(ctx context.Context, state *stretchClusterReconciliationState, cluster cluster.Cluster) (_ reconcile.Result, err error) {
 	ctx, span := trace.Start(ctx, "reconcileClusterConfig")
-	logger := log.FromContext(ctx)
+	logger := controllerlog.FromContext(ctx)
 
 	defer func() {
 		if err != nil {
@@ -816,7 +817,7 @@ func (r *MulticlusterReconciler) reconcileClusterConfig(ctx context.Context, sta
 func (r *MulticlusterReconciler) syncStatus(ctx context.Context, cluster cluster.Cluster, state *stretchClusterReconciliationState, result ctrl.Result, err error) (ctrl.Result, error) {
 	original := state.cluster.StretchCluster.Status.DeepCopy()
 	if r.LifecycleClient.SetClusterStatus(state.cluster, state.status) {
-		log.FromContext(ctx).V(log.TraceLevel).Info("setting cluster status from diff", "original", original, "new", state.cluster.StretchCluster.Status)
+		controllerlog.FromContext(ctx).V(log.TraceLevel).Info("setting cluster status from diff", "original", original, "new", state.cluster.StretchCluster.Status)
 		syncErr := cluster.GetClient().Status().Update(ctx, state.cluster.StretchCluster)
 		err = errors.Join(syncErr, err)
 	}
@@ -846,7 +847,7 @@ func (r *MulticlusterReconciler) fetchClusterHealth(ctx context.Context, admin *
 // decommissioning the broker with the last pod ordinal and then patching the statefulset with
 // a single less replica.
 func (r *MulticlusterReconciler) scaleDown(ctx context.Context, admin *rpadmin.AdminAPI, cluster *lifecycle.StretchClusterWithPools, set *lifecycle.ScaleDownSet, brokerMap map[string]int) (bool, error) {
-	logger := log.FromContext(ctx).WithName(fmt.Sprintf("MulticlusterReconciler[%T].scaleDown", *cluster))
+	logger := controllerlog.FromContext(ctx).WithName(fmt.Sprintf("MulticlusterReconciler[%T].scaleDown", *cluster))
 	logger.V(log.TraceLevel).Info("starting StatefulSet scale down", "StatefulSet", client.ObjectKeyFromObject(set.StatefulSet).String())
 
 	brokerID, ok := brokerMap[set.LastPod.GetName()]
@@ -879,7 +880,7 @@ func (r *MulticlusterReconciler) scaleDown(ctx context.Context, admin *rpadmin.A
 
 // decommissionBroker handles decommissioning a broker and waiting until it has finished decommissioning
 func (r *MulticlusterReconciler) decommissionBroker(ctx context.Context, admin *rpadmin.AdminAPI, cluster *lifecycle.StretchClusterWithPools, set *lifecycle.ScaleDownSet, brokerID int) (bool, error) {
-	logger := log.FromContext(ctx).WithName(fmt.Sprintf("MulticlusterReconciler[%T].decommissionBroker", *cluster))
+	logger := controllerlog.FromContext(ctx).WithName(fmt.Sprintf("MulticlusterReconciler[%T].decommissionBroker", *cluster))
 	logger.V(log.TraceLevel).Info("checking decommissioning status for pod", "Pod", client.ObjectKeyFromObject(set.LastPod).String())
 
 	decommissionStatus, err := admin.DecommissionBrokerStatus(ctx, brokerID)

operator/internal/controller/redpanda/multicluster_controller_test.go

@@ -18,7 +18,6 @@ import (
 	"time"
 
 	"github.com/redpanda-data/common-go/kube"
-	"github.com/redpanda-data/common-go/otelutil/log"
 	"github.com/redpanda-data/common-go/otelutil/trace"
 	"github.com/stretchr/testify/suite"
 	corev1 "k8s.io/api/core/v1"
@@ -28,6 +27,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	//"github.com/redpanda-data/common-go/otelutil/log" bring back after https://github.com/redpanda-data/common-go/pull/160
+	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	redpandav1alpha2 "github.com/redpanda-data/redpanda-operator/operator/api/redpanda/v1alpha2"
 	crds "github.com/redpanda-data/redpanda-operator/operator/config/crd/bases"