From bb5081a5992f4a1e382edbf04c3de5de2c4cf6ed Mon Sep 17 00:00:00 2001 From: rulex123 Date: Tue, 3 Nov 2026 09:06:35 +0100 Subject: [PATCH 1/2] ci: preserve OpenTelemetry proto 1.10.0 during Envoy updates Signed-off-by: rulex123 --- tools/update-sha.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/update-sha.sh b/tools/update-sha.sh index 91958d54..8bb1c67e 100755 --- a/tools/update-sha.sh +++ b/tools/update-sha.sh @@ -36,7 +36,10 @@ GOOGLEAPIS_SHA=$(find_sha googleapis) PGV_GIT_SHA=$(find_sha protoc-gen-validate) PROMETHEUS_SHA=$(find_sha prometheus-metrics-model) XDS_SHA=$(find_sha xds) -OPENTELEMETRY_SHA=$(find_sha opentelemetry-proto) +# Envoy's API module still pins OpenTelemetry to 1.8.0, while its old +# metadata and our shipped protos use 1.10.0. Preserve the generated API +# while we investigate the version mismatch with the Envoy community. +OPENTELEMETRY_SHA="1.10.0" # Envoy removed its direct CEL pin in envoyproxy/envoy#43265, so the API # lockfile now selects 0.24.0. Keep 0.25.1 to preserve our generated CEL API # while we clarify upstream whether api/ should restore that version. @@ -51,7 +54,7 @@ ENVOY_SHA=\"$ENVOY_VERSION\" GOOGLEAPIS_SHA=\"$GOOGLEAPIS_SHA\" PGV_VERSION=\"$PGV_GIT_SHA\" PROMETHEUS_SHA=\"$PROMETHEUS_SHA\" -OPENTELEMETRY_VERSION=\"$OPENTELEMETRY_SHA\" +OPENTELEMETRY_VERSION=\"$OPENTELEMETRY_SHA\" # Pinned for API compatibility. CEL_VERSION=\"$CEL_SHA\" # Pinned for API compatibility. XDS_SHA=\"$XDS_SHA\" " From fc073b8dff3217e733c1814d17b1a6bd30173774 Mon Sep 17 00:00:00 2001 From: rulex123 Date: Tue, 3 Nov 2026 09:09:50 +0100 Subject: [PATCH 2/2] ci: clarify OpenTelemetry pin follow-up Signed-off-by: rulex123 --- tools/update-sha.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-sha.sh b/tools/update-sha.sh index 8bb1c67e..ffac2642 100755 --- a/tools/update-sha.sh +++ b/tools/update-sha.sh @@ -38,7 +38,7 @@ PROMETHEUS_SHA=$(find_sha prometheus-metrics-model) XDS_SHA=$(find_sha xds) # Envoy's API module still pins OpenTelemetry to 1.8.0, while its old # metadata and our shipped protos use 1.10.0. Preserve the generated API -# while we investigate the version mismatch with the Envoy community. +# while we clarify upstream whether 1.10.0 should be restored. OPENTELEMETRY_SHA="1.10.0" # Envoy removed its direct CEL pin in envoyproxy/envoy#43265, so the API # lockfile now selects 0.24.0. Keep 0.25.1 to preserve our generated CEL API