factory context: refactored factory context #31189

wbpcode · 2023-12-06T04:59:06Z

Commit Message: factory context: refactored factory context
Additional Description:

removed FactoryContextBase
FactoryContext won't inherit from CommonFactoryContext.

What should I say? Cheers? 😄

Risk Level: mid.
Testing: n/a.
Docs Changes: n/a.
Release Notes: n/a.
Platform Specific Features: n/a.

Signed-off-by: wbpcode <wbphub@live.com>

alyssawilk · 2023-12-06T19:39:36Z

/wait on main merge (sorry!)

Signed-off-by: wbpcode <wbphub@live.com>

wbpcode · 2023-12-07T14:28:37Z

Although we used multiple PRs to do some pre-cleanup, this PR still such big. orz.

wbpcode · 2023-12-07T14:50:18Z

🍻 finally...

alyssawilk

this change is AMAZING

I'd bump risk to high just because it's a pretty big refactor. Feel free to merge as is and typedef in a follow-up someone else can review as I'm sure merge conflicts will be a lot.

alyssawilk · 2023-12-07T21:06:46Z

source/common/local_reply/local_reply.cc

@@ -23,7 +23,7 @@ class BodyFormatter {
        content_type_(Http::Headers::get().ContentTypeValues.Text) {}

  BodyFormatter(const envoy::config::core::v3::SubstitutionFormatString& config,
-                Server::GenericFactoryContextImpl context)
+                Server::Configuration::GenericFactoryContext& context)


optional: think it's worth doing a typedef for this one just to avoid the churn here and for folks downstream?

Sorry, what typedef?

