[1.18] log leak backport (#10545)

Co-authored-by: Yuval Kohavi <[email protected]>
solo-io · Jan 2, 2025 · 99e1ba7 · 99e1ba7
1 parent 2f59d4d
commit 99e1ba7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/changelog/v1.18.3/memleak.yaml b/changelog/v1.18.3/memleak.yaml
@@ -0,0 +1,5 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/solo-io/solo-projects/issues/7573
+    description: >-
+      Fix a memory leaking a log name.
diff --git a/projects/gloo/pkg/syncer/setup/setup_syncer.go b/projects/gloo/pkg/syncer/setup/setup_syncer.go
@@ -1375,15 +1375,15 @@ func runQueue(ctx context.Context, proxyReconcileQueue ggv2utils.AsyncQueue[gloo
 		// the proxy type key/value must stay in sync with the one defined in projects/gateway2/translator/gateway_translator.go
 		utils.ProxyTypeKey: utils.GatewayApiProxyValue,
 	}
+	ctx = contextutils.WithLogger(ctx, "proxyCache")
+	logger := contextutils.LoggerFrom(ctx)
+
 	proxyReconciler := gloov1.NewProxyReconciler(proxyClient, statusutils.NewNoOpStatusClient())
 	for {
 		proxyList, err := proxyReconcileQueue.Dequeue(ctx)
 		if err != nil {
 			return
 		}
-		ctx = contextutils.WithLogger(ctx, "proxyCache")
-		logger := contextutils.LoggerFrom(ctx)
-
 		// Proxy CR is located in the writeNamespace, which may be different from the originating Gateway CR
 		err = proxyReconciler.Reconcile(
 			writeNamespace,