fix: metrics shutdown

opentibiabr · Dec 5, 2023 · 48c26b9 · 48c26b9
1 parent b19cb0a
commit 48c26b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/lib/metrics/metrics.cpp b/src/lib/metrics/metrics.cpp
@@ -17,7 +17,7 @@ Metrics &Metrics::getInstance() {
 }
 
 void Metrics::init(Options opts) {
-	provider = metrics_sdk::MeterProviderFactory::Create();
+	auto provider = metrics_sdk::MeterProviderFactory::Create();
 	auto* p = static_cast<metrics_sdk::MeterProvider*>(provider.get());
 
 	if (opts.enableOStreamExporter) {
@@ -70,7 +70,7 @@ void Metrics::init(Options opts) {
 	}
 
 	if (opts.enableOStreamExporter || opts.enablePrometheusExporter) {
-		metrics_api::Provider::SetMeterProvider(provider);
+		metrics_api::Provider::SetMeterProvider(std::move(provider));
 	} else {
 		std::shared_ptr<metrics_api::MeterProvider> none;
 		metrics_api::Provider::SetMeterProvider(none);

diff --git a/src/lib/metrics/metrics.hpp b/src/lib/metrics/metrics.hpp
@@ -145,12 +145,11 @@ namespace metrics {
 		phmap::flat_hash_map<std::string, Counter<double>> counters;
 
 		Meter getMeter() {
-			return provider->GetMeter(meterName, otelVersion);
+			return metrics_api::Provider::GetMeterProvider()->GetMeter(meterName, otelVersion);
 		}
 
 	private:
 		std::mutex mutex_;
-		std::shared_ptr<opentelemetry::metrics::MeterProvider> provider;
 
 		std::string meterName { "stats" };
 		std::string otelVersion { "1.2.0" };