Merge branch 'main' of https://github.com/envoyproxy/envoy into fix-windows-build

Author: anuraaga

CODEOWNERS

@@ -91,13 +91,13 @@ extensions/filters/common/original_src @klarose @mattklein123
 # UDP packet writer
 /*/extensions/udp_packet_writer/ @danzh2010 @ryantheoptimist
 # redis cluster extension
-/*/extensions/clusters/redis @msukalski @henryyyang @mattklein123
+/*/extensions/clusters/redis @msukalski @henryyyang @mattklein123 @nezdolik @dinesh-murugiah
 # reverse conn cluster extension
 /*/extensions/clusters/reverse_connection @agrawroh @basundhara-c @botengyao @yanavlasov
-/*/extensions/common/redis @msukalski @henryyyang @mattklein123
-/*/extensions/health_checkers/redis @mattklein123 @UNOWNED
-/*/extensions/filters/network/redis_proxy @mattklein123 @UNOWNED
-/*/extensions/filters/network/common/redis @mattklein123 @UNOWNED
+/*/extensions/common/redis @msukalski @henryyyang @mattklein123 @nezdolik @dinesh-murugiah
+/*/extensions/health_checkers/redis @mattklein123 @nezdolik @dinesh-murugiah
+/*/extensions/filters/network/redis_proxy @mattklein123 @nezdolik @dinesh-murugiah
+/*/extensions/filters/network/common/redis @mattklein123 @nezdolik @dinesh-murugiah
 # dynamic forward proxy
 /*/extensions/clusters/dynamic_forward_proxy @mattklein123 @ryantheoptimist
 /*/extensions/common/dynamic_forward_proxy @mattklein123 @ryantheoptimist

api/envoy/admin/v3/server_info.proto

@@ -59,7 +59,7 @@ message ServerInfo {
   config.core.v3.Node node = 7;
 }
 
