Skip to content

envoy: bump upstream to c687308#1886

Merged
buildbreaker merged 16 commits intoenvoyproxy:mainfrom
jpsim:dns-as-extension
Oct 20, 2021
Merged

envoy: bump upstream to c687308#1886
buildbreaker merged 16 commits intoenvoyproxy:mainfrom
jpsim:dns-as-extension

Conversation

@jpsim
Copy link
Copy Markdown
Contributor

@jpsim jpsim commented Oct 15, 2021

Integrates envoyproxy/envoy#17479 & envoyproxy/envoy#17521

Envoy diff: envoyproxy/envoy@a5b3af2...c687308

This PR:

  • Creates a new extension_registry_platform_additions library where platform-specific additions to the extensions can be configured. Currently only registers the Apple DNS resolver extension factory and no-ops on non-Apple platforms but more can be added here in the future.
  • Implements the new Stream::bytesMeter() function on DirectStream.
  • Increases the max binary size from 7.2MB to 7.3MB. We were already within 1% of that on main so it didn't take much new code to go over this limit.

@jpsim
Copy link
Copy Markdown
Contributor Author

jpsim commented Oct 15, 2021

Despite having configured the envoy.network.dns_resolver.apple extension, running the iOS hello world app hits the newly added assertion:

[2021-10-15 12:39:13.559][1363668][critical][assert] [external/envoy/source/common/network/dns_resolver/dns_factory.cc:49] assert failure: false. Details: In MacOS, if run-time flag 'use_apple_api_for_dns_lookups' is enabled, but the envoy.network.dns_resolver.apple extension is not included in Envoy build file. This is wrong. Abort Envoy.

bazel build ios_dist --config=ios
bazel run //examples/objective-c/hello_world:app --config=ios

Maybe I'm not configuring the extension correctly 🤔

@jpsim jpsim changed the title Test envoy#17479 envoy: bump upstream to fe69a3032 Oct 18, 2021
Signed-off-by: JP Simard <[email protected]>
Envoy::Extensions::TransportSockets::Tls::forceRegisterDefaultCertValidatorFactory();
Envoy::Extensions::Upstreams::Http::Generic::forceRegisterGenericGenericConnPoolFactory();
Envoy::Upstream::forceRegisterLogicalDnsClusterFactory();
Envoy::Network::forceRegisterAppleDnsResolverFactory();
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep these alphabetical.

jpsim added 10 commits October 20, 2021 09:33
Signed-off-by: JP Simard <[email protected]>
Signed-off-by: JP Simard <[email protected]>
Signed-off-by: JP Simard <[email protected]>
Signed-off-by: JP Simard <[email protected]>
Increasing due to significant new code upstream.

Signed-off-by: JP Simard <[email protected]>
Signed-off-by: JP Simard <[email protected]>
@jpsim jpsim changed the title envoy: bump upstream to fe69a3032 envoy: bump upstream to c687308 Oct 20, 2021
@jpsim jpsim marked this pull request as ready for review October 20, 2021 17:43
@jpsim jpsim requested a review from goaway October 20, 2021 17:43
@buildbreaker buildbreaker merged commit f966ebd into envoyproxy:main Oct 20, 2021
@jpsim jpsim deleted the dns-as-extension branch October 20, 2021 18:11
jpsim added a commit to jpsim/envoy-mobile that referenced this pull request Oct 21, 2021
* origin/main:
  [Apple] Guess string encoding when creating an NSString with UTF8 fails (envoyproxy#1891)
  Link android dev document in a doctree (envoyproxy#1892)
  bazel: Remove rules_jvm_external dep on JAVA_HOME (envoyproxy#1890)
  release: 0.4.3.20211020 (envoyproxy#1887)
  Add debug instructions and sample bazelproject (envoyproxy#1888)
  bazel: Use hermetic JDK 11 (envoyproxy#1863)
  envoy: bump upstream to c687308 (envoyproxy#1886)
  docs: how to test with local envoy (envoyproxy#1876)
  network: implement initial heuristic for binding alternate interface (envoyproxy#1858)
  Assign an int to each log level (envoyproxy#1885)
  envoy: bump upstream to a5b3af2 (envoyproxy#1884)
  android: stub out jni logging by default (envoyproxy#1879)
  CI: Add local JDK to asan/tsan builds (envoyproxy#1878)
  Make JniBridgeUtility public (envoyproxy#1880)
  swift: Fix Swift version in podspec (envoyproxy#1875)

Signed-off-by: JP Simard <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants