wasm: use root stats scope for upstream filter stats by yueshangzuo · Pull Request #45242 · envoyproxy/envoy

yueshangzuo · 2026-05-25T11:18:28Z

Supersedes #45065. Implements the root-scope approach surfaced in that review discussion.

Commit Message:
wasm: use root stats scope for upstream filter stats

Additional Description:
Upstream HTTP Wasm filter stats currently use the cluster stats scope, while downstream HTTP Wasm filter stats use the root scope. This makes the same Wasm metric name produce different stat names depending on whether the plugin is loaded as a downstream or upstream filter.

This changes upstream HTTP Wasm filter stats to use the server-wide root stats scope by default, matching the downstream filter. In Prometheus, a counter previously exposed as envoy_cluster_wasmcustom_foo{envoy_cluster_name="X"} is now exposed as foo. The previous cluster-scope behavior can be temporarily restored with the envoy.reloadable_features.upstream_wasm_filter_uses_root_scope runtime guard set to false.

Risk Level: Medium

Testing:

git diff --check
bazel test -c dbg //test/extensions/filters/http/wasm:config_test
bazel build -c dbg envoy
Manual Envoy smoke test with upstream Wasm stats and runtime-guard rollback.

Docs Changes: N/A

Release Notes: Added in changelogs/current/minor_behavior_changes/wasm__upstream-http-wasm-stats-use-root-scope.rst.

Platform Specific Features: N/A

[Optional Runtime guard:]
envoy.reloadable_features.upstream_wasm_filter_uses_root_scope, defaults to true. Set to false to restore the previous upstream Wasm cluster-scope stats behavior.