-// [#next-free-field: 42]
+// [#next-free-field: 43]
 message CommandLineOptions {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.admin.v2alpha.CommandLineOptions";
@@ -161,6 +161,9 @@ message CommandLineOptions {
   // See :option:`--file-flush-interval-msec` for details.
   google.protobuf.Duration file_flush_interval = 16;
 
+  // See :option:`--file-flush-min-size-kb` for details.
+  uint32 file_flush_min_size = 42;
+
   // See :option:`--drain-time-s` for details.
   google.protobuf.Duration drain_time = 17;
 

api/envoy/config/bootstrap/v3/bootstrap.proto

@@ -32,14 +32,55 @@ message FilterStateValue {
   oneof key {
     option (validate.required) = true;
 
-    // Filter state object key. The key is used to lookup the object factory, unless :ref:`factory_key
-    // <envoy_v3_api_field_extensions.filters.common.set_filter_state.v3.FilterStateValue.factory_key>` is set. See
-    // :ref:`the well-known filter state keys <well_known_filter_state>` for a list of valid object keys.
+    // The name under which the filter state object will be stored and can be retrieved.
+    //
+    // When using :ref:`well-known filter state keys <well_known_filter_state>` (e.g.,
+    // ``envoy.network.upstream_server_name``, ``envoy.tcp_proxy.cluster``), the object key serves
+    // dual purpose where it identifies both where the data is stored and which factory creates the
+    // object. In this case, :ref:`factory_key
+    // <envoy_v3_api_field_extensions.filters.common.set_filter_state.v3.FilterStateValue.factory_key>`
+    // is not needed.
+    //
+    // When using a custom key name which is not from the well-known list, you must also specify
+    // :ref:`factory_key
+    // <envoy_v3_api_field_extensions.filters.common.set_filter_state.v3.FilterStateValue.factory_key>`
+    // to indicate which factory should create the object from your value.
+    //
+    // Example using a well-known key where ``factory_key`` is not needed:
+    //
+    // .. code-block:: yaml
+    //
+    //    object_key: envoy.tcp_proxy.cluster
+    //    format_string:
+    //      text_format_source:
+    //        inline_string: "my-cluster"
+    //
+    // Example using a custom key which requires a ``factory_key``:
+    //
+    // .. code-block:: yaml
+    //
+    //    object_key: my.custom.key
+    //    factory_key: envoy.string
+    //    format_string:
+    //      text_format_source:
+    //        inline_string: "my-value"
+    //
     string object_key = 1 [(validate.rules).string = {min_len: 1}];
   }
 
-  // Optional filter object factory lookup key. See :ref:`the well-known filter state keys <well_known_filter_state>`
-  // for a list of valid factory keys.
+  // Specifies which registered factory should be used to create the filter state object from the
+  // provided value. This field is required when :ref:`object_key
+  // <envoy_v3_api_field_extensions.filters.common.set_filter_state.v3.FilterStateValue.object_key>`
+  // is a custom name not found in the :ref:`well-known filter state keys <well_known_filter_state>`.
+  //
+  // Each well-known key has a factory registered with the same name (e.g., the key
+  // ``envoy.tcp_proxy.cluster`` has a factory also named ``envoy.tcp_proxy.cluster``). For custom keys,
+  // use one of the following generic factories:
+  //
+  // * ``envoy.string``: Creates a generic string object. Use this for arbitrary string values that
+  //   will be accessed via ``StringAccessor``.
+  //
+  // If not specified, defaults to the value of ``object_key``.
   string factory_key = 6;
 
   oneof value {

api/envoy/config/core/v3/protocol.proto

@@ -106,7 +106,5 @@ message MessageRestrictions {
 // The restriction configuration.
 message RestrictionConfig {
   // Matcher tree for matching requests and responses with the configured restrictions.
-  // NOTE: Currently, only CEL expressions are supported for matching. Support for more
-  // matchers will be added incrementally overtime.
   xds.type.matcher.v3.Matcher matcher = 1;
 }

api/envoy/extensions/filters/common/set_filter_state/v3/value.proto

@@ -22,6 +22,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 // * ROUTE
 // * UPSTREAM_HOST
 // * LISTENER
+// * LISTENER_FILTER_CHAIN
 // * VIRTUAL_HOST
 //
 // See :ref:`here <config_access_log>` for more information on access log configuration.

api/envoy/extensions/filters/http/proto_api_scrubber/v3/config.proto

@@ -231,6 +231,9 @@ removed_config_or_runtime:
     Removed runtime guard ``envoy.reloadable_features.router_filter_resetall_on_local_reply`` and legacy code paths.
 
 new_features:
+- area: server
+  change: |
+    Add new command-line option ``--file-flush-min-size-kb <integer>`` to configure the minimum size in kilobytes for log file flushing.
 - area: network_filter
   change: |
     Added :ref:`geoip network filter <config_network_filters_geoip>` to perform geolocation lookups
@@ -368,8 +371,7 @@ new_features:
     <arch_overview_wasm_foreign_functions>` for details.
 - area: redis
   change: |
-    Optimized the ``INFO`` command to provide limited metrics with a consolidated cluster view and added ``INFO.SHARD``
-    to retrieve shard-specific metrics.
+    Moved the implementation of KEYS,SELECT,ROLE to the cluster scope command framework.
 - area: overload management
   change: |
     The fixed heap resource monitor can calculate memory pressure as currently allocated memory divided by maximum heap
@@ -541,6 +543,9 @@ new_features:
     requests to more backend servers. The filter supports fanout to multiple backends for initialize and tools-list requests,
     single-backend routing for tools-call based on tool name prefix, session management with composite session IDs,
     and response aggregation.
+- area: access_log
+  change: |
+    Added ``LISTENER_FILTER_CHAIN`` to the ``METADATA`` command operator to allow access to listener filter chain metadata.
 - area: ext_proc
   change: |
     Added per HTTP event :ref:'procesing effects <envoy.filters.http.ext_proc.ProcessingEffect' in the

api/envoy/extensions/formatter/metadata/v3/metadata.proto

@@ -1,3 +1,3 @@
 # We dont build from this dockerfile - we just parse the version, but storing
 # here means we get the dependabot updates
-FROM moby/buildkit:v0.26.2
+FROM moby/buildkit:v0.26.3

changelogs/current.yaml

@@ -109,7 +109,23 @@ configuration with a :ref:`factory lookup key
 <envoy_v3_api_field_extensions.filters.common.set_filter_state.v3.FilterStateValue.factory_key>`.
 
 ``envoy.string``
-  A special generic string object factory. Accepts any string as its value.
+  A generic string object factory for creating filter state entries with custom key names.
+  Use this as the :ref:`factory_key
+  <envoy_v3_api_field_extensions.filters.common.set_filter_state.v3.FilterStateValue.factory_key>`
+  when your ``object_key`` is a custom name not listed in this document.
+
+  Example configuration:
+
+  .. code-block:: yaml
+
+    object_key: my.custom.key
+    factory_key: envoy.string
+    format_string:
+      text_format_source:
+        inline_string: "my-value"
+
+  This creates a filter state entry named ``my.custom.key`` containing the string ``my-value``.
+  The value can be accessed in access logs using ``%FILTER_STATE(my.custom.key)%``.
 
 ``envoy.network.ip``
   A factory to create IP addresses from ``IPv4`` and ``IPv6`` address strings.