From 17f44b45c7f18c4e27d16bb28ff7def9bf8883a5 Mon Sep 17 00:00:00 2001 From: Yutong Zhang Date: Fri, 29 May 2026 14:35:24 +0000 Subject: [PATCH 1/2] [test] Build with ComponentStats-based SwssStats (PR sonic-swss#4516 + sonic-swss-common#1180) Rebased onto fresh upstream master to drop conflicts. Submodule pins: * src/sonic-swss-common -> faccc77 (feature/component-stats, includes r12f/banidoru review fixes) * src/sonic-swss -> dd8ef32 (swss-stats-use-componentstats, includes r12f shared_ptr const fix and master merge) .gitmodules URLs are temporarily switched to fork mirrors so CI can resolve the non-upstream SHAs. Signed-off-by: Yutong Zhang Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .gitmodules | 6 ++++-- src/sonic-swss | 2 +- src/sonic-swss-common | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8e09ee538f4..85212600787 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "sonic-swss-common"] path = src/sonic-swss-common - url = https://github.com/sonic-net/sonic-swss-common + url = https://github.com/yutongzhang-microsoft/sonic-swss-common + branch = feature/component-stats [submodule "sonic-linux-kernel"] path = src/sonic-linux-kernel url = https://github.com/sonic-net/sonic-linux-kernel @@ -9,7 +10,8 @@ url = https://github.com/sonic-net/sonic-sairedis [submodule "sonic-swss"] path = src/sonic-swss - url = https://github.com/sonic-net/sonic-swss + url = https://github.com/yutongzhang-microsoft/sonic-swss + branch = swss-stats-use-componentstats [submodule "src/p4c-bm/p4c-bm"] path = platform/p4/p4c-bm/p4c-bm url = https://github.com/krambn/p4c-bm diff --git a/src/sonic-swss b/src/sonic-swss index dcd97c98264..dd8ef329e83 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit dcd97c98264a1c5d8b15cc6937e9928757c61d6c +Subproject commit dd8ef329e83e74d28d14a28ec05c81608f468425 diff --git a/src/sonic-swss-common b/src/sonic-swss-common index 56a5f2886f3..faccc777869 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit 56a5f2886f34a666094c408a017220815ecc9c86 +Subproject commit faccc77786943e23332ea51f699cbf74ac564454 From 899588fa5dd2fb1d99325b7f7d6e448132e18346 Mon Sep 17 00:00:00 2001 From: Yutong Zhang Date: Fri, 29 May 2026 15:19:48 +0000 Subject: [PATCH 2/2] [test] Bump sonic-swss-common to 4575804 (rebased onto upstream master) Rebase feature/component-stats onto upstream/master to pick up ZmqProducerBatchedSet/ZmqProducerBatchedDel SWIG bindings (PR #1188) required by sonic-gnmi master, fixing the build failure: sonic_data_client/mixed_db_client.go:315:13: undefined: swsscommon.ZmqProducerBatchedSet sonic_data_client/mixed_db_client.go:321:13: undefined: swsscommon.ZmqProducerBatchedDel Signed-off-by: Yutong Zhang --- src/sonic-swss-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss-common b/src/sonic-swss-common index faccc777869..45758043c90 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit faccc77786943e23332ea51f699cbf74ac564454 +Subproject commit 45758043c904381d205954dff935d52591ea57f7