Skip to content

Commit bbc9d51

Browse files
fixed an error when giving OpenMetrics statistics (#1367)
1 parent 05eb531 commit bbc9d51

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

common/server/stats.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ const char* engine_default_char_stats() {
3939
return engine_default_prepare_stats(tl_stats_t{}, NULL);
4040
}
4141

42-
const char* engine_default_open_metrics_stat_stats() {
43-
// TODO: also return the size
42+
std::string_view engine_default_open_metrics_stat_stats() noexcept {
4443
return engine_default_prepare_stats(open_metrics_stats_t{}, nullptr);
4544
}
4645

common/server/stats.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <optional>
88
#include <string>
9+
#include <string_view>
910
#include <vector>
1011

1112
#include "common/stats/provider.h"
@@ -16,7 +17,7 @@ char* get_engine_default_prepare_stats_buffer();
1617
std::pair<char*, int> engine_default_prepare_stats_with_tag_mask(stats_t&& stats, const char* stats_prefix, unsigned int tag_mask);
1718
char* engine_default_prepare_stats(stats_t&& stats, const char* stats_prefix);
1819
const char* engine_default_char_stats();
19-
const char* engine_default_open_metrics_stat_stats();
20+
std::string_view engine_default_open_metrics_stat_stats() noexcept;
2021

2122
void engine_default_tl_stat_function(const std::optional<std::vector<std::string>>& sorted_filter_keys);
2223
extern int (*tl_stat_function)(const std::optional<std::vector<std::string>>& sorted_filter_keys);

server/php-master.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,6 +1211,7 @@ int php_master_http_execute(struct connection *c, int op) {
12111211
const std::string_view metrics_response = get_open_metrics_stats_http();
12121212
write_basic_http_header(c, 200, 0, metrics_response.length(), nullptr, "text/plain; charset=UTF-8");
12131213
write_out(&c->Out, metrics_response.data(), metrics_response.length());
1214+
return 0;
12141215
}
12151216

12161217
D->query_flags |= QF_ERROR;

0 commit comments

Comments
 (0)