Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/devel' into bug-fix/content-type-defaulting

This commit is contained in:
lamai93 2019-11-22 15:38:08 +01:00
parent ae3fb604e2 b194409654
commit 456bbe52e7
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -1,6 +1,9 @@
devel devel
----- -----
* REMOTE and GATHER no longer make subqueries unsuitable for the
`splice-subqueries` optimization.
* New internal counter and histogram support. * New internal counter and histogram support.
* Add a Prometheus endpoint for metrics, expose new metrics, old statistics * Add a Prometheus endpoint for metrics, expose new metrics, old statistics

12
arangod/RestServer/MetricsFeature.cpp
View File

@ -21,7 +21,6 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#include "MetricsFeature.h" #include "MetricsFeature.h"
#include "ApplicationFeatures/GreetingsFeaturePhase.h" #include "ApplicationFeatures/GreetingsFeaturePhase.h"
#include "Basics/application-exit.h" #include "Basics/application-exit.h"
#include "Logger/LogMacros.h" #include "Logger/LogMacros.h"
@ -31,6 +30,7 @@
#include "ProgramOptions/Section.h" #include "ProgramOptions/Section.h"
#include "RestServer/Metrics.h" #include "RestServer/Metrics.h"
#include "RocksDBEngine/RocksDBEngine.h" #include "RocksDBEngine/RocksDBEngine.h"
#include "MMFiles/MMFilesEngine.h"
#include "Statistics/StatisticsFeature.h" #include "Statistics/StatisticsFeature.h"
#include "StorageEngine/EngineSelectorFeature.h" #include "StorageEngine/EngineSelectorFeature.h"
#include "StorageEngine/StorageEngine.h" #include "StorageEngine/StorageEngine.h"
@ -72,16 +72,12 @@ void MetricsFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {}
void MetricsFeature::validateOptions(std::shared_ptr<ProgramOptions>) {} void MetricsFeature::validateOptions(std::shared_ptr<ProgramOptions>) {}
void MetricsFeature::prepare() {} void MetricsFeature::unprepare() {
void MetricsFeature::start() {
TRI_ASSERT(isEnabled());
}
void MetricsFeature::stop() {
METRICS = nullptr; METRICS = nullptr;
} }
void MetricsFeature::prepare() {}
double time() { double time() {
return std::chrono::duration<double>( // time since epoch in seconds return std::chrono::duration<double>( // time since epoch in seconds
std::chrono::system_clock::now().time_since_epoch()) std::chrono::system_clock::now().time_since_epoch())

3
arangod/RestServer/MetricsFeature.h
View File

@ -45,8 +45,7 @@ class MetricsFeature final : public application_features::ApplicationFeature {
void collectOptions(std::shared_ptr<options::ProgramOptions>) override final; void collectOptions(std::shared_ptr<options::ProgramOptions>) override final;
void validateOptions(std::shared_ptr<options::ProgramOptions>) override final; void validateOptions(std::shared_ptr<options::ProgramOptions>) override final;
void prepare() override final; void prepare() override final;
void start() override final; void unprepare() override final;
void stop() override final;
template<typename T> Histogram<T>& template<typename T> Histogram<T>&
histogram (std::string const& name, size_t const& buckets, T const& low, histogram (std::string const& name, size_t const& buckets, T const& low,