Merge branch 'main' of github.com:envoyproxy/envoy into grpc-stream-t…

…racing

api/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/action.proto

@@ -6,6 +6,7 @@ import "envoy/config/core/v3/base.proto";
 import "envoy/config/route/v3/route_components.proto";
 
 import "google/protobuf/any.proto";
+import "google/protobuf/duration.proto";
 
 import "xds/annotations/v3/status.proto";
 
@@ -22,7 +23,7 @@ option (xds.annotations.v3.file_status).work_in_progress = true;
 // [#protodoc-title: Generic Proxy Route Action Configuration]
 
 // Configuration for the route match action.
-// [#next-free-field: 6]
+// [#next-free-field: 7]
 message RouteAction {
  // The name of the route action. This should be unique across all route actions.
  string name = 5;
@@ -47,4 +48,11 @@ message RouteAction {
  // <envoy_v3_api_field_config.core.v3.TypedExtensionConfig.name>` in the :ref:`generic filters
  // <envoy_v3_api_field_extensions.filters.network.generic_proxy.v3.GenericProxy.filters>`.
  map<string, google.protobuf.Any> per_filter_config = 4;
+
+ // Specifies the upstream timeout for the route. If not specified, the default is 15s. This
+ // spans between the point at which the entire downstream request (i.e. end-of-stream) has been
+ // processed and when the upstream response has been completely processed. A value of 0 will
+ // disable the route's timeout.
+ // [#not-implemented-hide:]
+ google.protobuf.Duration timeout = 6;
 }

bazel/repositories.bzl

@@ -1471,7 +1471,3 @@ def _com_github_maxmind_libmaxminddb():
  name = "com_github_maxmind_libmaxminddb",
  build_file_content = BUILD_ALL_CONTENT,
  )
- native.bind(
- name = "maxmind",
- actual = "@envoy//bazel/foreign_cc:maxmind_linux_darwin",
- )

changelogs/current.yaml

@@ -2,15 +2,28 @@ date: Pending
 
 behavior_changes:
 # *Changes that are expected to cause an incompatibility if applicable; deployment changes are likely required*
+- area: thread_local
+ change: |
+ Changes the behavior of the ``SlotImpl`` class destructor. With this change the destructor can be called on any thread.
+ This behavior can be reverted by setting the runtime flag ``envoy.reloadable_features.allow_slot_destroy_on_worker_threads``
+ to false.
 
 minor_behavior_changes:
 # *Changes that may cause incompatibilities for some users, but should not for most*
 
 bug_fixes:
 # *Changes expected to improve the state of the world and are unlikely to have negative effects*
+- area: tls
+ change: |
+ Fix a RELEASE_ASSERT when using :ref:`auto_sni <envoy_v3_api_field_config.core.v3.UpstreamHttpProtocolOptions.auto_sni>`
+ if the downstream request ``:authority`` was longer than 255 characters.
+
 
 removed_config_or_runtime:
 # *Normally occurs at the end of the* :ref:`deprecation period <deprecated>`
+- area: tcp
+ change: |
+ Removed ``envoy.reloadable_features.detect_and_raise_rst_tcp_connection`` runtime flag and legacy code paths.
 
 new_features:
 

examples/local_ratelimit/Dockerfile-nginx

@@ -1 +1 @@
-FROM nginx@sha256:9ff236ed47fe39cf1f0acf349d0e5137f8b8a6fd0b46e5117a401010e56222e1
+FROM nginx@sha256:d2cb0992f098fb075674730da5e1c6cccdd4890516e448a1db96e0245c1b7fca

examples/single-page-app/ui/package.json

@@ -14,7 +14,7 @@
  "@chakra-ui/react": "^2.8.2",
  "@emotion/react": "^11.11.4",
  "@emotion/styled": "^11.11.5",
- "framer-motion": "^11.1.1",
+ "framer-motion": "^11.1.3",
  "mdi-react": "^9.3.0",
  "react": "^18.2.0",
  "react-dom": "^18.2.0",

examples/single-page-app/ui/yarn.lock

@@ -2652,10 +2652,10 @@ for-each@^0.3.3:
  dependencies:
  is-callable "^1.1.3"
 
