diff --git a/performance_tests/performance_test.cpp b/performance_tests/performance_test.cpp index 87b6c8f..55f191f 100644 --- a/performance_tests/performance_test.cpp +++ b/performance_tests/performance_test.cpp @@ -118,7 +118,7 @@ int main(int argc, char* argv[]) { while (should_stop == false) { - r.counter(config->counterName, tags).Increment(); + r.CreateCounter(config->counterName, tags).Increment(); iterations.fetch_add(1, std::memory_order_relaxed); } }; diff --git a/spectator/registry.cpp b/spectator/registry.cpp index 5f6f676..29b7bf1 100644 --- a/spectator/registry.cpp +++ b/spectator/registry.cpp @@ -55,7 +55,7 @@ Registry::Registry(const Config& config) : m_config(config) } } -MeterId Registry::new_id(const std::string& name, const std::unordered_map& tags) const +MeterId Registry::CreateNewId(const std::string& name, const std::unordered_map& tags) const { MeterId new_meter_id(name, tags); @@ -66,89 +66,89 @@ MeterId Registry::new_id(const std::string& name, const std::unordered_mapm_config.GetExtraTags()); } -AgeGauge Registry::age_gauge(const std::string& name, const std::unordered_map& tags) const +AgeGauge Registry::CreateAgeGauge(const std::string& name, const std::unordered_map& tags) const { - return AgeGauge(new_id(name, tags)); + return AgeGauge(CreateNewId(name, tags)); } -AgeGauge Registry::age_gauge_with_id(const MeterId& meter_id) { return AgeGauge(meter_id); } +AgeGauge Registry::CreateAgeGauge(const MeterId& meter_id) const { return AgeGauge(meter_id); } -Counter Registry::counter(const std::string& name, const std::unordered_map& tags) const +Counter Registry::CreateCounter(const std::string& name, const std::unordered_map& tags) const { - return Counter(new_id(name, tags)); + return Counter(CreateNewId(name, tags)); } -Counter Registry::counter_with_id(const MeterId& meter_id) { return Counter(meter_id); } +Counter Registry::CreateCounter(const MeterId& meter_id) const { return Counter(meter_id); } -DistributionSummary Registry::distribution_summary(const std::string& name, +DistributionSummary Registry::CreateDistributionSummary(const std::string& name, const std::unordered_map& tags) const { - return DistributionSummary(new_id(name, tags)); + return DistributionSummary(CreateNewId(name, tags)); } -DistributionSummary Registry::distribution_summary_with_id(const MeterId& meter_id) +DistributionSummary Registry::CreateDistributionSummary(const MeterId& meter_id) const { return DistributionSummary(meter_id); } -Gauge Registry::gauge(const std::string& name, const std::unordered_map& tags, +Gauge Registry::CreateGauge(const std::string& name, const std::unordered_map& tags, const std::optional& ttl_seconds) const { - return Gauge(new_id(name, tags), ttl_seconds); + return Gauge(CreateNewId(name, tags), ttl_seconds); } -Gauge Registry::gauge_with_id(const MeterId& meter_id, const std::optional& ttl_seconds) +Gauge Registry::CreateGauge(const MeterId& meter_id, const std::optional& ttl_seconds) const { return Gauge(meter_id, ttl_seconds); } -MaxGauge Registry::max_gauge(const std::string& name, const std::unordered_map& tags) const +MaxGauge Registry::CreateMaxGauge(const std::string& name, const std::unordered_map& tags) const { - return MaxGauge(new_id(name, tags)); + return MaxGauge(CreateNewId(name, tags)); } -MaxGauge Registry::max_gauge_with_id(const MeterId& meter_id) { return MaxGauge(meter_id); } +MaxGauge Registry::CreateMaxGauge(const MeterId& meter_id) const { return MaxGauge(meter_id); } -MonotonicCounter Registry::monotonic_counter(const std::string& name, +MonotonicCounter Registry::CreateMonotonicCounter(const std::string& name, const std::unordered_map& tags) const { - return MonotonicCounter(new_id(name, tags)); + return MonotonicCounter(CreateNewId(name, tags)); } -MonotonicCounter Registry::monotonic_counter_with_id(const MeterId& meter_id) { return MonotonicCounter(meter_id); } +MonotonicCounter Registry::CreateMonotonicCounter(const MeterId& meter_id) const { return MonotonicCounter(meter_id); } -MonotonicCounterUint Registry::monotonic_counter_uint(const std::string& name, +MonotonicCounterUint Registry::CreateMonotonicCounterUint(const std::string& name, const std::unordered_map& tags) const { - return MonotonicCounterUint(new_id(name, tags)); + return MonotonicCounterUint(CreateNewId(name, tags)); } -MonotonicCounterUint Registry::monotonic_counter_uint_with_id(const MeterId& meter_id) +MonotonicCounterUint Registry::CreateMonotonicCounterUint(const MeterId& meter_id) const { return MonotonicCounterUint(meter_id); } -PercentileDistributionSummary Registry::pct_distribution_summary( +PercentileDistributionSummary Registry::CreatePercentDistributionSummary( const std::string& name, const std::unordered_map& tags) const { - return PercentileDistributionSummary(new_id(name, tags)); + return PercentileDistributionSummary(CreateNewId(name, tags)); } -PercentileDistributionSummary Registry::pct_distribution_summary_with_id(const MeterId& meter_id) +PercentileDistributionSummary Registry::CreatePercentDistributionSummary(const MeterId& meter_id) const { return PercentileDistributionSummary(meter_id); } -PercentileTimer Registry::pct_timer(const std::string& name, const std::unordered_map& tags) const +PercentileTimer Registry::CreatePercentTimer(const std::string& name, const std::unordered_map& tags) const { - return PercentileTimer(new_id(name, tags)); + return PercentileTimer(CreateNewId(name, tags)); } -PercentileTimer Registry::pct_timer_with_id(const MeterId& meter_id) { return PercentileTimer(meter_id); } +PercentileTimer Registry::CreatePercentTimer(const MeterId& meter_id) const { return PercentileTimer(meter_id); } -Timer Registry::timer(const std::string& name, const std::unordered_map& tags) const +Timer Registry::CreateTimer(const std::string& name, const std::unordered_map& tags) const { - return Timer(new_id(name, tags)); + return Timer(CreateNewId(name, tags)); } -Timer Registry::timer_with_id(const MeterId& meter_id) { return Timer(meter_id); } \ No newline at end of file +Timer Registry::CreateTimer(const MeterId& meter_id) const { return Timer(meter_id); } \ No newline at end of file diff --git a/spectator/registry.h b/spectator/registry.h index 8054b77..eb38169 100644 --- a/spectator/registry.h +++ b/spectator/registry.h @@ -19,63 +19,63 @@ class Registry explicit Registry(const Config& config); ~Registry() = default; - MeterId new_id(const std::string& name, const std::unordered_map& tags = {}) const; + MeterId CreateNewId(const std::string& name, const std::unordered_map& tags = {}) const; - AgeGauge age_gauge(const std::string& name, const std::unordered_map& tags = + AgeGauge CreateAgeGauge(const std::string& name, const std::unordered_map& tags = std::unordered_map()) const; - static AgeGauge age_gauge_with_id(const MeterId& meter_id); + AgeGauge CreateAgeGauge(const MeterId& meter_id) const; - Counter counter(const std::string& name, const std::unordered_map& tags = + Counter CreateCounter(const std::string& name, const std::unordered_map& tags = std::unordered_map()) const; - static Counter counter_with_id(const MeterId& meter_id); + Counter CreateCounter(const MeterId& meter_id) const; - DistributionSummary distribution_summary( + DistributionSummary CreateDistributionSummary( const std::string& name, const std::unordered_map& tags = std::unordered_map()) const; - static DistributionSummary distribution_summary_with_id(const MeterId& meter_id); + DistributionSummary CreateDistributionSummary(const MeterId& meter_id) const; - Gauge gauge( + Gauge CreateGauge( const std::string& name, const std::unordered_map& tags = std::unordered_map(), const std::optional& ttl_seconds = std::nullopt) const; - static Gauge gauge_with_id(const MeterId& meter_id, const std::optional& ttl_seconds = std::nullopt); + Gauge CreateGauge(const MeterId& meter_id, const std::optional& ttl_seconds = std::nullopt) const; - MaxGauge max_gauge(const std::string& name, const std::unordered_map& tags = + MaxGauge CreateMaxGauge(const std::string& name, const std::unordered_map& tags = std::unordered_map()) const; - static MaxGauge max_gauge_with_id(const MeterId& meter_id); + MaxGauge CreateMaxGauge(const MeterId& meter_id) const; - MonotonicCounter monotonic_counter( + MonotonicCounter CreateMonotonicCounter( const std::string& name, const std::unordered_map& tags = std::unordered_map()) const; - static MonotonicCounter monotonic_counter_with_id(const MeterId& meter_id); + MonotonicCounter CreateMonotonicCounter(const MeterId& meter_id) const; - MonotonicCounterUint monotonic_counter_uint( + MonotonicCounterUint CreateMonotonicCounterUint( const std::string& name, const std::unordered_map& tags = std::unordered_map()) const; - static MonotonicCounterUint monotonic_counter_uint_with_id(const MeterId& meter_id); + MonotonicCounterUint CreateMonotonicCounterUint(const MeterId& meter_id) const; - PercentileDistributionSummary pct_distribution_summary( + PercentileDistributionSummary CreatePercentDistributionSummary( const std::string& name, const std::unordered_map& tags = std::unordered_map()) const; - static PercentileDistributionSummary pct_distribution_summary_with_id(const MeterId& meter_id); + PercentileDistributionSummary CreatePercentDistributionSummary(const MeterId& meter_id) const; - PercentileTimer pct_timer(const std::string& name, const std::unordered_map& tags = + PercentileTimer CreatePercentTimer(const std::string& name, const std::unordered_map& tags = std::unordered_map()) const; - static PercentileTimer pct_timer_with_id(const MeterId& meter_id); + PercentileTimer CreatePercentTimer(const MeterId& meter_id) const; - Timer timer(const std::string& name, const std::unordered_map& tags = + Timer CreateTimer(const std::string& name, const std::unordered_map& tags = std::unordered_map()) const; - static Timer timer_with_id(const MeterId& meter_id); + Timer CreateTimer(const MeterId& meter_id) const; private: Config m_config; diff --git a/spectator/test_registry.cpp b/spectator/test_registry.cpp index 610bab4..77a7d65 100644 --- a/spectator/test_registry.cpp +++ b/spectator/test_registry.cpp @@ -10,7 +10,7 @@ TEST(RegistryTest, Close) { auto config = Config(WriterConfig(WriterTypes::Memory)); auto r = Registry(config); - auto c = r.counter("counter"); + auto c = r.CreateCounter("counter"); c.Increment(); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); @@ -24,8 +24,8 @@ TEST(RegistryTest, AgeGauge) { auto config = Config(WriterConfig(WriterTypes::Memory)); auto r = Registry(config); - auto g1 = r.age_gauge("age_gauge"); - auto g2 = r.age_gauge("age_gauge", {{"my-tags", "bar"}}); + auto g1 = r.CreateAgeGauge("age_gauge"); + auto g2 = r.CreateAgeGauge("age_gauge", {{"my-tags", "bar"}}); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); EXPECT_TRUE(memoryWriter->IsEmpty()); @@ -43,7 +43,7 @@ TEST(RegistryTest, AgeGaugeWithId) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto g = Registry::age_gauge_with_id(r.new_id("age_gauge", {{"my-tags", "bar"}})); + auto g = r.CreateAgeGauge(r.CreateNewId("age_gauge", {{"my-tags", "bar"}})); EXPECT_TRUE(memoryWriter->IsEmpty()); g.Set(0); @@ -55,8 +55,8 @@ TEST(RegistryTest, Counter) { auto config = Config(WriterConfig(WriterTypes::Memory)); auto r = Registry(config); - auto c1 = r.counter("counter"); - auto c2 = r.counter("counter", {{"my-tags", "bar"}}); + auto c1 = r.CreateCounter("counter"); + auto c2 = r.CreateCounter("counter", {{"my-tags", "bar"}}); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); EXPECT_TRUE(memoryWriter->IsEmpty()); @@ -73,7 +73,7 @@ TEST(RegistryTest, Counter) c2.Increment(2); EXPECT_EQ("c:counter,my-tags=bar:2.000000\n", memoryWriter->LastLine()); - r.counter("counter").Increment(3); + r.CreateCounter("counter").Increment(3); EXPECT_EQ("c:counter:3.000000\n", memoryWriter->LastLine()); } @@ -83,7 +83,7 @@ TEST(RegistryTest, CounterWithId) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto c = Registry::counter_with_id(r.new_id("counter", {{"my-tags", "bar"}})); + auto c = r.CreateCounter(r.CreateNewId("counter", {{"my-tags", "bar"}})); EXPECT_TRUE(memoryWriter->IsEmpty()); c.Increment(); @@ -94,7 +94,7 @@ TEST(RegistryTest, CounterWithId) EXPECT_EQ("c:counter,extra-tags=foo,my-tags=bar:2.000000\n", ParseProtocolLine(memoryWriter->LastLine()).value().to_string()); - r.counter("counter", {{"my-tags", "bar"}}).Increment(3); + r.CreateCounter("counter", {{"my-tags", "bar"}}).Increment(3); EXPECT_EQ("c:counter,extra-tags=foo,my-tags=bar:3.000000\n", ParseProtocolLine(memoryWriter->LastLine()).value().to_string()); } @@ -105,7 +105,7 @@ TEST(RegistryTest, DistributionSummary) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto d = r.distribution_summary("distribution_summary"); + auto d = r.CreateDistributionSummary("distribution_summary"); EXPECT_TRUE(memoryWriter->IsEmpty()); d.Record(42); @@ -118,7 +118,7 @@ TEST(RegistryTest, DistributionSummaryWithId) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto d = Registry::distribution_summary_with_id(r.new_id("distribution_summary", {{"my-tags", "bar"}})); + auto d = r.CreateDistributionSummary(r.CreateNewId("distribution_summary", {{"my-tags", "bar"}})); EXPECT_TRUE(memoryWriter->IsEmpty()); d.Record(42); @@ -132,7 +132,7 @@ TEST(RegistryTest, Gauge) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto g = r.gauge("gauge"); + auto g = r.CreateGauge("gauge"); EXPECT_TRUE(memoryWriter->IsEmpty()); g.Set(42); @@ -145,7 +145,7 @@ TEST(RegistryTest, GaugeWithId) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto g = Registry::gauge_with_id(r.new_id("gauge", {{"my-tags", "bar"}})); + auto g = r.CreateGauge(r.CreateNewId("gauge", {{"my-tags", "bar"}})); EXPECT_TRUE(memoryWriter->IsEmpty()); g.Set(42); @@ -159,7 +159,7 @@ TEST(RegistryTest, GaugeWithIdWithTtlSeconds) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto g = Registry::gauge_with_id(r.new_id("gauge", {{"my-tags", "bar"}}), 120); + auto g = r.CreateGauge(r.CreateNewId("gauge", {{"my-tags", "bar"}}), 120); EXPECT_TRUE(memoryWriter->IsEmpty()); g.Set(42); EXPECT_EQ("g,120:gauge,extra-tags=foo,my-tags=bar:42.000000\n", memoryWriter->LastLine()); @@ -170,7 +170,7 @@ TEST(RegistryTest, GaugeWithTtlSeconds) { auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto g = r.gauge("gauge", {}, 120); + auto g = r.CreateGauge("gauge", {}, 120); EXPECT_TRUE(memoryWriter->IsEmpty()); g.Set(42); @@ -183,7 +183,7 @@ TEST(RegistryTest, MaxGauge) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto g = r.max_gauge("max_gauge"); + auto g = r.CreateMaxGauge("max_gauge"); EXPECT_TRUE(memoryWriter->IsEmpty()); g.Set(42); @@ -196,7 +196,7 @@ TEST(RegistryTest, MaxGaugeWithId) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto g = Registry::max_gauge_with_id(r.new_id("max_gauge", {{"my-tags", "bar"}})); + auto g = r.CreateMaxGauge(r.CreateNewId("max_gauge", {{"my-tags", "bar"}})); EXPECT_TRUE(memoryWriter->IsEmpty()); g.Set(42); @@ -210,7 +210,7 @@ TEST(RegistryTest, MonotonicCounter) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto c = r.monotonic_counter("monotonic_counter"); + auto c = r.CreateMonotonicCounter("monotonic_counter"); EXPECT_TRUE(memoryWriter->IsEmpty()); c.Set(42); @@ -223,7 +223,7 @@ TEST(RegistryTest, MonotonicCounterWithId) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto c = Registry::monotonic_counter_with_id(r.new_id("monotonic_counter", {{"my-tags", "bar"}})); + auto c = r.CreateMonotonicCounter(r.CreateNewId("monotonic_counter", {{"my-tags", "bar"}})); EXPECT_TRUE(memoryWriter->IsEmpty()); c.Set(42); @@ -237,7 +237,7 @@ TEST(RegistryTest, MonotonicCounterUint) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto c = r.monotonic_counter_uint("monotonic_counter_uint"); + auto c = r.CreateMonotonicCounterUint("monotonic_counter_uint"); EXPECT_TRUE(memoryWriter->IsEmpty()); c.Set(42); @@ -250,7 +250,7 @@ TEST(RegistryTest, MonotonicCounterUintWithId) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto c = Registry::monotonic_counter_uint_with_id(r.new_id("monotonic_counter_uint", {{"my-tags", "bar"}})); + auto c = r.CreateMonotonicCounterUint(r.CreateNewId("monotonic_counter_uint", {{"my-tags", "bar"}})); EXPECT_TRUE(memoryWriter->IsEmpty()); c.Set(42); @@ -262,12 +262,12 @@ TEST(RegistryTest, NewId) { auto config1 = Config(WriterConfig(WriterTypes::Memory)); auto r1 = Registry(config1); - auto id1 = r1.new_id("id"); + auto id1 = r1.CreateNewId("id"); EXPECT_EQ("MeterId(name=id, tags={})", id1.to_string()); Config config2(WriterConfig(WriterTypes::Memory), {{"extra-tags", "foo"}}); auto r2 = Registry(config2); - auto id2 = r2.new_id("id"); + auto id2 = r2.CreateNewId("id"); EXPECT_EQ("MeterId(name=id, tags={'extra-tags': 'foo'})", id2.to_string()); } @@ -277,7 +277,7 @@ TEST(RegistryTest, PctDistributionSummary) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto d = r.pct_distribution_summary("pct_distribution_summary"); + auto d = r.CreatePercentDistributionSummary("pct_distribution_summary"); EXPECT_TRUE(memoryWriter->IsEmpty()); d.Record(42); @@ -290,7 +290,7 @@ TEST(RegistryTest, PctDistributionSummaryWithId) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto d = Registry::pct_distribution_summary_with_id(r.new_id("pct_distribution_summary", {{"my-tags", "bar"}})); + auto d = r.CreatePercentDistributionSummary(r.CreateNewId("pct_distribution_summary", {{"my-tags", "bar"}})); EXPECT_TRUE(memoryWriter->IsEmpty()); d.Record(42); @@ -304,7 +304,7 @@ TEST(RegistryTest, PctTimer) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto t = r.pct_timer("pct_timer"); + auto t = r.CreatePercentTimer("pct_timer"); EXPECT_TRUE(memoryWriter->IsEmpty()); t.Record(42); @@ -317,7 +317,7 @@ TEST(RegistryTest, PctTimerWithId) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto t = Registry::pct_timer_with_id(r.new_id("pct_timer", {{"my-tags", "bar"}})); + auto t = r.CreatePercentTimer(r.CreateNewId("pct_timer", {{"my-tags", "bar"}})); EXPECT_TRUE(memoryWriter->IsEmpty()); t.Record(42); @@ -331,7 +331,7 @@ TEST(RegistryTest, Timer) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto t = r.timer("timer"); + auto t = r.CreateTimer("timer"); EXPECT_TRUE(memoryWriter->IsEmpty()); t.Record(42); @@ -344,7 +344,7 @@ TEST(RegistryTest, TimerWithId) auto r = Registry(config); auto memoryWriter = static_cast(WriterTestHelper::GetImpl()); - auto t = Registry::timer_with_id(r.new_id("timer", {{"my-tags", "bar"}})); + auto t = r.CreateTimer(r.CreateNewId("timer", {{"my-tags", "bar"}})); EXPECT_TRUE(memoryWriter->IsEmpty()); t.Record(42);