envoy: bump upstream to c687308 (#1886)

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.

Author: jpsim

ci/test_size_regression.sh

@@ -2,7 +2,7 @@
 
 # Checks the absolute size and the relative size increase of a file.
 
-MAX_SIZE=7200000 # 7.2MB
+MAX_SIZE=7300000 # 7.3MB
 MAX_PERC=2.0
 
 if [ `uname` == "Darwin" ]

envoy

@@ -12,6 +12,7 @@ envoy_cc_library(
     hdrs = ["extension_registry.h"],
     repository = "@envoy",
     deps = [
+        "extension_registry_platform_additions",
         "@envoy//source/common/network:socket_lib",
         "@envoy//source/common/upstream:logical_dns_cluster_lib",
         "@envoy//source/extensions/clusters/dynamic_forward_proxy:cluster",
@@ -35,3 +36,17 @@ envoy_cc_library(
         "@envoy_mobile//library/common/extensions/retry/options/network_configuration:config",
     ],
 )
+
+envoy_cc_library(
+    name = "extension_registry_platform_additions",
+    srcs = select({
+        "@envoy//bazel:apple": ["extension_registry_apple.cc"],
+        "//conditions:default": ["extension_registry_noop.cc"],
+    }),
+    hdrs = ["extension_registry_platform_additions.h"],
+    repository = "@envoy",
+    deps = select({
+        "@envoy//bazel:apple": ["@envoy//source/extensions/network/dns_resolver/apple:config"],
+        "//conditions:default": [],
+    }),
+)

envoy_build_config/BUILD

@@ -16,6 +16,7 @@
 #include "source/extensions/transport_sockets/tls/config.h"
 #include "source/extensions/upstreams/http/generic/config.h"
 
+#include "extension_registry_platform_additions.h"
 #include "library/common/extensions/filters/http/assertion/config.h"
 #include "library/common/extensions/filters/http/platform_bridge/config.h"
 
@@ -46,6 +47,7 @@ void ExtensionRegistry::registerFactories() {
   Envoy::Extensions::TransportSockets::Tls::forceRegisterDefaultCertValidatorFactory();
   Envoy::Extensions::Upstreams::Http::Generic::forceRegisterGenericGenericConnPoolFactory();
   Envoy::Upstream::forceRegisterLogicalDnsClusterFactory();
+  ExtensionRegistryPlatformAdditions::registerFactories();
 
   // TODO: add a "force initialize" function to the upstream code, or clean up the upstream code
   // in such a way that does not depend on the statically initialized variable.

envoy_build_config/extension_registry.cc

@@ -16,6 +16,7 @@
 #include "source/extensions/transport_sockets/tls/config.h"
 #include "source/extensions/upstreams/http/generic/config.h"
 
+#include "extension_registry_platform_additions.h"
 #include "library/common/extensions/filters/http/assertion/config.h"
 #include "library/common/extensions/filters/http/local_error/config.h"
 #include "library/common/extensions/filters/http/network_configuration/config.h"

envoy_build_config/extension_registry.h

@@ -0,0 +1,11 @@
+#include "source/extensions/network/dns_resolver/apple/apple_dns_impl.h"
+
+#include "extension_registry_platform_additions.h"
+
+namespace Envoy {
+
+void ExtensionRegistryPlatformAdditions::registerFactories() {
+  Envoy::Network::forceRegisterAppleDnsResolverFactory();
+}
+
+} // namespace Envoy

envoy_build_config/extension_registry_apple.cc

@@ -0,0 +1,7 @@
+#include "extension_registry_platform_additions.h"
+
+namespace Envoy {
+
+void ExtensionRegistryPlatformAdditions::registerFactories() {}
+
+} // namespace Envoy

envoy_build_config/extension_registry_noop.cc

@@ -0,0 +1,13 @@
+#pragma once
+
+namespace Envoy {
+class ExtensionRegistryPlatformAdditions {
+public:
+  // As a server, Envoy's static factory registration happens when main is run. However, when
+  // compiled as a library, there is no guarantee that such registration will happen before the
+  // names are needed. The following calls ensure that registration happens before the entities are
+  // needed. Note that as more registrations are needed, explicit initialization calls will need to
+  // be added here.
+  static void registerFactories();
+};
+} // namespace Envoy

envoy_build_config/extension_registry_platform_additions.h

@@ -14,6 +14,7 @@ EXTENSIONS = {
     "envoy.filters.http.router":                           "//source/extensions/filters/http/router:config",
     "envoy.filters.network.http_connection_manager":       "//source/extensions/filters/network/http_connection_manager:config",
     "envoy.http.original_ip_detection.xff":                "//source/extensions/http/original_ip_detection/xff:config",
+    "envoy.network.dns_resolver.apple":                    "//source/extensions/network/dns_resolver/apple:config",
     "envoy.retry.options.network_configuration":           "@envoy_mobile//library/common/extensions/retry/options/network_configuration:config",
     "envoy.stat_sinks.metrics_service":                    "//source/extensions/stat_sinks/metrics_service:config",
     "envoy.transport_sockets.raw_buffer":                  "//source/extensions/transport_sockets/raw_buffer:config",

envoy_build_config/extensions_build_config.bzl

@@ -232,6 +232,8 @@ class Client : public Logger::Loggable<Logger::Id::http> {
     }
     void setFlushTimeout(std::chrono::milliseconds) override {}
 
+    const StreamInfo::BytesMeterSharedPtr& bytesMeter() override { return bytes_meter_; }
+
     // ScopeTrackedObject
     void dumpState(std::ostream& os, int indent_level = 0) const override;
 
@@ -269,6 +271,7 @@ class Client : public Logger::Loggable<Logger::Id::http> {
     bool explicit_flow_control_ = false;
     // Latest intel data retrieved from the StreamInfo.
     envoy_stream_intel stream_intel_;
+    StreamInfo::BytesMeterSharedPtr bytes_meter_;
   };
 
   using DirectStreamSharedPtr = std::shared_ptr<DirectStream>;