Revert, back to solution 1.

open-telemetry · Oct 9, 2023 · ed66352 · ed66352
1 parent ae1fdad
commit ed66352
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/parent.h b/sdk/include/opentelemetry/sdk/trace/samplers/parent.h
@@ -52,8 +52,8 @@ class ParentBasedSampler : public Sampler
   nostd::string_view GetDescription() const noexcept override;
 
 private:
-  std::shared_ptr<Sampler> delegate_sampler_;
-  std::string description_;
+  const std::shared_ptr<Sampler> delegate_sampler_;
+  const std::string description_;
 };
 }  // namespace trace
 }  // namespace sdk

diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/trace_id_ratio.h b/sdk/include/opentelemetry/sdk/trace/samplers/trace_id_ratio.h
@@ -64,7 +64,7 @@ class TraceIdRatioBasedSampler : public Sampler
 
 private:
   std::string description_;
-  uint64_t threshold_;
+  const uint64_t threshold_;
 };
 }  // namespace trace
 }  // namespace sdk

diff --git a/sdk/test/trace/sampler_benchmark.cc b/sdk/test/trace/sampler_benchmark.cc
@@ -42,6 +42,11 @@ void BM_AlwaysOnSamplerConstruction(benchmark::State &state)
 }
 BENCHMARK(BM_AlwaysOnSamplerConstruction);
 
+/*
+  Fails to build with GCC.
+  See upstream bug: https://github.com/google/benchmark/issues/1675
+*/
+#if 0
 void BM_ParentBasedSamplerConstruction(benchmark::State &state)
 {
   while (state.KeepRunning())
@@ -59,6 +64,7 @@ void BM_TraceIdRatioBasedSamplerConstruction(benchmark::State &state)
   }
 }
 BENCHMARK(BM_TraceIdRatioBasedSamplerConstruction);
+#endif
 
 // Sampler Helper Function
 void BenchmarkShouldSampler(Sampler &sampler, benchmark::State &state)