From 2d3bdec3778568ae6369a31203b740d83dd2a275 Mon Sep 17 00:00:00 2001 From: Andy Fong Date: Wed, 4 Feb 2026 16:52:19 -0500 Subject: [PATCH 1/5] tracking envoy main 20260204 --- api/envoy/config/filter/http/transformation/v2/BUILD | 2 +- bazel/extensions/extensions_build_config.bzl | 7 ++++--- bazel/repository_locations.bzl | 4 ++-- changelog/v1.38.0-beta1/track-envoy-main-20260204.yaml | 4 ++++ 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 changelog/v1.38.0-beta1/track-envoy-main-20260204.yaml diff --git a/api/envoy/config/filter/http/transformation/v2/BUILD b/api/envoy/config/filter/http/transformation/v2/BUILD index 649334859..f21299df8 100644 --- a/api/envoy/config/filter/http/transformation/v2/BUILD +++ b/api/envoy/config/filter/http/transformation/v2/BUILD @@ -16,7 +16,7 @@ api_proto_package( "@envoy_api//envoy/type:pkg", "@envoy_api//envoy/type/matcher/v3:pkg", "@envoy_api//envoy/type/matcher:pkg", - "@com_github_cncf_xds//xds/type/matcher/v3:pkg", + "@xds//xds/type/matcher/v3:pkg", ], visibility = ["//visibility:public"], ) diff --git a/bazel/extensions/extensions_build_config.bzl b/bazel/extensions/extensions_build_config.bzl index 1f2e52117..99ad2877b 100644 --- a/bazel/extensions/extensions_build_config.bzl +++ b/bazel/extensions/extensions_build_config.bzl @@ -595,7 +595,7 @@ EXTENSIONS = { "envoy.geoip_providers.maxmind": "//source/extensions/geoip_providers/maxmind:config", # - # cluster specifier plugin + # Cluster specifier plugin # "envoy.router.cluster_specifier_plugin.lua": "//source/extensions/router/cluster_specifiers/lua:config", "envoy.router.cluster_specifier_plugin.matcher": "//source/extensions/router/cluster_specifiers/matcher:config", @@ -614,8 +614,9 @@ EXTENSIONS = { "envoy.tls.certificate_selectors.on_demand_secret": "//source/extensions/transport_sockets/tls/cert_selectors/on_demand:config", # Certificate mappers - "envoy.tls.certificate_mappers.static_name": "//source/extensions/transport_sockets/tls/cert_mappers/static_name:config", - "envoy.tls.certificate_mappers.sni": "//source/extensions/transport_sockets/tls/cert_mappers/sni:config", + "envoy.tls.certificate_mappers.sni": "//source/extensions/transport_sockets/tls/cert_mappers/sni:config", + "envoy.tls.certificate_mappers.static_name": "//source/extensions/transport_sockets/tls/cert_mappers/static_name:config", + "envoy.tls.upstream_certificate_mappers.filter_state_override": "//source/extensions/transport_sockets/tls/cert_mappers/filter_state_override:config", # Local address selectors "envoy.upstream.local_address_selector.filter_state_override": "//source/extensions/local_address_selectors/filter_state_override:config", diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 7a8e58467..154e67959 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -2,8 +2,8 @@ REPOSITORY_LOCATIONS = dict( # can't have more than one comment between envoy line and commit line in # order to accommodate `check_extensions_build_config.sh` envoy = dict( - # envoy v1.37.0 - commit = "6d9bb7d9a85d616b220d1f8fe67b61f82bbdb8d3", + # envoy main_20260204 + commit = "2b870753cb5e3a7881342a57c65be6eff13ac3d7", remote = "https://github.com/envoyproxy/envoy", ), inja = dict( diff --git a/changelog/v1.38.0-beta1/track-envoy-main-20260204.yaml b/changelog/v1.38.0-beta1/track-envoy-main-20260204.yaml new file mode 100644 index 000000000..7c97d7d58 --- /dev/null +++ b/changelog/v1.38.0-beta1/track-envoy-main-20260204.yaml @@ -0,0 +1,4 @@ +changelog: + - type: NON_USER_FACING + description: >- + Experimental tracking Envoy main 20260204 From f41720f9e0a0e0d8a935de034e82f92ff08ba1b7 Mon Sep 17 00:00:00 2001 From: Andy Fong Date: Wed, 4 Feb 2026 17:31:04 -0500 Subject: [PATCH 2/5] try to fix benchmark --- test/extensions/filters/http/transformation/BUILD | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/extensions/filters/http/transformation/BUILD b/test/extensions/filters/http/transformation/BUILD index 9b8e6d4a3..6b9e0db2e 100644 --- a/test/extensions/filters/http/transformation/BUILD +++ b/test/extensions/filters/http/transformation/BUILD @@ -2,6 +2,8 @@ licenses(["notice"]) # Apache 2 load( "@envoy//bazel:envoy_build_system.bzl", + "envoy_cc_benchmark_binary", + "envoy_benchmark_test", "envoy_cc_test_binary", "envoy_package", ) @@ -44,7 +46,7 @@ envoy_gloo_cc_test( ], ) -envoy_cc_test_binary( +envoy_cc_benchmark_binary( name = "inja_transformer_speed_test", srcs = ["inja_transformer_speed_test.cc"], repository = "@envoy", @@ -57,6 +59,11 @@ envoy_cc_test_binary( ], ) +envoy_benchmark_test( + name = "inja_transformer_speed_test_benchmark_test", + benchmark_binary = "inja_transformer_speed_test", +) + envoy_gloo_cc_test( name = "transformation_filter_test", srcs = ["transformation_filter_test.cc"], From 5e5c4ff1cfd268c9d083917cc6b0745ff63b8033 Mon Sep 17 00:00:00 2001 From: Andy Fong Date: Wed, 4 Feb 2026 17:52:30 -0500 Subject: [PATCH 3/5] fix benchmark take 2 --- test/extensions/filters/http/transformation/BUILD | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/test/extensions/filters/http/transformation/BUILD b/test/extensions/filters/http/transformation/BUILD index 6b9e0db2e..5025e4c91 100644 --- a/test/extensions/filters/http/transformation/BUILD +++ b/test/extensions/filters/http/transformation/BUILD @@ -2,8 +2,6 @@ licenses(["notice"]) # Apache 2 load( "@envoy//bazel:envoy_build_system.bzl", - "envoy_cc_benchmark_binary", - "envoy_benchmark_test", "envoy_cc_test_binary", "envoy_package", ) @@ -46,12 +44,13 @@ envoy_gloo_cc_test( ], ) -envoy_cc_benchmark_binary( +envoy_cc_test_binary( name = "inja_transformer_speed_test", srcs = ["inja_transformer_speed_test.cc"], repository = "@envoy", deps = [ "//source/extensions/filters/http/transformation:inja_transformer_lib", + "@envoy//test/benchmark:main", "@envoy//test/mocks/http:http_mocks", "@envoy//test/mocks/server:server_mocks", "@envoy//test/mocks/upstream:upstream_mocks", @@ -59,11 +58,6 @@ envoy_cc_benchmark_binary( ], ) -envoy_benchmark_test( - name = "inja_transformer_speed_test_benchmark_test", - benchmark_binary = "inja_transformer_speed_test", -) - envoy_gloo_cc_test( name = "transformation_filter_test", srcs = ["transformation_filter_test.cc"], From c0fdaa3860df7a7af34841b571cb3aa329ff6eb3 Mon Sep 17 00:00:00 2001 From: Andy Fong Date: Thu, 5 Feb 2026 09:23:57 -0500 Subject: [PATCH 4/5] update commit hash for benchmark rename --- bazel/repository_locations.bzl | 4 ++-- test/extensions/filters/http/transformation/BUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 154e67959..d0b1be31b 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -2,8 +2,8 @@ REPOSITORY_LOCATIONS = dict( # can't have more than one comment between envoy line and commit line in # order to accommodate `check_extensions_build_config.sh` envoy = dict( - # envoy main_20260204 - commit = "2b870753cb5e3a7881342a57c65be6eff13ac3d7", + # envoy main_20260205 + commit = "c2827dce46390aa88bffa84df3553239cfda0e66", remote = "https://github.com/envoyproxy/envoy", ), inja = dict( diff --git a/test/extensions/filters/http/transformation/BUILD b/test/extensions/filters/http/transformation/BUILD index 5025e4c91..bacdb489b 100644 --- a/test/extensions/filters/http/transformation/BUILD +++ b/test/extensions/filters/http/transformation/BUILD @@ -54,7 +54,7 @@ envoy_cc_test_binary( "@envoy//test/mocks/http:http_mocks", "@envoy//test/mocks/server:server_mocks", "@envoy//test/mocks/upstream:upstream_mocks", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) From 5a35c5fe2c2ea3d3c7a3856dd0f8245b06524061 Mon Sep 17 00:00:00 2001 From: Andy Fong Date: Thu, 5 Feb 2026 11:45:18 -0500 Subject: [PATCH 5/5] fixed build --- test/extensions/filters/http/transformation/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/test/extensions/filters/http/transformation/BUILD b/test/extensions/filters/http/transformation/BUILD index bacdb489b..f396ea978 100644 --- a/test/extensions/filters/http/transformation/BUILD +++ b/test/extensions/filters/http/transformation/BUILD @@ -50,7 +50,6 @@ envoy_cc_test_binary( repository = "@envoy", deps = [ "//source/extensions/filters/http/transformation:inja_transformer_lib", - "@envoy//test/benchmark:main", "@envoy//test/mocks/http:http_mocks", "@envoy//test/mocks/server:server_mocks", "@envoy//test/mocks/upstream:upstream_mocks",