Skip to content

Commit 51bb0a0

Browse files
clairecngclairecng
authored
[chaosplt 207] namespace tag gone (#936)
* [chaosplt] get rid of bad bad log tags * woops * Apply suggestions from code review
1 parent a6e33dc commit 51bb0a0

17 files changed

+75
-48
lines changed

‎api/v1beta1/disruption_cron_webhook.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"strings"
1313
"time"
1414

15+
cLog "github.com/DataDog/chaos-controller/log"
1516
"github.com/DataDog/chaos-controller/utils"
1617
"github.com/robfig/cron"
1718
"go.uber.org/zap"
@@ -71,7 +72,7 @@ var _ webhook.Defaulter = &DisruptionCron{}
7172
// Default implements webhook.Defaulter so a webhook will be registered for the type
7273
func (d *DisruptionCron) Default() {
7374
if d.Spec.DelayedStartTolerance.Duration() == 0 {
74-
logger.Infow(fmt.Sprintf("setting default delayedStartTolerance of %s in disruptionCron", defaultCronDelayedStartTolerance), "instance", d.Name, "namespace", d.Namespace)
75+
logger.Infow(fmt.Sprintf("setting default delayedStartTolerance of %s in disruptionCron", defaultCronDelayedStartTolerance), cLog.DisruptionCronNameKey, d.Name, cLog.DisruptionCronNamespaceKey, d.Namespace)
7576
d.Spec.DelayedStartTolerance = DisruptionDuration(defaultCronDelayedStartTolerance.String())
7677
}
7778
}
@@ -82,7 +83,7 @@ var _ webhook.Validator = &DisruptionCron{}
8283

8384
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
8485
func (d *DisruptionCron) ValidateCreate() (admission.Warnings, error) {
85-
log := disruptionCronWebhookLogger.With("disruptionCronName", d.Name, "disruptionCronNamespace", d.Namespace)
86+
log := disruptionCronWebhookLogger.With(cLog.DisruptionCronNameKey, d.Name, cLog.DisruptionCronNamespaceKey, d.Namespace)
8687

8788
log.Infow("validating created disruption cron", "spec", d.Spec)
8889

@@ -114,7 +115,7 @@ func (d *DisruptionCron) ValidateCreate() (admission.Warnings, error) {
114115
}
115116

116117
func (d *DisruptionCron) ValidateUpdate(oldObject runtime.Object) (admission.Warnings, error) {
117-
log := logger.With("disruptionCronName", d.Name, "disruptionCronNamespace", d.Namespace)
118+
log := logger.With(cLog.DisruptionCronNameKey, d.Name, cLog.DisruptionCronNamespaceKey, d.Namespace)
118119

119120
log.Infow("validating updated disruption cron", "spec", d.Spec)
120121

@@ -146,7 +147,7 @@ func (d *DisruptionCron) ValidateUpdate(oldObject runtime.Object) (admission.War
146147
}
147148

148149
func (d *DisruptionCron) ValidateDelete() (warnings admission.Warnings, err error) {
149-
log := disruptionCronWebhookLogger.With("disruptionCronName", d.Name, "disruptionCronNamespace", d.Namespace)
150+
log := disruptionCronWebhookLogger.With(cLog.DisruptionCronNameKey, d.Name, cLog.DisruptionCronNamespaceKey, d.Namespace)
150151

151152
log.Infow("validating deleted disruption cron", "spec", d.Spec)
152153

‎api/v1beta1/disruption_webhook.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/DataDog/chaos-controller/cloudservice"
1919
cloudtypes "github.com/DataDog/chaos-controller/cloudservice/types"
2020
"github.com/DataDog/chaos-controller/ddmark"
21+
cLog "github.com/DataDog/chaos-controller/log"
2122
"github.com/DataDog/chaos-controller/o11y/metrics"
2223
"github.com/DataDog/chaos-controller/o11y/tracer"
2324
chaostypes "github.com/DataDog/chaos-controller/types"
@@ -121,7 +122,7 @@ var _ webhook.Validator = &Disruption{}
121122

122123
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
123124
func (r *Disruption) ValidateCreate() (admission.Warnings, error) {
124-
log := logger.With("disruptionName", r.Name, "disruptionNamespace", r.Namespace)
125+
log := logger.With(cLog.DisruptionNameKey, r.Name, cLog.DisruptionNamespaceKey, r.Namespace)
125126

126127
ctx, err := r.SpanContext(context.Background())
127128
if err != nil {
@@ -274,7 +275,7 @@ func (r *Disruption) ValidateCreate() (admission.Warnings, error) {
274275

275276
// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
276277
func (r *Disruption) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
277-
log := logger.With("disruptionName", r.Name, "disruptionNamespace", r.Namespace)
278+
log := logger.With(cLog.DisruptionNameKey, r.Name, cLog.DisruptionNamespaceKey, r.Namespace)
278279
log.Debugw("validating updated disruption", "spec", r.Spec)
279280

280281
var err error
@@ -384,7 +385,7 @@ func (r *Disruption) getMetricsTags() []string {
384385

385386
if userInfo, err := r.UserInfo(); !errors.Is(err, ErrNoUserInfo) {
386387
if err != nil {
387-
logger.Errorw("error retrieving user info from disruption, using empty user info", "error", err, "disruptionName", r.Name, "disruptionNamespace", r.Namespace)
388+
logger.Errorw("error retrieving user info from disruption, using empty user info", "error", err, cLog.DisruptionNameKey, r.Name, cLog.DisruptionNamespaceKey, r.Namespace)
388389
}
389390

390391
tags = append(tags, "username:"+userInfo.Username)
@@ -602,8 +603,8 @@ func safetyNetCountNotTooLarge(r *Disruption) (bool, string, error) {
602603
}
603604

604605
logger.Debugw("comparing estimated target count to total existing targets",
605-
"disruptionName", r.Name,
606-
"disruptionNamespace", r.Namespace,
606+
cLog.DisruptionNameKey, r.Name,
607+
cLog.DisruptionNamespaceKey, r.Namespace,
607608
"namespaceThreshold", namespaceThreshold,
608609
"clusterThreshold", clusterThreshold,
609610
"estimatedEligibleTargetsCount", targetCount,

‎cli/injector/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,14 @@ func initLogger() {
148148
}
149149

150150
log = log.With(
151-
"disruptionName", disruptionArgs.DisruptionName,
152-
"disruptionNamespace", disruptionArgs.DisruptionNamespace,
151+
logger.DisruptionNameKey, disruptionArgs.DisruptionName,
152+
logger.DisruptionNamespaceKey, disruptionArgs.DisruptionNamespace,
153153
"targetName", disruptionArgs.TargetName,
154154
"targetNodeName", disruptionArgs.TargetNodeName,
155155
)
156156

157157
if parentPID != 0 {
158-
log = log.With("parent_pid", parentPID)
158+
log = log.With("parentPid", parentPID)
159159
}
160160
}
161161

‎controllers/cron_rollout_helpers.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"time"
1313

1414
chaosv1beta1 "github.com/DataDog/chaos-controller/api/v1beta1"
15+
cLog "github.com/DataDog/chaos-controller/log"
1516
"go.uber.org/zap"
1617
appsv1 "k8s.io/api/apps/v1"
1718
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -163,7 +164,7 @@ func CreateDisruptionFromTemplate(ctx context.Context, cl client.Client, scheme
163164
disruption.Labels[ownerNameLabel] = owner.GetName()
164165

165166
if err := setDisruptionAnnotations(disruption, owner, scheduledTime); err != nil {
166-
log.Errorw("unable to set annotations for child disruption", "err", err, "disruptionName", disruption.Name)
167+
log.Errorw("unable to set annotations for child disruption", "err", err, cLog.DisruptionNameKey, disruption.Name)
167168
}
168169

169170
if err := overwriteDisruptionSelectors(ctx, cl, disruption, targetResource, owner.GetNamespace()); err != nil {
@@ -181,7 +182,7 @@ func CreateDisruptionFromTemplate(ctx context.Context, cl client.Client, scheme
181182
func getScheduledTimeForDisruption(log *zap.SugaredLogger, disruption *chaosv1beta1.Disruption) time.Time {
182183
parsedTime, err := disruption.GetScheduledAtAnnotation()
183184
if err != nil {
184-
log.Errorw("unable to parse schedule time for child disruption", "err", err, "disruptionName", disruption.Name)
185+
log.Errorw("unable to parse schedule time for child disruption", "err", err, cLog.DisruptionNameKey, disruption.Name)
185186
return time.Time{}
186187
}
187188

‎controllers/disruption_controller.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626

2727
chaosv1beta1 "github.com/DataDog/chaos-controller/api/v1beta1"
2828
"github.com/DataDog/chaos-controller/cloudservice"
29+
cLog "github.com/DataDog/chaos-controller/log"
2930
"github.com/DataDog/chaos-controller/o11y/metrics"
3031
"github.com/DataDog/chaos-controller/o11y/tracer"
3132
"github.com/DataDog/chaos-controller/safemode"
@@ -96,7 +97,7 @@ func (r *DisruptionReconciler) Reconcile(ctx context.Context, req ctrl.Request)
9697
// because the logger instance is pointer, concurrent reconciling would create a race condition
9798
// where the logger context would change for all ongoing reconcile loops
9899
// in the case we enable concurrent reconciling, we should create one logger instance per reconciling call
99-
r.log = r.BaseLog.With("disruptionName", req.Name, "disruptionNamespace", req.Namespace)
100+
r.log = r.BaseLog.With(cLog.DisruptionNameKey, req.Name, cLog.DisruptionNamespaceKey, req.Namespace)
100101

101102
// reconcile metrics
102103
r.handleMetricSinkError(r.MetricsSink.MetricReconcile())

‎controllers/disruption_cron_controller.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"time"
1212

1313
chaosv1beta1 "github.com/DataDog/chaos-controller/api/v1beta1"
14+
cLog "github.com/DataDog/chaos-controller/log"
1415
"github.com/DataDog/chaos-controller/o11y/metrics"
1516
chaostypes "github.com/DataDog/chaos-controller/types"
1617

@@ -35,7 +36,7 @@ type DisruptionCronReconciler struct {
3536
}
3637

3738
func (r *DisruptionCronReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, err error) {
38-
r.log = r.BaseLog.With("disruptionCronNamespace", req.Namespace, "disruptionCronName", req.Name)
39+
r.log = r.BaseLog.With(cLog.DisruptionCronNamespaceKey, req.Namespace, cLog.DisruptionCronNameKey, req.Name)
3940
r.log.Info("Reconciling DisruptionCron")
4041

4142
// reconcile metrics
@@ -192,7 +193,7 @@ func (r *DisruptionCronReconciler) Reconcile(ctx context.Context, req ctrl.Reque
192193

193194
r.handleMetricSinkError(r.MetricsSink.MetricDisruptionScheduled(append(DisruptionCronTags, "disruptionName:"+disruption.Name)))
194195

195-
r.log.Infow("created Disruption for DisruptionCron run", "disruptionName", disruption.Name)
196+
r.log.Infow("created Disruption for DisruptionCron run", cLog.DisruptionNameKey, disruption.Name)
196197

197198
// ------------------------------------------------------------------ //
198199
// If this process restarts at this point (after posting a disruption, but

‎controllers/disruption_rollout_controller.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"math/rand"
1111
"time"
1212

13+
cLog "github.com/DataDog/chaos-controller/log"
1314
"github.com/DataDog/chaos-controller/o11y/metrics"
1415

1516
chaosv1beta1 "github.com/DataDog/chaos-controller/api/v1beta1"
@@ -150,7 +151,7 @@ func (r *DisruptionRolloutReconciler) Reconcile(ctx context.Context, req ctrl.Re
150151

151152
r.handleMetricSinkError(r.MetricsSink.MetricDisruptionScheduled(append(DisruptionRolloutTags, "disruptionName:"+disruption.Name)))
152153

153-
r.log.Infow("created Disruption for DisruptionRollout run", "disruptionName", disruption.Name)
154+
r.log.Infow("created Disruption for DisruptionRollout run", cLog.DisruptionNameKey, disruption.Name)
154155

155156
// ------------------------------------------------------------------ //
156157
// If this process restarts at this point (after posting a disruption, but

‎eventnotifier/datadog/datadog.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/DataDog/chaos-controller/api/v1beta1"
1313
"github.com/DataDog/chaos-controller/eventnotifier/types"
1414
"github.com/DataDog/chaos-controller/eventnotifier/utils"
15+
cLog "github.com/DataDog/chaos-controller/log"
1516
"github.com/DataDog/datadog-go/statsd"
1617
"go.uber.org/zap"
1718
corev1 "k8s.io/api/core/v1"
@@ -74,7 +75,7 @@ func (n *Notifier) Notify(obj client.Object, event corev1.Event, notifType types
7475
}
7576

7677
func (n *Notifier) notifyDisruption(d *v1beta1.Disruption, event corev1.Event, notifType types.NotificationType) error {
77-
n.logger.With("disruptionName", d.Name)
78+
n.logger.With(cLog.DisruptionNameKey, d.Name, cLog.DisruptionNamespaceKey, d.Namespace)
7879

7980
eventType := n.getEventAlertType(notifType)
8081

@@ -86,7 +87,7 @@ func (n *Notifier) notifyDisruption(d *v1beta1.Disruption, event corev1.Event, n
8687
}
8788

8889
func (n *Notifier) notifyDisruptionCron(d *v1beta1.DisruptionCron, event corev1.Event, notifType types.NotificationType) error {
89-
n.logger.With("disruptionCronName", d.Name, "disruptionCronNamespace", d.Namespace)
90+
n.logger.With(cLog.DisruptionCronNameKey, d.Name, cLog.DisruptionCronNamespaceKey, d.Namespace)
9091

9192
eventType := n.getEventAlertType(notifType)
9293

‎eventnotifier/http/http.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"github.com/DataDog/chaos-controller/api/v1beta1"
2222
"github.com/DataDog/chaos-controller/eventnotifier/types"
2323
"github.com/DataDog/chaos-controller/eventnotifier/utils"
24+
cLog "github.com/DataDog/chaos-controller/log"
2425
"github.com/DataDog/jsonapi"
2526
"go.uber.org/zap"
2627
authv1 "k8s.io/api/authentication/v1"
@@ -248,7 +249,7 @@ func (n *Notifier) marshalUserGroups(groups []string) (string, error) {
248249
func (n *Notifier) notifyDisruption(dis v1beta1.Disruption, event corev1.Event, notifType types.NotificationType) error {
249250
logger := n.logger
250251

251-
logger.With("disruptionName", dis.Name, "disruptionNamespace", dis.Namespace)
252+
logger.With(cLog.DisruptionNameKey, dis.Name, cLog.DisruptionNamespaceKey, dis.Namespace)
252253

253254
if !n.disruptionConfig.Enabled {
254255
return nil
@@ -292,7 +293,7 @@ func (n *Notifier) notifyDisruption(dis v1beta1.Disruption, event corev1.Event,
292293
func (n *Notifier) notifyDisruptionCron(disruptionCron v1beta1.DisruptionCron, event corev1.Event, notifType types.NotificationType) error {
293294
logger := n.logger
294295

295-
logger.With("disruptionCronName", disruptionCron.Name, "disruptionCronNamespace", disruptionCron.Namespace)
296+
logger.With(cLog.DisruptionCronNameKey, disruptionCron.Name, cLog.DisruptionCronNamespaceKey, disruptionCron.Namespace)
296297

297298
if !n.disruptionCronConfig.Enabled {
298299
return nil

‎eventnotifier/slack/slack.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"github.com/DataDog/chaos-controller/api/v1beta1"
1818
"github.com/DataDog/chaos-controller/eventnotifier/types"
1919
"github.com/DataDog/chaos-controller/eventnotifier/utils"
20+
cLog "github.com/DataDog/chaos-controller/log"
2021
"github.com/slack-go/slack"
2122
"go.uber.org/zap"
2223
authv1 "k8s.io/api/authentication/v1"
@@ -120,7 +121,7 @@ func (n *Notifier) Notify(obj client.Object, event corev1.Event, notifType types
120121
}
121122

122123
func (n *Notifier) notifyForDisruption(dis *v1beta1.Disruption, event corev1.Event, notifType types.NotificationType) error {
123-
logger := n.logger.With("disruptionName", dis.Name, "disruptionNamespace", dis.Namespace, "eventType", event.Type)
124+
logger := n.logger.With(cLog.DisruptionNameKey, dis.Name, cLog.DisruptionNamespaceKey, dis.Namespace, "eventType", event.Type)
124125

125126
slackMsg := n.buildSlackMessage(dis, event, notifType, dis.Spec.Reporting, logger)
126127

@@ -153,7 +154,7 @@ func (n *Notifier) notifyForDisruption(dis *v1beta1.Disruption, event corev1.Eve
153154
}
154155

155156
func (n *Notifier) notifyForDisruptionCron(disruptionCron *v1beta1.DisruptionCron, event corev1.Event, notifType types.NotificationType) error {
156-
logger := n.logger.With("disruptionCronName", disruptionCron.Name, "disruptionCronNamespace", disruptionCron.Namespace, "eventType", event.Type)
157+
logger := n.logger.With(cLog.DisruptionCronNameKey, disruptionCron.Name, cLog.DisruptionCronNamespaceKey, disruptionCron.Namespace, "eventType", event.Type)
157158

158159
slackMsg := n.buildSlackMessage(disruptionCron, event, notifType, disruptionCron.Spec.Reporting, logger)
159160

‎log/log.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,19 @@ import (
1212
"go.uber.org/zap/zapcore"
1313
)
1414

15+
// logger's keys
16+
const (
17+
// Disruption
18+
DisruptionPrefixKey = "disruption"
19+
DisruptionNameKey = DisruptionPrefixKey + "Name"
20+
DisruptionNamespaceKey = DisruptionPrefixKey + "Namespace"
21+
22+
// DisruptionCron
23+
DisruptionCronPrefixKey = "disruptionCron"
24+
DisruptionCronNameKey = DisruptionCronPrefixKey + "Name"
25+
DisruptionCronNamespaceKey = DisruptionCronPrefixKey + "Namespace"
26+
)
27+
1528
// NewZapLogger returns a zap production sugared logger with pre-configured encoder settings
1629
func NewZapLogger() (*zap.SugaredLogger, error) {
1730
// configure logger

‎watchers/chaos_pod_handler.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"fmt"
1010

1111
chaosv1beta1 "github.com/DataDog/chaos-controller/api/v1beta1"
12+
cLog "github.com/DataDog/chaos-controller/log"
1213
"go.uber.org/zap"
1314
corev1 "k8s.io/api/core/v1"
1415
"k8s.io/client-go/tools/record"
@@ -98,8 +99,8 @@ func (w ChaosPodHandler) sendEvent(newPod *corev1.Pod) {
9899
w.log.Debugw("ChaosPodHandler UPDATE - Send event",
99100
"eventMessage", eventMessage,
100101
"eventType", eventType,
101-
"disruptionName", w.disruption.Name,
102-
"disruptionNamespace", w.disruption.Namespace,
102+
cLog.DisruptionNameKey, w.disruption.Name,
103+
cLog.DisruptionNamespaceKey, w.disruption.Namespace,
103104
"chaosPodName", newPod.Name,
104105
)
105106
}

‎watchers/disruptions_watchers_manager.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"fmt"
1111

1212
"github.com/DataDog/chaos-controller/api/v1beta1"
13+
cLog "github.com/DataDog/chaos-controller/log"
1314
"go.uber.org/zap"
1415
"k8s.io/apimachinery/pkg/types"
1516
k8scontrollercache "sigs.k8s.io/controller-runtime/pkg/cache"
@@ -99,7 +100,7 @@ func (d disruptionsWatchersManager) CreateAllWatchers(disruption *v1beta1.Disrup
99100
return err
100101
}
101102

102-
d.log.Debugw("Watcher created", "watcherName", watcherName, "disruptionName", disruption.Name, "disruptionNamespace", disruption.Namespace)
103+
d.log.Debugw("Watcher created", "watcherName", watcherName, cLog.DisruptionNameKey, disruption.Name, cLog.DisruptionNamespaceKey, disruption.Namespace)
103104
}
104105

105106
return nil
@@ -114,7 +115,7 @@ func (d disruptionsWatchersManager) RemoveAllWatchers(disruption *v1beta1.Disrup
114115

115116
// If the Watcher Manager does not exist just do nothing.
116117
if watcherManager == nil {
117-
d.log.Debugw("could not remove all watchers", "disruptionName", disruption.Name, "disruptionNamespace", disruption.Namespace)
118+
d.log.Debugw("could not remove all watchers", cLog.DisruptionNameKey, disruption.Name, cLog.DisruptionNamespaceKey, disruption.Namespace)
118119
return
119120
}
120121

@@ -123,7 +124,7 @@ func (d disruptionsWatchersManager) RemoveAllWatchers(disruption *v1beta1.Disrup
123124
// Remove the Watcher Manager from the map.
124125
delete(d.watchersManagers, namespacedName)
125126

126-
d.log.Infow("all watchers have been removed", "disruptionName", disruption.Name, "disruptionNamespace", disruption.Namespace)
127+
d.log.Infow("all watchers have been removed", cLog.DisruptionNameKey, disruption.Name, cLog.DisruptionNamespaceKey, disruption.Namespace)
127128
}
128129

129130
// RemoveAllOrphanWatchers removes all Watchers associated with a none existing Disruption.
@@ -143,7 +144,7 @@ func (d disruptionsWatchersManager) RemoveAllOrphanWatchers() error {
143144
// Remove the watcher manager from the stored managers
144145
delete(d.watchersManagers, namespacedName)
145146

146-
d.log.Infow("all watchers have been removed", "disruptionName", namespacedName.Name, "disruptionNamespace", namespacedName.Namespace)
147+
d.log.Infow("all watchers have been removed", cLog.DisruptionNameKey, namespacedName.Name, cLog.DisruptionNamespaceKey, namespacedName.Namespace)
147148
}
148149
}
149150

@@ -206,12 +207,12 @@ func getDisruptionNamespacedName(disruption *v1beta1.Disruption) types.Namespace
206207
func (d disruptionsWatchersManager) getWatcherManager(disruptionNamespacedName types.NamespacedName) Manager {
207208
// If we have already created a watcher manager for this disruption, use it
208209
if cachedWatcherManager := d.watchersManagers[disruptionNamespacedName]; cachedWatcherManager != nil {
209-
d.log.Debugw("Load watcher manager from the cache", "disruptionName", disruptionNamespacedName.Name, "disruptionNamespace", disruptionNamespacedName.Namespace)
210+
d.log.Debugw("Load watcher manager from the cache", cLog.DisruptionNameKey, disruptionNamespacedName.Name, cLog.DisruptionNamespaceKey, disruptionNamespacedName.Namespace)
210211

211212
return cachedWatcherManager
212213
}
213214

214-
d.log.Debugw("Creating a new watcher manager", "disruptionName", disruptionNamespacedName.Name, "disruptionNamespace", disruptionNamespacedName.Namespace)
215+
d.log.Debugw("Creating a new watcher manager", cLog.DisruptionNameKey, disruptionNamespacedName.Name, cLog.DisruptionNamespaceKey, disruptionNamespacedName.Namespace)
215216

216217
// Otherwise, create a new watcher manager
217218
return NewManager(d.reader, d.controller)

0 commit comments

Comments
 (0)