The GenericFactoryContextImpl was just introduced in the #31072 (3 days ago), So, I think the change from GenericFactoryContextImpl to Server::Configuration::GenericFactoryContext&won't effect anyone.
(I used GenericFactoryContextImpl in the #31072 because I hope the FactoryContext could be used to construct a GenericFactoryContextImpl implicitly, then we can reduce unnecessary code change in lots of postions. But now, after this patch, FactoryContext inherit from GenericFactoryContext, so GenericFactoryContextImpl is unnecessary now.)

alyssawilk · 2023-12-07T21:07:32Z

source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc

@@ -17,7 +17,7 @@ namespace Common {
 namespace DynamicForwardProxy {

 absl::StatusOr<std::shared_ptr<DnsCacheImpl>> DnsCacheImpl::createDnsCacheImpl(
-    const Server::Configuration::GenericFactoryContext& context,
+    Server::Configuration::GenericFactoryContext& context,


why the change to non-const?

Because the scope() method and initManager() method are non-const in the FactoryContext.

An I hope FactoryContext could inherit from GenericFactoryContext but doesn't change the method signatures in the FactoryContext. So, I finally update the method signatures of GenericFactoryContext (because it's only be used in limited positions now.)

I believe this is safe because almost all context is used in non-const mode.

wbpcode · 2023-12-08T01:53:27Z

Let's me check it last time and then land it.

- change `context.runtime()` to `context.serverFactoryContext().runtime()` in source/server/http_dynamic_delay_filter_config.cc due to envoyproxy/envoy#31189 and implemented PANIC methods in NighthawkServerFactoryContext - replace `@envoy//source/exe:envoy_common_lib_with_external_headers` with `@envoy//source/exe:all_extensions_lib_with_external_headers` due to envoyproxy/envoy#31109 - replace `@envoy//source/exe:main_common_lib_with_external_headers` with `@envoy//source/exe:main_common_with_all_extensions_lib_with_external_headers` due to a combination of envoyproxy/envoy#30924 and envoyproxy/envoy#31109 causing unit test `UtilityAddressResolutionTest, AddressResolution` failed because `envoy.network.dns_resolver.cares` was not linked in - lower `upstream_cx_rx_bytes_total` counter threshold in `test_http_h2` integration test. - disable oghttp2 in Nighthawk which was enabled by default in Envoy in envoyproxy/envoy@b58d312 - sync files Signed-off-by: Qin Qin <qqin@google.com>

* bump envoy-fork, fix extensions * fix FactoryContext from envoyproxy/envoy#31189 * more build fixes * fix MockFactoryContext * use xds pkg for unified matcher instead of udpa * export the build options * another ServerFactoryContext * use typed_config for lambda filter test * runtime flag...? * runtime flag...as a string...? * use nullopt instead of server factory context. why? not sure yet * put the server factory context back and try a different runtime flag per envoyproxy/envoy#31135 * nuke le asan * uhh * use libcurl, patch out virtual call to ServerFactoryContext::clusterManager() * forgot the patch d'oh * ls on the out dirs * undo commenting creds * add a build dir * derp * what the heck, respect my vars bro * WHY AREN'T WE USING THE RIGHT ENV VARS * look at me. i am the captain now. * shhh, it can't see you if you don't move * well this is nasty but we're getting somewhere * alt+f4 * asan * lower jobs oom-killed * try some more goofiness with the optref * ci shenanigans * server factory context as nullopt * ci nonsense * getting closer * cleanup * remove hard-coding override in initialize() * bump to 1.29.2 * bump to merged --------- Co-authored-by: Nathan Fudenberg <nathan.fudenberg@solo.io>

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <tam.mach@cilium.io>

factory context: refactored factory context

5c91625

Signed-off-by: wbpcode <wbphub@live.com>

wbpcode marked this pull request as draft December 6, 2023 04:59

wbpcode assigned alyssawilk Dec 6, 2023

wbpcode added 2 commits December 6, 2023 10:24

complete test clean up

9a64355

Signed-off-by: wbpcode <wbphub@live.com>

merge main and resolve conliction

325f53f

wbpcode marked this pull request as ready for review December 6, 2023 10:35

wbpcode requested review from mattklein123, kyessenov, alyssawilk and RyanTheOptimist as code owners December 6, 2023 10:35

fix mobile test

2e86431

Signed-off-by: wbpcode <wbphub@live.com>

wbpcode requested a review from abeyad as a code owner December 6, 2023 11:05

wbpcode added 5 commits December 6, 2023 12:24

fix more

17b5a5b

Signed-off-by: wbpcode <wbphub@live.com>

fix more test

f5f8807

Signed-off-by: wbpcode <wbphub@live.com>

reuse message validation visitor

4739d2d

Signed-off-by: wbpcode <wbphub@live.com>

merge main and resolve conflict

0de109f

Signed-off-by: wbpcode <wbphub@live.com>

fix test

d22b342

Signed-off-by: wbpcode <wbphub@live.com>

repokitteh-read-only bot added the waiting label Dec 6, 2023

wbpcode added 3 commits December 7, 2023 01:42

fix test

6f6e639

Signed-off-by: wbpcode <wbphub@live.com>

merge main and resolve conflict

23762b8

Signed-off-by: wbpcode <wbphub@live.com>

fix format

7bf8aab

Signed-off-by: wbpcode <wbphub@live.com>

wbpcode requested a review from soulxu as a code owner December 7, 2023 02:07

repokitteh-read-only bot removed the waiting label Dec 7, 2023

clean remaining legacy code path

f113c3e

Signed-off-by: wbpcode <wbphub@live.com>

wbpcode requested a review from htuch as a code owner December 7, 2023 02:38

fix contrib test

0fe1984

Signed-off-by: wbpcode <wbphub@live.com>

wbpcode requested a review from lizan as a code owner December 7, 2023 04:56

parts of fixs

46e6067

Signed-off-by: wbpcode <wbphub@live.com>

wbpcode requested a review from jmarantz as a code owner December 7, 2023 07:23

fix more tests

5f24c4a

Signed-off-by: wbpcode <wbphub@live.com>

wbpcode requested a review from zuercher as a code owner December 7, 2023 10:51

let's try the acutal CI now

d393cc1

Signed-off-by: wbpcode <wbphub@live.com>

alyssawilk approved these changes Dec 7, 2023

View reviewed changes

wbpcode merged commit 887e472 into envoyproxy:main Dec 8, 2023
105 checks passed

wbpcode deleted the dev-refactory-last-factory-context branch December 8, 2023 02:22

zirain mentioned this pull request Dec 11, 2023

Update envoy with upstream istio/proxy#5199

Merged

ericvn mentioned this pull request Dec 11, 2023

Automator: update envoy@ in istio/proxy@master istio/proxy#5197

Closed

qqustc mentioned this pull request Dec 12, 2023

Update Envoy to 6269243 (Dec 11th, 2023) envoyproxy/nighthawk#1044

Merged

suniltheta mentioned this pull request Dec 13, 2023

Implement sigv4a signing in aws_request_signing extension #31336

Merged

tyxia mentioned this pull request Dec 15, 2023

ext_proc: send attributes #31090

Merged

jbohanon added a commit to solo-io/envoy-gloo that referenced this pull request Mar 1, 2024

fix FactoryContext from envoyproxy/envoy#31189

9bdd858

sayboras added a commit to sayboras/proxy that referenced this pull request Mar 23, 2024

cilium: Adjust custom filter implementation

8b0bc28

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <tam.mach@cilium.io>

sayboras added a commit to sayboras/proxy that referenced this pull request Mar 23, 2024

cilium: Adjust custom filter implementation

eb35be3

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <tam.mach@cilium.io>

sayboras added a commit to sayboras/proxy that referenced this pull request Mar 25, 2024

cilium: Adjust custom filter implementation

40f0ef4

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <tam.mach@cilium.io>

sayboras added a commit to sayboras/proxy that referenced this pull request Apr 2, 2024

cilium: Adjust custom filter implementation

28a0573

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <tam.mach@cilium.io>

sayboras added a commit to sayboras/proxy that referenced this pull request Apr 5, 2024

cilium: Adjust custom filter implementation

8c1fa0b

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <tam.mach@cilium.io>

sayboras added a commit to sayboras/proxy that referenced this pull request Apr 6, 2024

cilium: Adjust custom filter implementation

3bda6f1

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <tam.mach@cilium.io>

sayboras added a commit to sayboras/proxy that referenced this pull request Apr 16, 2024

cilium: Adjust custom filter implementation

de1c230

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <tam.mach@cilium.io>

sayboras added a commit to sayboras/proxy that referenced this pull request Apr 16, 2024

cilium: Adjust custom filter implementation

a70c8ba

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <tam.mach@cilium.io>

sayboras added a commit to sayboras/proxy that referenced this pull request Apr 16, 2024

cilium: Adjust custom filter implementation

c442211

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <tam.mach@cilium.io>

sayboras added a commit to sayboras/proxy that referenced this pull request Apr 17, 2024

cilium: Adjust custom filter implementation

66a7b0c

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <tam.mach@cilium.io>

github-merge-queue bot pushed a commit to cilium/proxy that referenced this pull request Apr 17, 2024

cilium: Adjust custom filter implementation

303f3a0

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <tam.mach@cilium.io>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

factory context: refactored factory context #31189

factory context: refactored factory context #31189

wbpcode commented Dec 6, 2023 •

edited

Loading

alyssawilk commented Dec 6, 2023

wbpcode commented Dec 7, 2023

wbpcode commented Dec 7, 2023

alyssawilk left a comment

alyssawilk Dec 7, 2023

wbpcode Dec 8, 2023 •

edited

Loading

alyssawilk Dec 7, 2023

wbpcode Dec 8, 2023 •

edited

Loading

wbpcode commented Dec 8, 2023

factory context: refactored factory context #31189

factory context: refactored factory context #31189

Conversation

wbpcode commented Dec 6, 2023 • edited Loading

alyssawilk commented Dec 6, 2023

wbpcode commented Dec 7, 2023

wbpcode commented Dec 7, 2023

alyssawilk left a comment

Choose a reason for hiding this comment

alyssawilk Dec 7, 2023

Choose a reason for hiding this comment

wbpcode Dec 8, 2023 • edited Loading

Choose a reason for hiding this comment

alyssawilk Dec 7, 2023

Choose a reason for hiding this comment

wbpcode Dec 8, 2023 • edited Loading

Choose a reason for hiding this comment

wbpcode commented Dec 8, 2023

wbpcode commented Dec 6, 2023 •

edited

Loading

wbpcode Dec 8, 2023 •

edited

Loading

wbpcode Dec 8, 2023 •

edited

Loading