Skip to content

change regex UI prompt to say 'Google re2' rather than ecmascript in the description #23486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggreenway merged 2 commits into from
Oct 17, 2022
+4 −4
Merged

change regex UI prompt to say 'Google re2' rather than ecmascript in the description #23486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17aa931
change regex UI prompt to say 'Google re2' rather than ecmascript in …
jmarantz Oct 13, 2022
e146fff
fix test expectations.
jmarantz Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/server/admin/admin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ AdminImpl::AdminImpl(const std::string& profile_path, Server::Instance& server,
"Render text_readouts as new gaugues with value 0 (increases Prometheus "
"data size)"},
{ParamDescriptor::Type::String, "filter",
"Regular expression (ecmascript) for filtering stats"}}),
"Regular expression (Google re2) for filtering stats"}}),
makeHandler("/stats/recentlookups", "Show recent stat-name lookups",
MAKE_ADMIN_HANDLER(stats_handler_.handlerStatsRecentLookups), false, false),
makeHandler("/stats/recentlookups/clear", "clear list of stat-name lookups and counter",
Expand Down
2 changes: 1 addition & 1 deletion source/server/admin/stats_handler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ Admin::UrlHandler StatsHandler::statsHandler() {
{{Admin::ParamDescriptor::Type::Boolean, "usedonly",
"Only include stats that have been written by system since restart"},
{Admin::ParamDescriptor::Type::String, "filter",
"Regular expression (ecmascript) for filtering stats"},
"Regular expression (Google re2) for filtering stats"},
{Admin::ParamDescriptor::Type::Enum, "format", "Format to use", {"html", "text", "json"}},
{Admin::ParamDescriptor::Type::Enum,
"type",
Expand Down
4 changes: 2 additions & 2 deletions test/server/admin/admin_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,14 @@ TEST_P(AdminInstanceTest, Help) {
/server_info: print server version/status information
/stats: print server stats
usedonly: Only include stats that have been written by system since restart
filter: Regular expression (ecmascript) for filtering stats
filter: Regular expression (Google re2) for filtering stats
format: Format to use; One of (html, text, json)
type: Stat types to include.; One of (All, Counters, Histograms, Gauges, TextReadouts)
histogram_buckets: Histogram bucket display mode; One of (cumulative, disjoint, none)
/stats/prometheus: print server stats in prometheus format
usedonly: Only include stats that have been written by system since restart
text_readouts: Render text_readouts as new gaugues with value 0 (increases Prometheus data size)
filter: Regular expression (ecmascript) for filtering stats
filter: Regular expression (Google re2) for filtering stats
/stats/recentlookups: Show recent stat-name lookups
/stats/recentlookups/clear (POST): clear list of stat-name lookups and counter
/stats/recentlookups/disable (POST): disable recording of reset stat-name lookup names
Expand Down