refactor: convert IR map fields to slices to ensure deterministic Dee… by Junnygram · Pull Request #7953 · envoyproxy/gateway

Junnygram · 2026-01-14T10:44:04Z

refactor: convert IR map fields to slices to ensure deterministic DeepEqual

This PR refactors the Intermediate Representation (IR) to replacing map fields with slices of structs. This ensures consistent ordering of elements, which is critical for deterministic DeepEqual comparisons and preventing unnecessary xDS updates.

Key changes:

Replaced map[string]string with []MapEntry in IR structs.
Replaced map[string]CustomTag with []CustomTagMapEntry.
Decoupled TrafficFeatures.Telemetry from API types to enforce slice usage.
Updated gatewayapi translator to convert API maps to sorted IR slices.
Updated xds/translator to consume slice-based IR.
Updated test data inputs and regenerated output snapshots.

Fixes #7783.

netlify · 2026-01-14T10:44:10Z

✅ Deploy Preview for cerulean-figolla-1f9435 canceled.

Name	Link
🔨 Latest commit	`cccddb4`
🔍 Latest deploy log	https://app.netlify.com/projects/cerulean-figolla-1f9435/deploys/697ef9feb3484900084fd7bd

internal/ir/utils.go

arkodg · 2026-01-17T17:14:52Z

internal/ir/utils.go

