From ad2747a99b0d367e49b18a3107662a896e521a87 Mon Sep 17 00:00:00 2001 From: Jason Ye Date: Fri, 2 Jan 2026 18:43:19 +0000 Subject: [PATCH 1/7] Kick CI Signed-off-by: Jason Ye From 19d6ae66157019b7264bc73d1659a4f6c50e8d44 Mon Sep 17 00:00:00 2001 From: Jason Ye Date: Fri, 2 Jan 2026 18:44:27 +0000 Subject: [PATCH 2/7] Kick CI Signed-off-by: Jason Ye From 4a161e8bc32c0190fc77194dced58187ff5a8052 Mon Sep 17 00:00:00 2001 From: Jason Ye Date: Fri, 2 Jan 2026 18:45:13 +0000 Subject: [PATCH 3/7] Kick CI Signed-off-by: Jason Ye From 40afb050abc5153065bf95403374a4bb4b055f12 Mon Sep 17 00:00:00 2001 From: Jason Ye Date: Sat, 28 Mar 2026 17:36:44 +0000 Subject: [PATCH 4/7] update NH to latest envoy Signed-off-by: Jason Ye --- bazel/repositories.bzl | 4 +- source/client/process_impl.cc | 5 ++- tools/base/requirements.txt | 70 +++++++++++++++++------------------ tools/code_format/config.yaml | 3 ++ 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index b125a2d5d..b4252fde2 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -1,7 +1,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -ENVOY_COMMIT = "07700f6c1b5f03be0a6ebc4f4efdbb308e314e79" -ENVOY_SHA = "1eb0b82f54a79f28578a5b92c5aa8eb49188022b5c25490448721e4b00e4d382" +ENVOY_COMMIT = "733ec202144a133caa11c8c240d05be4383dc538" +ENVOY_SHA = "425c45489df2ef278115ebb2b6f36a3564599fd97fc820e82486f8f135c64576" HDR_HISTOGRAM_C_VERSION = "0.11.8" # June 18th, 2025 HDR_HISTOGRAM_C_SHA = "bb95351a6a8b242dc9be1f28562761a84d4cf0a874ffc90a9b630770a6468e94" diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc index d0a596bb5..e5c864455 100644 --- a/source/client/process_impl.cc +++ b/source/client/process_impl.cc @@ -205,15 +205,16 @@ class NighthawkServerFactoryContext : public Envoy::Server::Configuration::Serve Envoy::Server::ServerLifecycleNotifier& lifecycleNotifier() override { return lifecycle_notifier_; } - +\ Envoy::Regex::Engine& regexEngine() override { return regex_engine_; } Envoy::Init::Manager& initManager() override { - PANIC("NighthawkServerFactoryContext::initManager not implemented"); + return server_.initManager(); }; Envoy::Grpc::Context& grpcContext() override { return server_.grpcContext(); }; + Envoy::Router::Context& routerContext() override { return server_.routerContext(); }; Envoy::ProcessContextOptRef processContext() override { diff --git a/tools/base/requirements.txt b/tools/base/requirements.txt index e4be325b2..dafa03058 100644 --- a/tools/base/requirements.txt +++ b/tools/base/requirements.txt @@ -18,39 +18,33 @@ certifi==2026.2.25 \ # via # -r tools/base/requirements.in # requests -chardet==7.3.0 \ - --hash=sha256:015f9d697f796a5bb0ac4d19e0108fd6cc84d141521089d0385d2a00c5f5d74e \ - --hash=sha256:04ef4b65c18afb298ac7c1326fbd83e1524250ceb7e61df67115a4a48e9e8e0e \ - --hash=sha256:23d264962f680deec691308cc753685b4c5a69798a26e00ce4f4cf96d2e43fcb \ - --hash=sha256:328a79efb197d6e9460ce33ebb8002a0bf85faa123d56aa1f75c21696ee70070 \ - --hash=sha256:340f4eccafa17cfc5a90af1fb8558dc791156f815f8d800d8ac2b1b9fb2b8103 \ - --hash=sha256:51a0ad2031bd10d24357d7e52de68abe29efb62b7aedf1bd9d1c593fd438cec5 \ - --hash=sha256:5276bc68736cf6d530ca2dc4ea1c2101d2b50015b09d48242615cc3818623574 \ - --hash=sha256:58388f412a76d1449c6ce4631edbd1b0087385ff00b6fb1f521879d8e8d99484 \ - --hash=sha256:5b58eb6d6dea67fc3b578dd956dd6e92aafea383aa559ccea55265554ff062a3 \ - --hash=sha256:5dbfbaef7de55aee008de9b886a63e60e916016507ed7845c9b7bfe1357f4f54 \ - --hash=sha256:5e912948f27c0124da8ce8fcd5ed8fe3b5e06fe8c0ecb66dd95180edf1122a6c \ - --hash=sha256:622206fdb0d274766559fa172e2d680d58cc5fc6a67015c21c36fec500e7bd50 \ - --hash=sha256:7193bcca96ffd87a7d6695056d3e875707b25eda588957756dd5c95d125fcb89 \ - --hash=sha256:7ccec08ee572dfd7a9486835ceba06ef88fa3e15deb1b76130b5ba6012fbb0c0 \ - --hash=sha256:7ed513fb0b35ebf663bd4f8be2d61af701202e98f77e6d8301d1a2c7d0f2985d \ - --hash=sha256:7f3758c122aebb411eac37452c5774c56a5500147e1c24af0d460cb0d748fb48 \ - --hash=sha256:80139a006a598e2db83fe6eaf7ac29c2a30cc5d10f255a89a9c6b9c04f81d67f \ - --hash=sha256:811029a7cf397ed32441aa134475f7047826fba496047a6afd7bba1da7fc4ab7 \ - --hash=sha256:8267de33ade8a496cb441eb86dd08c803043870a66b4f55aa44c02e1dbdbf93e \ - --hash=sha256:90a6249a455b8ecdb207a9f5a5eb46e1c21f2173eacb5e1603def61ed4784303 \ - --hash=sha256:920b91e9436c4d546862143313f48d4e6e0dd8510114ae0c5b194ff8c878a6c8 \ - --hash=sha256:963e6cac79e3a4fc51c8517b8df03b3467550dd00d53e775059dce6e2fc0d0ca \ - --hash=sha256:aab48b166f8aa8b086c93147ed6427376b8db2d783aff3f787c1c0819f6486bb \ - --hash=sha256:b69fd9685a7aada6e236a50bb93b51bd4fc08d29d1029492e64823a69c015f46 \ - --hash=sha256:c296044993dab62281176c07d0ca2b6e865044e38944d3f6e4ad661e222f4db8 \ - --hash=sha256:c88c464b5b65859984386c698b43ccfe88e96814f80433c2d5fdf40dc4b68bcb \ - --hash=sha256:dc4726af6ee00ee386293c34d86ba1fe18e0bd70a74612f1486da217d6a01249 \ - --hash=sha256:e464c2ec0be69ab6d5792c1acf354001b34e201efa2bee60ff4f7ded0e23f6a8 \ - --hash=sha256:e6bf602bb8a070524a19bac1cff2a10d62c71b09606f066251282870fa1466e5 \ - --hash=sha256:f4ea1f94f17fce29600e1661f773048ee9ed90a9300f1226018987f7d5961019 \ - --hash=sha256:fef009cdb37225b1f6259ddc18c3017cd1edddd85d57823f1c46c53503da41a1 \ - --hash=sha256:ff4d81f5561f2382343dc922e533c017d52bc55125e50551c18034fffcdbd0cb +chardet==7.4.0.post1 \ + --hash=sha256:069f4ff169142c45198b513702d7596b60944d3d8ebcfed2626e7716430e90e0 \ + --hash=sha256:0cbfa21c8526022a62d1ebd1799b6e2c3598779231c0397372b6e26a4b1f4d28 \ + --hash=sha256:2769be12361a6c7873392e435c708eca88c9f0fb6a647af75fa1386db64032d6 \ + --hash=sha256:329aa8766c4917d3acc1b1d0462f0b2e820e24e9f341d0f858aee85396ae3002 \ + --hash=sha256:45adca296eddec38b803ce352bffcc5fff40576246e74fcd2aa358f9c813ffe0 \ + --hash=sha256:554bc5058a1ef76cfdc278c4420daa58e1aa5e35d66d5886bc4bb85243409b2f \ + --hash=sha256:57a62ef50f69bc2fb3a3ea1ffffec6d10f3d2112d3b05d6e3cb15c2c9b55f6cc \ + --hash=sha256:5aec4e167de05470a3e2466a1ae751d7f0ad15510f63633fdd01a0405515df7a \ + --hash=sha256:6cddf6f1a0834ab5a6894819a6f4c3cd8c2cc86a12fc4efdc87eadb9ce7186ab \ + --hash=sha256:70af3a05ca9476461160474f1324612d04b885101216894e60266c8c16510084 \ + --hash=sha256:79c96d41ee63b098205d071caeee272968fe7a81a65151af2c02d1f51d2e2b4f \ + --hash=sha256:86d7ca798051fce39b980241f4e93a40e3ef1fb568e282afcdcdbf6efa56bada \ + --hash=sha256:8e1eaa942ae81d43d535092ff3ba660c967344178cc3876b54834a56c1207f3a \ + --hash=sha256:941af534a9b77d4b912e173e98680225340cf8827537e465bd6498b3e98d0cb8 \ + --hash=sha256:a2eb2b2ed1662e74bebcdcd8f3872fd23378605601065a94ca265040026a11b3 \ + --hash=sha256:aa1621ad7699a4ffbff131ed3d023883fca6bd6ad6f069b3b43bd4d1c5fece1d \ + --hash=sha256:ad98a6c2e61624b1120919353d222121b8f5848b9d33c885d949fe0235575682 \ + --hash=sha256:b10b913b50c8dab125497abb02c8ed76434e90ce8625af9fe45e9f81fd5df858 \ + --hash=sha256:c23262011179db48e600012e296133ab577d8e9682c91a19221164732ccb4427 \ + --hash=sha256:d4c682730cd5ea9b528299b826b9d7fca852fa85512de1b7ad3e84b77d68f6f7 \ + --hash=sha256:db07ed10259c0e93a55e3c285d2d78111b000e574aa4f94d89de53c72fb28127 \ + --hash=sha256:e6285d35f79d0cdc8838d3cb01876f979c8419a74662e8de39444e40639e0b2b \ + --hash=sha256:e801976901fb7bc48f13653a7ca78e81fa65fe615d0d33c9383385c73e571927 \ + --hash=sha256:efce0ddb6a3f92f52da0affe62b7c558e3641651fee982a04899509f3070ab4a \ + --hash=sha256:efdb3785c8700b3d0b354553827a166480a439f9754f7366f795bbe8b42d6daf \ + --hash=sha256:f03aef24d91168232db8b01e4d6726676708be503e6aa07e28ab808e6d0fe606 # via -r tools/base/requirements.in charset-normalizer==3.4.6 \ --hash=sha256:06a7e86163334edfc5d20fe104db92fcd666e5a5df0977cb5680a506fe26cc8e \ @@ -346,9 +340,9 @@ pyyaml==6.0.3 \ --hash=sha256:fa160448684b4e94d80416c0fa4aac48967a969efe22931448d853ada8baf926 \ --hash=sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0 # via -r tools/base/requirements.in -requests==2.32.5 \ - --hash=sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6 \ - --hash=sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf +requests==2.33.0 \ + --hash=sha256:3324635456fa185245e24865e810cecec7b4caf933d7eb133dcde67d48cee69b \ + --hash=sha256:c7ebc5e8b0f21837386ad0e1c8fe8b829fa5f544d8df3b2253bff14ef29d7652 # via -r tools/base/requirements.in six==1.17.0 \ --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \ @@ -368,7 +362,9 @@ yapf==0.43.0 \ --hash=sha256:00d3aa24bfedff9420b2e0d5d9f5ab6d9d4268e72afbf59bb3fa542781d5218e \ --hash=sha256:224faffbc39c428cb095818cf6ef5511fdab6f7430a10783fdfb292ccf2852ca # via -r tools/base/requirements.in -zipp==3.18.1 +zipp==3.23.0 \ + --hash=sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e \ + --hash=sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166 # via # -r tools/base/requirements.in # importlib-metadata diff --git a/tools/code_format/config.yaml b/tools/code_format/config.yaml index 54b62f335..78b3d071c 100644 --- a/tools/code_format/config.yaml +++ b/tools/code_format/config.yaml @@ -127,6 +127,7 @@ paths: - source/common/secret/sds_api.cc - source/exe/stripped_main_base.cc - source/common/http/header_utility.cc + - source/common/http/http_service_headers.cc - source/common/common/matchers.cc - source/server/options_impl.cc - source/server/config_validation/server.cc @@ -458,6 +459,7 @@ unsorted_flags: # https://github.com/envoyproxy/envoy/issues/9953 # PLEASE DO NOT ADD FILES TO THIS LIST WITHOUT SENIOR MAINTAINER APPROVAL visibility_excludes: +- source/extensions/access_loggers/open_telemetry/BUILD - source/extensions/clusters/eds/ - source/extensions/clusters/strict_dns/ - source/extensions/clusters/static/ @@ -468,6 +470,7 @@ visibility_excludes: - source/extensions/filters/http/buffer/BUILD - source/extensions/filters/network/common/BUILD - source/extensions/filters/network/generic_proxy/interface/BUILD +- source/extensions/formatter/file_content/BUILD - source/extensions/http/header_validators/envoy_default/BUILD - source/extensions/transport_sockets/common/BUILD - source/extensions/transport_sockets/tap/BUILD From ad72fbcb71be82ef97ba63b7da8c1761455981cb Mon Sep 17 00:00:00 2001 From: Jason Ye Date: Sat, 28 Mar 2026 18:19:25 +0000 Subject: [PATCH 5/7] revert requirements Signed-off-by: Jason Ye --- tools/base/requirements.txt | 70 ++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/tools/base/requirements.txt b/tools/base/requirements.txt index dafa03058..e4be325b2 100644 --- a/tools/base/requirements.txt +++ b/tools/base/requirements.txt @@ -18,33 +18,39 @@ certifi==2026.2.25 \ # via # -r tools/base/requirements.in # requests -chardet==7.4.0.post1 \ - --hash=sha256:069f4ff169142c45198b513702d7596b60944d3d8ebcfed2626e7716430e90e0 \ - --hash=sha256:0cbfa21c8526022a62d1ebd1799b6e2c3598779231c0397372b6e26a4b1f4d28 \ - --hash=sha256:2769be12361a6c7873392e435c708eca88c9f0fb6a647af75fa1386db64032d6 \ - --hash=sha256:329aa8766c4917d3acc1b1d0462f0b2e820e24e9f341d0f858aee85396ae3002 \ - --hash=sha256:45adca296eddec38b803ce352bffcc5fff40576246e74fcd2aa358f9c813ffe0 \ - --hash=sha256:554bc5058a1ef76cfdc278c4420daa58e1aa5e35d66d5886bc4bb85243409b2f \ - --hash=sha256:57a62ef50f69bc2fb3a3ea1ffffec6d10f3d2112d3b05d6e3cb15c2c9b55f6cc \ - --hash=sha256:5aec4e167de05470a3e2466a1ae751d7f0ad15510f63633fdd01a0405515df7a \ - --hash=sha256:6cddf6f1a0834ab5a6894819a6f4c3cd8c2cc86a12fc4efdc87eadb9ce7186ab \ - --hash=sha256:70af3a05ca9476461160474f1324612d04b885101216894e60266c8c16510084 \ - --hash=sha256:79c96d41ee63b098205d071caeee272968fe7a81a65151af2c02d1f51d2e2b4f \ - --hash=sha256:86d7ca798051fce39b980241f4e93a40e3ef1fb568e282afcdcdbf6efa56bada \ - --hash=sha256:8e1eaa942ae81d43d535092ff3ba660c967344178cc3876b54834a56c1207f3a \ - --hash=sha256:941af534a9b77d4b912e173e98680225340cf8827537e465bd6498b3e98d0cb8 \ - --hash=sha256:a2eb2b2ed1662e74bebcdcd8f3872fd23378605601065a94ca265040026a11b3 \ - --hash=sha256:aa1621ad7699a4ffbff131ed3d023883fca6bd6ad6f069b3b43bd4d1c5fece1d \ - --hash=sha256:ad98a6c2e61624b1120919353d222121b8f5848b9d33c885d949fe0235575682 \ - --hash=sha256:b10b913b50c8dab125497abb02c8ed76434e90ce8625af9fe45e9f81fd5df858 \ - --hash=sha256:c23262011179db48e600012e296133ab577d8e9682c91a19221164732ccb4427 \ - --hash=sha256:d4c682730cd5ea9b528299b826b9d7fca852fa85512de1b7ad3e84b77d68f6f7 \ - --hash=sha256:db07ed10259c0e93a55e3c285d2d78111b000e574aa4f94d89de53c72fb28127 \ - --hash=sha256:e6285d35f79d0cdc8838d3cb01876f979c8419a74662e8de39444e40639e0b2b \ - --hash=sha256:e801976901fb7bc48f13653a7ca78e81fa65fe615d0d33c9383385c73e571927 \ - --hash=sha256:efce0ddb6a3f92f52da0affe62b7c558e3641651fee982a04899509f3070ab4a \ - --hash=sha256:efdb3785c8700b3d0b354553827a166480a439f9754f7366f795bbe8b42d6daf \ - --hash=sha256:f03aef24d91168232db8b01e4d6726676708be503e6aa07e28ab808e6d0fe606 +chardet==7.3.0 \ + --hash=sha256:015f9d697f796a5bb0ac4d19e0108fd6cc84d141521089d0385d2a00c5f5d74e \ + --hash=sha256:04ef4b65c18afb298ac7c1326fbd83e1524250ceb7e61df67115a4a48e9e8e0e \ + --hash=sha256:23d264962f680deec691308cc753685b4c5a69798a26e00ce4f4cf96d2e43fcb \ + --hash=sha256:328a79efb197d6e9460ce33ebb8002a0bf85faa123d56aa1f75c21696ee70070 \ + --hash=sha256:340f4eccafa17cfc5a90af1fb8558dc791156f815f8d800d8ac2b1b9fb2b8103 \ + --hash=sha256:51a0ad2031bd10d24357d7e52de68abe29efb62b7aedf1bd9d1c593fd438cec5 \ + --hash=sha256:5276bc68736cf6d530ca2dc4ea1c2101d2b50015b09d48242615cc3818623574 \ + --hash=sha256:58388f412a76d1449c6ce4631edbd1b0087385ff00b6fb1f521879d8e8d99484 \ + --hash=sha256:5b58eb6d6dea67fc3b578dd956dd6e92aafea383aa559ccea55265554ff062a3 \ + --hash=sha256:5dbfbaef7de55aee008de9b886a63e60e916016507ed7845c9b7bfe1357f4f54 \ + --hash=sha256:5e912948f27c0124da8ce8fcd5ed8fe3b5e06fe8c0ecb66dd95180edf1122a6c \ + --hash=sha256:622206fdb0d274766559fa172e2d680d58cc5fc6a67015c21c36fec500e7bd50 \ + --hash=sha256:7193bcca96ffd87a7d6695056d3e875707b25eda588957756dd5c95d125fcb89 \ + --hash=sha256:7ccec08ee572dfd7a9486835ceba06ef88fa3e15deb1b76130b5ba6012fbb0c0 \ + --hash=sha256:7ed513fb0b35ebf663bd4f8be2d61af701202e98f77e6d8301d1a2c7d0f2985d \ + --hash=sha256:7f3758c122aebb411eac37452c5774c56a5500147e1c24af0d460cb0d748fb48 \ + --hash=sha256:80139a006a598e2db83fe6eaf7ac29c2a30cc5d10f255a89a9c6b9c04f81d67f \ + --hash=sha256:811029a7cf397ed32441aa134475f7047826fba496047a6afd7bba1da7fc4ab7 \ + --hash=sha256:8267de33ade8a496cb441eb86dd08c803043870a66b4f55aa44c02e1dbdbf93e \ + --hash=sha256:90a6249a455b8ecdb207a9f5a5eb46e1c21f2173eacb5e1603def61ed4784303 \ + --hash=sha256:920b91e9436c4d546862143313f48d4e6e0dd8510114ae0c5b194ff8c878a6c8 \ + --hash=sha256:963e6cac79e3a4fc51c8517b8df03b3467550dd00d53e775059dce6e2fc0d0ca \ + --hash=sha256:aab48b166f8aa8b086c93147ed6427376b8db2d783aff3f787c1c0819f6486bb \ + --hash=sha256:b69fd9685a7aada6e236a50bb93b51bd4fc08d29d1029492e64823a69c015f46 \ + --hash=sha256:c296044993dab62281176c07d0ca2b6e865044e38944d3f6e4ad661e222f4db8 \ + --hash=sha256:c88c464b5b65859984386c698b43ccfe88e96814f80433c2d5fdf40dc4b68bcb \ + --hash=sha256:dc4726af6ee00ee386293c34d86ba1fe18e0bd70a74612f1486da217d6a01249 \ + --hash=sha256:e464c2ec0be69ab6d5792c1acf354001b34e201efa2bee60ff4f7ded0e23f6a8 \ + --hash=sha256:e6bf602bb8a070524a19bac1cff2a10d62c71b09606f066251282870fa1466e5 \ + --hash=sha256:f4ea1f94f17fce29600e1661f773048ee9ed90a9300f1226018987f7d5961019 \ + --hash=sha256:fef009cdb37225b1f6259ddc18c3017cd1edddd85d57823f1c46c53503da41a1 \ + --hash=sha256:ff4d81f5561f2382343dc922e533c017d52bc55125e50551c18034fffcdbd0cb # via -r tools/base/requirements.in charset-normalizer==3.4.6 \ --hash=sha256:06a7e86163334edfc5d20fe104db92fcd666e5a5df0977cb5680a506fe26cc8e \ @@ -340,9 +346,9 @@ pyyaml==6.0.3 \ --hash=sha256:fa160448684b4e94d80416c0fa4aac48967a969efe22931448d853ada8baf926 \ --hash=sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0 # via -r tools/base/requirements.in -requests==2.33.0 \ - --hash=sha256:3324635456fa185245e24865e810cecec7b4caf933d7eb133dcde67d48cee69b \ - --hash=sha256:c7ebc5e8b0f21837386ad0e1c8fe8b829fa5f544d8df3b2253bff14ef29d7652 +requests==2.32.5 \ + --hash=sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6 \ + --hash=sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf # via -r tools/base/requirements.in six==1.17.0 \ --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \ @@ -362,9 +368,7 @@ yapf==0.43.0 \ --hash=sha256:00d3aa24bfedff9420b2e0d5d9f5ab6d9d4268e72afbf59bb3fa542781d5218e \ --hash=sha256:224faffbc39c428cb095818cf6ef5511fdab6f7430a10783fdfb292ccf2852ca # via -r tools/base/requirements.in -zipp==3.23.0 \ - --hash=sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e \ - --hash=sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166 +zipp==3.18.1 # via # -r tools/base/requirements.in # importlib-metadata From 4d7a5cbe3d9a9e708856c169daf90f676d26b4b9 Mon Sep 17 00:00:00 2001 From: Jason Ye Date: Sat, 28 Mar 2026 19:33:40 +0000 Subject: [PATCH 6/7] fix format Signed-off-by: Jason Ye --- source/client/process_impl.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc index e5c864455..427adfc02 100644 --- a/source/client/process_impl.cc +++ b/source/client/process_impl.cc @@ -205,7 +205,7 @@ class NighthawkServerFactoryContext : public Envoy::Server::Configuration::Serve Envoy::Server::ServerLifecycleNotifier& lifecycleNotifier() override { return lifecycle_notifier_; } -\ + Envoy::Regex::Engine& regexEngine() override { return regex_engine_; } Envoy::Init::Manager& initManager() override { @@ -214,7 +214,6 @@ class NighthawkServerFactoryContext : public Envoy::Server::Configuration::Serve Envoy::Grpc::Context& grpcContext() override { return server_.grpcContext(); }; - Envoy::Router::Context& routerContext() override { return server_.routerContext(); }; Envoy::ProcessContextOptRef processContext() override { From 8774c5cc4db340a9cd291d235db5ff6ff1e890ce Mon Sep 17 00:00:00 2001 From: Jason Ye Date: Mon, 30 Mar 2026 18:26:47 +0000 Subject: [PATCH 7/7] fix format Signed-off-by: Jason Ye --- source/client/process_impl.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc index 427adfc02..4d0013f09 100644 --- a/source/client/process_impl.cc +++ b/source/client/process_impl.cc @@ -208,9 +208,7 @@ class NighthawkServerFactoryContext : public Envoy::Server::Configuration::Serve Envoy::Regex::Engine& regexEngine() override { return regex_engine_; } - Envoy::Init::Manager& initManager() override { - return server_.initManager(); - }; + Envoy::Init::Manager& initManager() override { return server_.initManager(); }; Envoy::Grpc::Context& grpcContext() override { return server_.grpcContext(); };