Merge branch 'main' of https://github.com/envoyproxy/envoy into dev-w…

…asm-restart

CODEOWNERS

@@ -103,17 +103,17 @@ extensions/filters/common/original_src @klarose @mattklein123
 # attribute context
 /*/extensions/filters/common/expr @kyessenov @yangminzhu @tyxia
 # webassembly access logger extensions
-/*/extensions/access_loggers/wasm @mpwarres @lizan @UNOWNED
+/*/extensions/access_loggers/wasm @mpwarres @kyessenov @lizan
 # webassembly bootstrap extensions
-/*/extensions/bootstrap/wasm @mpwarres @lizan @UNOWNED
+/*/extensions/bootstrap/wasm @mpwarres @kyessenov @lizan
 # webassembly http extensions
-/*/extensions/filters/http/wasm @mpwarres @lizan @UNOWNED
+/*/extensions/filters/http/wasm @mpwarres @kyessenov @lizan
 # webassembly network extensions
-/*/extensions/filters/network/wasm @mpwarres @lizan @UNOWNED
+/*/extensions/filters/network/wasm @mpwarres @kyessenov @lizan
 # webassembly common extension
-/*/extensions/common/wasm @mpwarres @lizan @UNOWNED
+/*/extensions/common/wasm @mpwarres @kyessenov @lizan
 # webassembly runtimes
-/*/extensions/wasm_runtime/ @mpwarres @lizan @UNOWNED
+/*/extensions/wasm_runtime/ @mpwarres @kyessenov @lizan
 # common matcher
 /*/extensions/common/matcher @mattklein123 @yangminzhu
 /*/extensions/common/proxy_protocol @alyssawilk @wez470
@@ -137,7 +137,7 @@ extensions/filters/common/original_src @klarose @mattklein123
 /*/extensions/stat_sinks/metrics_service @ramaraochavali @jmarantz
 /*/extensions/stat_sinks/open_telemetry @ohadvano @mattklein123
 # webassembly stat-sink extensions
-/*/extensions/stat_sinks/wasm @mpwarres @lizan @UNOWNED
+/*/extensions/stat_sinks/wasm @mpwarres @kyessenov @lizan
 /*/extensions/resource_monitors/injected_resource @eziskind @yanavlasov
 /*/extensions/resource_monitors/common @eziskind @yanavlasov @nezdolik
 /*/extensions/resource_monitors/fixed_heap @eziskind @yanavlasov @nezdolik

api/bazel/repository_locations.bzl

@@ -144,11 +144,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "buf",
         project_desc = "A new way of working with Protocol Buffers.",  # Used for breaking change detection in API protobufs
         project_url = "https://buf.build",
-        version = "1.42.0",
-        sha256 = "412c8bdc2a4361f796df59735eb8b8f1cb85f7bfa91f443e471bf0b090d7c6c2",
+        version = "1.45.0",
+        sha256 = "deebd48a6bf85b073d7c7800c17b330376487e86852d4905c76a205b6fd795d4",
         strip_prefix = "buf",
         urls = ["https://github.com/bufbuild/buf/releases/download/v{version}/buf-Linux-x86_64.tar.gz"],
-        release_date = "2024-09-18",
+        release_date = "2024-10-08",
         use_category = ["api"],
         license = "Apache-2.0",
         license_url = "https://github.com/bufbuild/buf/blob/v{version}/LICENSE",

bazel/BUILD