+	for k, v := range m {
+		res = append(res, MapEntry{Key: k, Value: v})
+	}
+	slices.SortFunc(res, func(a, b MapEntry) int {


nit: can you check if this style

gateway/internal/gatewayapi/resource/resource.go

Line 225 in d0f72f6

sort.Slice(r.Gateways, func(i, j int) bool {

is faster ?

arkodg · 2026-01-17T17:20:09Z

thanks @Junnygram this is great !
added a minor comment to avoid cmp and use below style

sort.Slice(mySlice, func(i, j int) bool {
		return mySlice[i].Ky < mySlice[j].Key
	})

arkodg · 2026-01-25T20:07:39Z

hey @Junnygram can you rebase and also help fix the new map that was added for tracing, tia

arkodg

LGTM thanks

zirain · 2026-01-30T08:49:26Z

@Junnygram can you rebase with main branch?

arkodg · 2026-01-31T21:44:27Z

there's an issue with rebase, can you rebase properly and only push your changes

…pEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

… mismatch Signed-off-by: Junnygram <junnexclusive@gmail.com>

Use sort.Slice instead of slices.SortFunc and cmp.Compare. Fix undefined apisv1 in zz_generated.deepcopy.go. Signed-off-by: Junnygram <junnexclusive@gmail.com>

…-to-slice refactor Signed-off-by: Junnygram <junnexclusive@gmail.com>

arkodg · 2026-01-31T23:32:24Z

lint is failing

Signed-off-by: Junnygram <junnexclusive@gmail.com>

Junnygram · 2026-02-01T07:09:13Z

hi @arkodg I've addressed the linting issues by fixing the indentation in the YAML test data files. I also regenerated the test snapshots (make generate) to ensure they match the formatting changes. CI should be green now.

codecov · 2026-02-01T07:50:13Z

Codecov Report

❌ Patch coverage is 91.01124% with 8 lines in your changes missing coverage. Please review.
✅ Project coverage is 73.73%. Comparing base (c724a4f) to head (cccddb4).
⚠️ Report is 6 commits behind head on main.

Files with missing lines	Patch %	Lines
internal/xds/translator/tracing.go	55.55%	3 Missing and 1 partial ⚠️
internal/ir/utils.go	92.59%	1 Missing and 1 partial ⚠️
internal/xds/translator/accesslog.go	89.47%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #7953      +/-   ##
==========================================
+ Coverage   73.67%   73.73%   +0.05%     
==========================================
  Files         240      241       +1     
  Lines       36488    36546      +58     
==========================================
+ Hits        26884    26948      +64     
+ Misses       7699     7693       -6     
  Partials     1905     1905

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

envoyproxy#7953) * refactor: convert IR map fields to slices to ensure deterministic DeepEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>

* e2e: speed tracing tests (#8124) * e2e: speed tracing tests Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix(translator): allow single-label backends in host mode (#8123) Signed-off-by: Adrian Cole <adrian@tetrate.io> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * ci: release json report (#8107) Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix oidc flakiness (#8119) * fix oidc flakiness Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: skip_test_workflow doesn't exist (#8116) This also uses grouped redirects to satisfy shellcheck SC2129. Signed-off-by: Dylan M. Taylor <dylan@dylanmtaylor.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix e2e test panic (#8109) fix e2e test Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * chore: bump func-e to v1.4.0 (#8105) bump func-e to v1.4.0 Signed-off-by: Adrian Cole <adrian@tetrate.io> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: route idle timeout (#8058) * fix: route idle timeout Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> * address comments Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> * add test Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> --------- Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * docs: add Mirakl to adopters list (#8138) Signed-off-by: Thierry Wandja <thierry.wandja@mirakl.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * docs: add security warning to control plane extensions (#7967) chore(docs): add warnings about control plane extensions Signed-off-by: Guy Daich <guy.daich@sap.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * chore: add lint for release notes filenames (#8137) * chore: add lint for release notes filenames Signed-off-by: zirain <zirain2009@gmail.com> * remove 1.7.0 Signed-off-by: zirain <zirain2009@gmail.com> * fix lint Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: remove global logger in message package (#8131) * fix: remove global logger in message package Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * docs: fix url result of regex rewrite (#7864) * Update http-urlrewrite.md Signed-off-by: Sadmi Bouhafs <sadmibouhafs@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * chore: log skipped xds (#8132) log skipped xds Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * docs: fixes for OPA sidecar + Unix Domain Socket task (#8142) Signed-off-by: Matt Miller <millermatt@outlook.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: basic auth validation (#8053) * fix basic auth validation Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: controller cache-sync readiness check (#7430) Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: replace context.TODO with timeout context in config dump (#8122) * fix: replace context.TODO with timeout context in config dump Uses context.WithTimeout instead of context.TODO() to enable proper cancellation and prevent indefinite hangs when Kubernetes API is slow or unavailable. Fixes #8121 Signed-off-by: jaffar <keikei.jaffar@mail.utoronto.ca> * Make config dump timeout configurable with 30s default - Add Timeout field to ConfigDump struct - Add DefaultConfigDumpTimeout constant (30s) - Add getTimeout() helper that returns configured timeout or default - Update Collect() to use cd.getTimeout() instead of hardcoded value Signed-off-by: jaffar <keikei.jaffar@mail.utoronto.ca> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * refactor: convert IR map fields to slices to ensure deterministic Dee… (#7953) * refactor: convert IR map fields to slices to ensure deterministic DeepEqual Addresses issue #7852. Signed-off-by: Junnygram <junnexclusive@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix links in releasing and develop docs (#8141) * fix links in releasing and develop docs Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * update quickstart link Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> --------- Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * docs: add provider guide for entra (#7977) * docs: add provider guide for entra Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * chore: clean up test output files (#8154) clean up test output files Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix: TCPRoute mTLS didn't work (#8152) * fix: remove auto HTTP config on TCP cluster Signed-off-by: zirain <zirain2009@gmail.com> * fix lint Signed-off-by: zirain <zirain2009@gmail.com> * add e2e Signed-off-by: zirain <zirain2009@gmail.com> * fix e2e Signed-off-by: zirain <zirain2009@gmail.com> * fix comment Signed-off-by: zirain <zirain2009@gmail.com> * fix Signed-off-by: zirain <zirain2009@gmail.com> * fix resource name Signed-off-by: zirain <zirain2009@gmail.com> * address Arko's comment Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * v1.7.0-rc2 release notes (#8163) * v1.7.0-rc2 release notes Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix the date Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> --------- Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> Signed-off-by: Adrian Cole <adrian@tetrate.io> Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Signed-off-by: Dylan M. Taylor <dylan@dylanmtaylor.com> Signed-off-by: Thierry Wandja <thierry.wandja@mirakl.com> Signed-off-by: Guy Daich <guy.daich@sap.com> Signed-off-by: Sadmi Bouhafs <sadmibouhafs@gmail.com> Signed-off-by: Matt Miller <millermatt@outlook.com> Signed-off-by: jaffar <keikei.jaffar@mail.utoronto.ca> Signed-off-by: Junnygram <junnexclusive@gmail.com> Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com> Co-authored-by: zirain <zirain2009@gmail.com> Co-authored-by: Adrian Cole <64215+codefromthecrypt@users.noreply.github.com> Co-authored-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com> Co-authored-by: Dylan M. Taylor <dylan@dylanmtaylor.com> Co-authored-by: Thierry Wandja <thierry.wandja@mirakl.com> Co-authored-by: Guy Daich <guy.daich@sap.com> Co-authored-by: Sadmi Bouhafs <sadmibouhafs@gmail.com> Co-authored-by: Matt Miller <millermatt@outlook.com> Co-authored-by: Isaac Wilson <10012479+jukie@users.noreply.github.com> Co-authored-by: jaffar keikei <keikei.jaffar@mail.utoronto.ca> Co-authored-by: Olaleye <90139191+Junnygram@users.noreply.github.com> Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>

envoyproxy#7953) * refactor: convert IR map fields to slices to ensure deterministic DeepEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

Junnygram requested a review from a team as a code owner January 14, 2026 10:44

Junnygram force-pushed the refactor/ir-map-to-slice branch 2 times, most recently from e1ab70a to e53faad Compare January 14, 2026 10:49

jukie requested changes Jan 16, 2026

View reviewed changes

internal/ir/utils.go Outdated Show resolved Hide resolved

Junnygram force-pushed the refactor/ir-map-to-slice branch 2 times, most recently from 71aa5ec to 8853dd2 Compare January 17, 2026 09:37

arkodg reviewed Jan 17, 2026

View reviewed changes

arkodg added this to the v1.7.0-rc.1 Release milestone Jan 17, 2026

arkodg mentioned this pull request Jan 17, 2026

fix: make IR map comparison deterministic in runner tests #7852

Closed

Junnygram force-pushed the refactor/ir-map-to-slice branch from e7e1913 to ce95e57 Compare January 25, 2026 20:53

arkodg previously approved these changes Jan 28, 2026

View reviewed changes

arkodg requested review from a team and jukie January 28, 2026 04:56

zirain force-pushed the refactor/ir-map-to-slice branch from 0b91684 to 6d2e822 Compare January 28, 2026 05:13

arkodg modified the milestones: v1.7.0-rc.1 Release, v1.7.0 Release Jan 29, 2026

zirain mentioned this pull request Jan 30, 2026

Convert IR maps into a Slice of Structs #7783

Closed

Junnygram dismissed arkodg’s stale review via f428b2d January 30, 2026 22:23

Junnygram force-pushed the refactor/ir-map-to-slice branch 2 times, most recently from 9dd6df3 to dde4a8f Compare January 30, 2026 23:19

zirain force-pushed the refactor/ir-map-to-slice branch from dde4a8f to 07d514b Compare January 31, 2026 02:01

zirain requested a review from arkodg January 31, 2026 02:01

Junnygram added 2 commits January 31, 2026 22:52

refactor: convert IR map fields to slices to ensure deterministic Dee…

51c4c56

…pEqual Addresses issue envoyproxy#7852. Signed-off-by: Junnygram <junnexclusive@gmail.com>

refactor: optimize map to slice conversion and resolve telemetry type…

11c8c23

… mismatch Signed-off-by: Junnygram <junnexclusive@gmail.com>

Junnygram added 2 commits January 31, 2026 22:52

refactor: apply review feedback

71010f1

Use sort.Slice instead of slices.SortFunc and cmp.Compare. Fix undefined apisv1 in zz_generated.deepcopy.go. Signed-off-by: Junnygram <junnexclusive@gmail.com>

chore: resolve merge conflicts and update translator logic for IR map…

81624bf

…-to-slice refactor Signed-off-by: Junnygram <junnexclusive@gmail.com>

Junnygram force-pushed the refactor/ir-map-to-slice branch from 0f193a7 to 81624bf Compare January 31, 2026 21:53

zirain previously approved these changes Jan 31, 2026

View reviewed changes

style: fix yaml lint errors in testdata

b0d33bf

Signed-off-by: Junnygram <junnexclusive@gmail.com>

Junnygram dismissed zirain’s stale review via b0d33bf February 1, 2026 01:03

zirain previously approved these changes Feb 1, 2026

View reviewed changes

chore: regenerate testdata

cccddb4

Signed-off-by: Junnygram <junnexclusive@gmail.com>

Junnygram dismissed zirain’s stale review via cccddb4 February 1, 2026 07:00

zirain approved these changes Feb 1, 2026

View reviewed changes

arkodg approved these changes Feb 1, 2026

View reviewed changes

arkodg merged commit c3f2982 into envoyproxy:main Feb 1, 2026
47 of 49 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: convert IR map fields to slices to ensure deterministic Dee…#7953

refactor: convert IR map fields to slices to ensure deterministic Dee…#7953
arkodg merged 6 commits intoenvoyproxy:mainfrom
Junnygram:refactor/ir-map-to-slice

Junnygram commented Jan 14, 2026 •

edited by zirain

Loading

Uh oh!

netlify bot commented Jan 14, 2026 •

edited

Loading

Uh oh!

Uh oh!

arkodg Jan 17, 2026

Uh oh!

arkodg commented Jan 17, 2026

Uh oh!

arkodg commented Jan 25, 2026

Uh oh!

arkodg left a comment

Uh oh!

zirain commented Jan 30, 2026

Uh oh!

arkodg commented Jan 31, 2026

Uh oh!

arkodg commented Jan 31, 2026

Uh oh!

Junnygram commented Feb 1, 2026

Uh oh!

codecov bot commented Feb 1, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

Junnygram commented Jan 14, 2026 • edited by zirain Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlify bot commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for cerulean-figolla-1f9435 canceled.

Uh oh!

Uh oh!

arkodg Jan 17, 2026

Choose a reason for hiding this comment

Uh oh!

arkodg commented Jan 17, 2026

Uh oh!

arkodg commented Jan 25, 2026

Uh oh!

arkodg left a comment

Choose a reason for hiding this comment

Uh oh!

zirain commented Jan 30, 2026

Uh oh!

arkodg commented Jan 31, 2026

Uh oh!

arkodg commented Jan 31, 2026

Uh oh!

Junnygram commented Feb 1, 2026

Uh oh!

codecov bot commented Feb 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Junnygram commented Jan 14, 2026 •

edited by zirain

Loading

netlify bot commented Jan 14, 2026 •

edited

Loading

codecov bot commented Feb 1, 2026 •

edited

Loading