-framer-motion@^11.1.1:
- version "11.1.1"
- resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-11.1.1.tgz#c897ac9ad650f37e23433b76e9a10dec149df318"
- integrity sha512-h2Zz95boULAIvow/2y8CQTFv5MHxPQO/98DrAwMe4HoI8/fcU6hUfH+886u8W/5oedp5zCCZ7qUVS46ZWoTEuA==
+framer-motion@^11.1.3:
+ version "11.1.3"
+ resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-11.1.3.tgz#1e9feeeb594d915cb14ea3b7ac012291fa5cd44e"
+ integrity sha512-/t74b1WQu+mpZtra6xFSfsRfdTymJjNYgFudVIsUmoOWjznr3x5o9HbrX7Jt9655OCA2Js0W79bMZEKE7owp9w==
  dependencies:
  tslib "^2.4.0"
 

mobile/.bazelrc

@@ -85,35 +85,14 @@ build:mobile-test-android --define=envoy_mobile_xds=enabled
 # Default flags for iOS tests.
 build:mobile-test-ios --config=ios
 
-# Locally-runnable ASAN config for MacOS & Linux with standard dev environment
-# See also:
-# https://github.com/bazelbuild/bazel/issues/6932
-build:mobile-asan-dev --strip=never
-build:mobile-asan-dev --copt -Wno-macro-redefined # ASAN sets _FORTIFY_SOURCE=0
-build:mobile-asan-dev --copt -DADDRESS_SANITIZER
-build:mobile-asan-dev --copt -D_LIBCPP_HAS_NO_ASAN
-build:mobile-asan-dev --copt -g
-build:mobile-asan-dev --copt -fno-omit-frame-pointer
-build:mobile-asan-dev --copt -fno-optimize-sibling-calls
-build:mobile-asan-dev --copt -fsanitize=address
-build:mobile-asan-dev --linkopt -fsanitize=address
-build:mobile-asan-dev --platform_suffix=-asan
-
-build:mobile-clang-asan --linkopt --rtlib=compiler-rt
-build:mobile-clang-asan --linkopt --unwindlib=libgcc
+# Clang ASAN.
 build:mobile-clang-asan --config=clang-asan-common
 
-# Locally-runnable TSAN config
-build:mobile-tsan-dev --features=tsan
-build:mobile-tsan-dev --copt -fsanitize=thread
-build:mobile-tsan-dev --linkopt -fsanitize=thread
-build:mobile-tsan-dev --test_env=ENVOY_IP_TEST_VERSIONS=v4only
-build:mobile-tsan-dev --platform_suffix=-tsan
-# Needed due to https://github.com/libevent/libevent/issues/777
-build:mobile-tsan-dev --copt -DEVENT__DISABLE_DEBUG_MODE
-# https://github.com/abseil/abseil-cpp/issues/760
-# https://github.com/google/sanitizers/issues/953
-build:mobile-tsan-dev --test_env="TSAN_OPTIONS=report_atomic_races=0"
+# Clang TSAN.
+build:mobile-clang-tsan --config=clang-tsan
+
+# Clang MSAN.
+build:mobile-clang-msan --config=clang-msan
 
 # Exclude debug info from the release binary since it makes it too large to fit
 # into a zip file. This shouldn't affect crash reports.

mobile/test/common/BUILD

@@ -1,5 +1,4 @@
 load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_test", "envoy_mobile_package")
-load("@envoy//bazel:envoy_select.bzl", "envoy_select_enable_yaml")
 
 licenses(["notice"]) # Apache 2
 
@@ -18,17 +17,15 @@ envoy_cc_test(
 
 envoy_cc_test(
  name = "internal_engine_test",
- srcs = envoy_select_enable_yaml(
- ["internal_engine_test.cc"],
- "@envoy",
- ),
+ srcs = ["internal_engine_test.cc"],
  repository = "@envoy",
  deps = [
  "//library/cc:engine_builder_lib",
  "//library/common:internal_engine_lib_no_stamp",
  "//library/common/data:utility_lib",
  "//library/common/http:header_utility_lib",
  "//library/common/types:c_types_lib",
+ "//test/common/integration:test_server_lib",
  "//test/common/mocks/common:common_mocks",
  "//test/common/mocks/event:event_mocks",
  "@envoy//test/common/http:common_lib",