@@ -14,7 +14,6 @@ envoy_package()
 
 exports_files([
     "gen_sh_test_runner.sh",
-    "generate_release_hash.sh",
     "sh_test_wrapper.sh",
     "test_for_benchmark_wrapper.sh",
     "repository_locations.bzl",

bazel/protobuf.patch

@@ -1,11 +1,11 @@
 diff --git a/BUILD.bazel b/BUILD.bazel
-index 0f6e41e3a..c0d2bbccf 100644
+index 42175b5ed..8b313e0f6 100644
 --- a/BUILD.bazel
 +++ b/BUILD.bazel
-@@ -454,14 +454,79 @@ cc_library(
+@@ -222,14 +222,79 @@ alias(
      visibility = ["//visibility:public"],
  )
-
+ 
 +# Envoy: Patch
 +
  cc_binary(
@@ -16,7 +16,7 @@ index 0f6e41e3a..c0d2bbccf 100644
      visibility = ["//visibility:public"],
      deps = ["//src/google/protobuf/compiler:protoc_lib"],
  )
-
+ 
 +# Lifted from `rules_proto`
 +config_setting(
 +    name = "linux-aarch_64",
@@ -84,36 +84,51 @@ index 0f6e41e3a..c0d2bbccf 100644
      name = "protoc_static",
      copts = COPTS,
 diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
-index e7555ee10..a93beb1c5 100644
+index 022974824..418779fd2 100755
 --- a/python/google/protobuf/__init__.py
 +++ b/python/google/protobuf/__init__.py
 @@ -8,3 +8,10 @@
  # Copyright 2007 Google Inc. All Rights Reserved.
-
- __version__ = '5.26.1'
+ 
+ __version__ = '5.28.2'
 +
 +
 +if __name__ != '__main__':
 +    try:
 +        __import__('pkg_resources').declare_namespace(__name__)
 +    except ImportError:
 +        __path__ = __import__('pkgutil').extend_path(__path__, __name__)
+diff --git a/src/google/protobuf/compiler/BUILD.bazel b/src/google/protobuf/compiler/BUILD.bazel
+index 3f5624d5f..e194b172f 100644
+--- a/src/google/protobuf/compiler/BUILD.bazel
++++ b/src/google/protobuf/compiler/BUILD.bazel
+@@ -517,7 +517,7 @@ cc_library(
+     srcs = ["retention.cc"],
+     hdrs = ["retention.h"],
+     strip_include_prefix = "/src",
+-    visibility = ["//src/google/protobuf:__subpackages__"],
++    visibility = ["//visibility:public"],
+     deps = [
+         "//src/google/protobuf",
+         "//src/google/protobuf:port",
 diff --git a/src/google/protobuf/io/BUILD.bazel b/src/google/protobuf/io/BUILD.bazel
+index 66819966b..446d75420 100644
 --- a/src/google/protobuf/io/BUILD.bazel
 +++ b/src/google/protobuf/io/BUILD.bazel
-@@ -138,6 +138,6 @@ cc_library(
+@@ -158,7 +158,7 @@ cc_library(
          "@com_google_absl//absl/log:absl_log",
      ] + select({
          "//build_defs:config_msvc": [],
 -        "//conditions:default": ["@zlib"],
 +        "//conditions:default": ["@envoy//bazel/foreign_cc:zlib"],
      }),
  )
-
+ 
 diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
---- a/src/google/protobuf/port_def.inc	2023-06-27 01:17:34.917105764 +0000
-+++ b/src/google/protobuf/port_def.inc	2023-06-27 01:18:12.069060142 +0000
-@@ -1004,7 +1004,7 @@
+index 37d80e591..3dddd4ecf 100644
+--- a/src/google/protobuf/port_def.inc
++++ b/src/google/protobuf/port_def.inc
+@@ -856,7 +856,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
  #pragma clang diagnostic ignored "-Wshorten-64-to-32"
  // Turn on -Wdeprecated-enum-enum-conversion. This deprecation comes in C++20
  // via http://wg21.link/p1120r0.
@@ -122,27 +137,10 @@ diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
  // This error has been generally flaky, but we need to disable it specifically
  // to fix https://github.com/protocolbuffers/protobuf/issues/12313
  #pragma clang diagnostic ignored "-Wunused-parameter"
-diff --git a/src/google/protobuf/compiler/BUILD.bazel b/src/google/protobuf/compiler/BUILD.bazel
---- a/src/google/protobuf/compiler/BUILD.bazel
-+++ b/src/google/protobuf/compiler/BUILD.bazel
-@@ -306,7 +306,7 @@
-     srcs = ["retention.cc"],
-     hdrs = ["retention.h"],
-     strip_include_prefix = "/src",
--    visibility = ["//src/google/protobuf:__subpackages__"],
-+    visibility = ["//visibility:public"],
-     deps = [
-         "//src/google/protobuf",
-         "//src/google/protobuf:port",
-
-diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
-index 1c6a24945..c27d0bf2a 100644
---- a/src/google/protobuf/port_def.inc
-+++ b/src/google/protobuf/port_def.inc
-@@ -1062,6 +1062,9 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
+@@ -925,6 +925,9 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
  #pragma warning(disable: 4125)
  #endif
-
+ 
 +#if defined(__GNUC__)
 +#pragma GCC diagnostic ignored "-Wundef"
 +#endif

bazel/repo.bzl

@@ -66,9 +66,27 @@ envoy_entry_point(
     init_data = [":__init__.py"],
 )
 
+genrule(
+    name = "generate_release_hash_bin",
+    outs = ["generate_release_hash.sh"],
+    cmd = """
+    echo "
+#!/usr/bin/env bash
+
+set -e -o pipefail
+
+git ls-remote --tags https://github.com/envoyproxy/envoy \\\\
+    | grep -E 'refs/tags/v[0-9]+\\\\.[0-9]+\\\\.[0-9]+$$' \\\\
+    | sort -u \\\\
+    | sha256sum \\\\
+    | cut -d ' ' -f 1" > $@
+    chmod +x $@
+    """
+)
+
 sh_binary(
     name = "generate_release_hash",
-    srcs = ["generate_release_hash.sh"],
+    srcs = [":generate_release_hash_bin"],
     visibility = ["//visibility:public"],
 )
 
@@ -80,11 +98,11 @@ genrule(
     name = "default_release_hash",
     outs = ["default_release_hash.txt"],
     cmd = """
-    $(location @envoy//bazel:generate_release_hash.sh) %s > $@
-    """ % PATH,
+    $(location :generate_release_hash) > $@
+    """,
     stamp = True,
     tags = ["no-remote-exec"],
-    tools = ["@envoy//bazel:generate_release_hash.sh"],
+    tools = [":generate_release_hash"],
 )
 
 label_flag(

bazel/repository_locations.bzl

@@ -1,18 +1,18 @@
 # This should match the schema defined in external_deps.bzl.
 
-PROTOBUF_VERSION = "26.1"
+PROTOBUF_VERSION = "28.2"
 
 # These names of these deps *must* match the names used in `/bazel/protobuf.patch`,
 # and both must match the names from the protobuf releases (see
 # https://github.com/protocolbuffers/protobuf/releases).
 # The names change in upcoming versions.
 # The shas are calculated from the downloads on the releases page.
 PROTOC_VERSIONS = dict(
-    linux_aarch_64 = "64a3b3b5f7dac0c8f9cf1cb85b2b1a237eb628644f6bcb0fb8f23db6e0d66181",
-    linux_x86_64 = "a7be2928c0454f132c599e25b79b7ad1b57663f2337d7f7e468a1d59b98ec1b0",
-    osx_aarch_64 = "26a29befa8891ecc48809958c909d284f2b9539a2eb47f22cadc631fe6abe8fd",
-    osx_x86_64 = "febd8821c3a2a23f72f4641471e0ab6486f4fb07b68111490a27a31681465b3c",
-    win64 = "9090d135a1159042b13b4e51b210e40cb820d85a5032a6eca5f9b3ca3bdfb539",
+    linux_aarch_64 = "91d8253cdc0f0f0fc51c2b69c80677996632f525ad84504bfa5b4ee38ad3e49c",
+    linux_x86_64 = "2febfd42b59ce93a28eb789019a470a3dd0449619bc04f84dad1333da261dec1",
+    osx_aarch_64 = "7bb048f52841789d9ec61983be0ce4c9e4fb3bd9a143462820ba9a3be0a03797",
+    osx_x86_64 = "232f07d12bf4806207a79ec2c7378301c52e6f2f7efdd21c0dd416f0bda103ec",
+    win64 = "4bde19271ed7cab9003570f28c6e4c4d71963eaf1211a86bf3bb25d9b895177a",
 )
 
 REPOSITORY_LOCATIONS_SPEC = dict(
@@ -33,11 +33,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "Bazel features",
         project_desc = "Support Bazel feature detection from starlark",
         project_url = "https://github.com/bazel-contrib/bazel_features",
-        version = "1.17.0",
-        sha256 = "bdc12fcbe6076180d835c9dd5b3685d509966191760a0eb10b276025fcb76158",
+        version = "1.19.0",
+        sha256 = "3646ffd447753490b77d2380fa63f4d55dd9722e565d84dfda01536b48e183da",
         urls = ["https://github.com/bazel-contrib/bazel_features/releases/download/v{version}/bazel_features-v{version}.tar.gz"],
         strip_prefix = "bazel_features-{version}",
-        release_date = "2024-09-13",
+        release_date = "2024-10-09",
         use_category = ["build"],
         license = "Apache-2.0",
         license_url = "https://github.com/bazel-contrib/bazel_features/blob/v{version}/LICENSE",
@@ -73,10 +73,10 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "Apple Rules for Bazel",
         project_desc = "Bazel rules for Apple platforms",
         project_url = "https://github.com/bazelbuild/rules_apple",
-        version = "3.9.0",
-        sha256 = "f8fa96115c33e128cb72e9b7118a5f9294731a7dda8e36d04ddb582671f48dc1",
+        version = "3.9.2",
+        sha256 = "86025f64d723a66438787d089bea4a7bc387877229f927dcb72ee26a8db96917",
         urls = ["https://github.com/bazelbuild/rules_apple/releases/download/{version}/rules_apple.{version}.tar.gz"],
-        release_date = "2024-09-18",
+        release_date = "2024-09-24",
         use_category = ["build"],
         license = "Apache-2.0",
         license_url = "https://github.com/bazelbuild/rules_apple/blob/{version}/LICENSE",
@@ -167,12 +167,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "Aspect Bazel helpers",
         project_desc = "Base Starlark libraries and basic Bazel rules which are useful for constructing rulesets and BUILD files",
         project_url = "https://github.com/aspect-build/bazel-lib",
-        version = "2.9.0",
-        sha256 = "04299d5460ef8ed92f1251d468a3c1ce746f9f3003047c728383c42048950cb5",
+        version = "2.9.2",
+        sha256 = "c96a40d7d054950812df4ee4bcb96c424ddbb9d044bc6bcac11468f25e0193d4",
         strip_prefix = "bazel-lib-{version}",
         urls = ["https://github.com/aspect-build/bazel-lib/archive/v{version}.tar.gz"],
         use_category = ["build"],
-        release_date = "2024-09-19",
+        release_date = "2024-10-15",
         cpe = "N/A",
         license = "Apache-2.0",
         license_url = "https://github.com/aspect-build/bazel-lib/blob/v{version}/LICENSE",
@@ -240,12 +240,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "Perfetto",
         project_desc = "Perfetto Tracing SDK",
         project_url = "https://perfetto.dev/",
-        version = "47.0",
-        sha256 = "9bbd38a0f074038bde6ccbcf5f2ff32587eb60faec254932268ecb6f17f18186",
+        version = "48.1",
+        sha256 = "8d1c6bf44f1bdb098ab70cd60da3ce6b6e731e4eb21dd52b2527cbdcf85d984d",
         strip_prefix = "perfetto-{version}/sdk",
         urls = ["https://github.com/google/perfetto/archive/v{version}.tar.gz"],
         use_category = ["dataplane_core", "controlplane"],
-        release_date = "2024-08-07",
+        release_date = "2024-10-15",
         cpe = "N/A",
         license = "Apache-2.0",
         license_url = "https://github.com/google/perfetto/blob/v{version}/LICENSE",
@@ -591,8 +591,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "OpenTelemetry",
         project_desc = "Observability framework and toolkit designed to create and manage telemetry data such as traces, metrics, and logs.",
         project_url = "https://opentelemetry.io",
-        version = "1.16.1",
-        sha256 = "b8a78bb2a3a78133dbb08bcd04342f4b1e03cb4a19079b8416d408d905fffc37",
+        version = "1.17.0",
+        sha256 = "13542725463f1ea106edaef078c2276065cf3da998cb1d3dcf92630daa3f64d4",
         strip_prefix = "opentelemetry-cpp-{version}",
         urls = ["https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v{version}.tar.gz"],
         use_category = ["observability_ext"],
@@ -601,7 +601,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
             "envoy.tracers.opentelemetry.samplers.always_on",
             "envoy.tracers.opentelemetry.samplers.dynatrace",
         ],
-        release_date = "2024-07-17",
+        release_date = "2024-10-07",
         cpe = "N/A",
         license = "Apache-2.0",
         license_url = "https://github.com/open-telemetry/opentelemetry-cpp/blob/v{version}/LICENSE",
@@ -952,11 +952,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         # test/common/json:gen_excluded_unicodes to recompute the ranges
         # excluded from differential fuzzing that are populated in
         # test/common/json/json_sanitizer_test_util.cc.
-        sha256 = "4fc5ff1b2c339fb86cd3a25f0b5311478ab081e65ad258c6789359cd84d421f8",
+        sha256 = "b2340aa47faf7ef10a0328190319d3f3bee1b24f426d4ce8f4253b6f27ce16db",
         strip_prefix = "protobuf-{version}",
         urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v{version}/protobuf-{version}.tar.gz"],
         use_category = ["dataplane_core", "controlplane"],
-        release_date = "2024-03-27",
+        release_date = "2024-09-18",
         cpe = "cpe:2.3:a:google:protobuf:*",
         license = "Protocol Buffers",
         license_url = "https://github.com/protocolbuffers/protobuf/blob/v{version}/LICENSE",
@@ -1469,8 +1469,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "Bazel rust rules",
         project_desc = "Bazel rust rules (used by Wasm)",
         project_url = "https://github.com/bazelbuild/rules_rust",
-        version = "0.51.0",
-        sha256 = "042acfb73469b2d1848fe148d81c3422c61ea47a9e1900f1c9ec36f51e8e7193",
+        version = "0.52.2",
+        sha256 = "671ddb3fe5ebcf9dd34d051eca7352fbaf33fa53bf61eed0b75a4c34829e5480",
         # Note: rules_rust should point to the releases, not archive to avoid the hassle of bootstrapping in crate_universe.
         # This is described in https://bazelbuild.github.io/rules_rust/crate_universe.html#setup, otherwise bootstrap
         # is required which in turn requires a system CC toolchains, not the bazel controlled ones.
@@ -1482,7 +1482,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         ],
         implied_untracked_deps = ["rules_cc"],
         extensions = ["envoy.wasm.runtime.wasmtime"],
-        release_date = "2024-09-19",
+        release_date = "2024-10-07",
         cpe = "N/A",
         license = "Apache-2.0",
         license_url = "https://github.com/bazelbuild/rules_rust/blob/{version}/LICENSE.txt",
@@ -1592,7 +1592,7 @@ def _compiled_protoc_deps(locations, versions):
             sha256 = sha,
             urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v{version}/protoc-{version}-%s.zip" % platform.replace("_", "-", 1)],
             use_category = ["dataplane_core", "controlplane"],
-            release_date = "2024-03-27",
+            release_date = "2024-09-18",
             cpe = "N/A",
             license = "Protocol Buffers",
             license_url = "https://github.com/protocolbuffers/protobuf/blob/v{version}/LICENSE",