[Optional Fixes #Issue:] N/A

[Optional Deprecated:] N/A

[Optional API Considerations:] N/A

[Optional AI Disclosure:]
This PR was prepared with assistance from generative AI; the code and behavior were reviewed and tested by the author.

repokitteh-read-only · 2026-05-25T11:18:35Z

CC @envoyproxy/runtime-guard-changes: FYI only for changes made to (source/common/runtime/runtime_features.cc).

🐱

Caused by: #45242 was opened by yueshangzuo.

see: more, trace.

yueshangzuo · 2026-05-27T11:23:17Z

@kyessenov Gentle ping when you get a chance. This PR implements the root-scope approach discussed in #45065.

kyessenov

Looks close, but I think test could be better.

kyessenov · 2026-05-27T22:53:38Z

+Upstream HTTP Wasm filter stats now use the server-wide root stats scope instead of the
+cluster stats scope, matching downstream HTTP Wasm filter scoping. Upstream Wasm custom metrics
+no longer carry a ``cluster.<cluster_name>.`` prefix; for example a counter previously exposed as
+``envoy_cluster_wasmcustom_foo{envoy_cluster_name="X"}`` is now ``foo``. Plugins that need


Is it wasmcustom_foo or just foo? I think the prefix still applies?

Done — split admin /stats vs Prometheus output to clarify the prefix behavior.

kyessenov · 2026-05-27T22:53:42Z

+  EXPECT_NE(nullptr,
+            TestUtility::findCounter(upstream_factory_context_.server_factory_context_.store_,
+                                     lifecycle_counter));
+  EXPECT_EQ(nullptr,


This should be a positive test, e.g. please spell out the full path for the stat.

yueshangzuo · 2026-05-28T03:59:53Z

/retest

yueshangzuo · 2026-05-28T07:34:41Z

/retest

yueshangzuo · 2026-06-01T02:06:22Z

@kyessenov Friendly ping — addressed both review comments in the latest push.

KBaichoo · 2026-06-11T16:46:53Z

PTAL @kyessenov

kyessenov

Minor comment to improve test. LMK.
/wait

kyessenov · 2026-06-11T19:05:14Z

+  const auto counter = TestUtility::findCounter(
+      upstream_factory_context_.server_factory_context_.store_, full_stat_name);
+  ASSERT_NE(nullptr, counter);
+}


This should be a positive test, e.g. please spell out the full path for the stat.

Updated with a positive check using the full literal stat path.

Upstream HTTP Wasm filter stats currently use the cluster stats scope, while downstream HTTP Wasm filter stats use the server-wide root scope. This causes upstream custom metrics to inherit the cluster prefix and Prometheus cluster label, even though Wasm extension stats should be scoped consistently across downstream and upstream filters. Use the server-wide root stats scope for upstream HTTP Wasm filter stats and keep the old cluster-scope behavior behind the envoy.reloadable_features.upstream_wasm_filter_uses_root_scope runtime guard. Setting the guard to false temporarily reverts to the previous behavior. Signed-off-by: Yueshang zuo <zuoyueshang.zys@alibaba-inc.com>

yueshangzuo · 2026-06-15T05:49:29Z

/retest

yueshangzuo · 2026-06-15T07:33:57Z

/retest

Supersedes envoyproxy#45065. Implements the root-scope approach surfaced in that review discussion. Commit Message: wasm: use root stats scope for upstream filter stats Additional Description: Upstream HTTP Wasm filter stats currently use the cluster stats scope, while downstream HTTP Wasm filter stats use the root scope. This makes the same Wasm metric name produce different stat names depending on whether the plugin is loaded as a downstream or upstream filter. This changes upstream HTTP Wasm filter stats to use the server-wide root stats scope by default, matching the downstream filter. In Prometheus, a counter previously exposed as `envoy_cluster_wasmcustom_foo{envoy_cluster_name="X"}` is now exposed as `foo`. The previous cluster-scope behavior can be temporarily restored with the `envoy.reloadable_features.upstream_wasm_filter_uses_root_scope` runtime guard set to `false`. Risk Level: Medium Testing: - `git diff --check` - `bazel test -c dbg //test/extensions/filters/http/wasm:config_test` - `bazel build -c dbg envoy` - Manual Envoy smoke test with upstream Wasm stats and runtime-guard rollback. Docs Changes: N/A Release Notes: Added in `changelogs/current/minor_behavior_changes/wasm__upstream-http-wasm-stats-use-root-scope.rst`. Platform Specific Features: N/A [Optional Runtime guard:] `envoy.reloadable_features.upstream_wasm_filter_uses_root_scope`, defaults to true. Set to false to restore the previous upstream Wasm cluster-scope stats behavior. [Optional Fixes #Issue:] N/A [Optional Deprecated:] N/A [Optional API Considerations:] N/A [Optional AI Disclosure:] This PR was prepared with assistance from generative AI; the code and behavior were reviewed and tested by the author. Signed-off-by: Yueshang zuo <zuoyueshang.zys@alibaba-inc.com>

yueshangzuo requested a review from kyessenov as a code owner May 25, 2026 11:18

yueshangzuo mentioned this pull request May 25, 2026

stats: strip inner custom namespaces in prometheus names #45065

Closed

yueshangzuo force-pushed the fix/upstream-wasm-root-scope branch from 9bf2bde to 7b6f121 Compare May 25, 2026 13:01

kyessenov requested changes May 27, 2026

View reviewed changes

kyessenov reviewed May 27, 2026

View reviewed changes

kyessenov self-assigned this May 27, 2026

yueshangzuo force-pushed the fix/upstream-wasm-root-scope branch from 7b6f121 to fd15232 Compare May 28, 2026 02:49

yueshangzuo force-pushed the fix/upstream-wasm-root-scope branch from fd15232 to aa2f87d Compare May 28, 2026 05:40

kyessenov reviewed Jun 11, 2026

View reviewed changes

repokitteh-read-only Bot added the waiting label Jun 11, 2026

yueshangzuo force-pushed the fix/upstream-wasm-root-scope branch from aa2f87d to 17f851f Compare June 15, 2026 04:02

repokitteh-read-only Bot removed the waiting label Jun 15, 2026

kyessenov approved these changes Jun 15, 2026

View reviewed changes

kyessenov merged commit ed71488 into envoyproxy:main Jun 15, 2026
27 of 28 checks passed

Uh oh!

Conversation

yueshangzuo commented May 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

repokitteh-read-only Bot commented May 25, 2026

Uh oh!

yueshangzuo commented May 27, 2026

Uh oh!

kyessenov left a comment

Choose a reason for hiding this comment

Uh oh!

kyessenov May 27, 2026

Choose a reason for hiding this comment

Uh oh!

yueshangzuo May 28, 2026

Choose a reason for hiding this comment

Uh oh!

kyessenov May 27, 2026

Choose a reason for hiding this comment

Uh oh!

yueshangzuo May 28, 2026

Choose a reason for hiding this comment

Uh oh!

yueshangzuo commented May 28, 2026

Uh oh!

yueshangzuo commented May 28, 2026

Uh oh!

yueshangzuo commented Jun 1, 2026

Uh oh!

KBaichoo commented Jun 11, 2026

Uh oh!

kyessenov left a comment

Choose a reason for hiding this comment

Uh oh!

kyessenov Jun 11, 2026

Choose a reason for hiding this comment

Uh oh!

yueshangzuo Jun 15, 2026

Choose a reason for hiding this comment

Uh oh!

yueshangzuo commented Jun 15, 2026

Uh oh!

yueshangzuo commented Jun 15, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

yueshangzuo commented May 25, 2026 •

edited

Loading