fix data race on MeterContext::meters_ (#1668)

open-telemetry · Oct 9, 2022 · 7140166 · 7140166 · github-actions · Oct 9, 2022
1 parent 79a9471
commit 7140166
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/sdk/include/opentelemetry/sdk/metrics/meter_context.h b/sdk/include/opentelemetry/sdk/metrics/meter_context.h
@@ -125,6 +125,7 @@ class MeterContext : public std::enable_shared_from_this<MeterContext>
 
   std::atomic_flag shutdown_latch_ = ATOMIC_FLAG_INIT;
   opentelemetry::common::SpinLockMutex forceflush_lock_;
+  opentelemetry::common::SpinLockMutex storage_lock_;
 };
 
 }  // namespace metrics

diff --git a/sdk/src/metrics/meter_context.cc b/sdk/src/metrics/meter_context.cc
@@ -31,6 +31,7 @@ ViewRegistry *MeterContext::GetViewRegistry() const noexcept
 
 nostd::span<std::shared_ptr<Meter>> MeterContext::GetMeters() noexcept
 {
+  std::lock_guard<opentelemetry::common::SpinLockMutex> guard(storage_lock_);
   return nostd::span<std::shared_ptr<Meter>>{meters_};
 }
 
@@ -59,6 +60,7 @@ void MeterContext::AddView(std::unique_ptr<InstrumentSelector> instrument_select
 
 void MeterContext::AddMeter(std::shared_ptr<Meter> meter)
 {
+  std::lock_guard<opentelemetry::common::SpinLockMutex> guard(storage_lock_);
   meters_.push_back(meter);
 }
Benchmark suite	Current: `7140166`	Previous: `79a9471`	Ratio
`BM_BaselineBuffer/2`	`19381151.19934082` ns/iter	`4407275.915145874` ns/iter	`4.40`
`BM_BaselineBuffer/4`	`13398520.946502686` ns/iter	`6410932.64523429` ns/iter	`2.09`
`BM_LockFreeBuffer/1`	`3354575.0734150917` ns/iter	`318578.90525479906` ns/iter	`10.53`
`BM_LockFreeBuffer/2`	`4359145.402908325` ns/iter	`1137902.9750823975` ns/iter	`3.83`