Bug 1918166: Extend js::Metrics to also record telemetry to glean wit…

…hout a legacy mirror. r=tcampbell Differential Revision: https://phabricator.services.mozilla.com/D229005 UltraBlame original commit: 261fcdc7813b8c7d06d3feb39001fc40909eaede
marco-c · Nov 16, 2024 · a8e8048 · a8e8048
1 parent 6a621c7
commit a8e8048
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/js/public/friend/UsageStatistics.h b/js/public/friend/UsageStatistics.h
@@ -28,7 +28,7 @@ JSObject
 ;
 #
 define
-FOR_EACH_JS_METRIC
+FOR_EACH_JS_LEGACY_METRIC
 (
 _
 )
@@ -310,6 +310,28 @@ TimeDuration_US
 )
 #
 define
+FOR_EACH_JS_GLEAN_METRIC
+(
+_
+)
+#
+define
+FOR_EACH_JS_METRIC
+(
+_
+)
+\
+FOR_EACH_JS_LEGACY_METRIC
+(
+_
+)
+\
+FOR_EACH_JS_GLEAN_METRIC
+(
+_
+)
+#
+define
 ENUM_DEF
 (
 NAME

diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -14634,7 +14634,7 @@ sample
 \
 break
 ;
-FOR_EACH_JS_METRIC
+FOR_EACH_JS_LEGACY_METRIC
 (
 CASE_ACCUMULATE
 )
@@ -14643,14 +14643,7 @@ undef
 CASE_ACCUMULATE
 default
 :
-MOZ_CRASH
-(
-"
-Bad
-metric
-id
-"
-)
+break
 ;
 }
 switch