Merge b68155a into 70a1cfd

core/CMakeLists.txt

@@ -2,15 +2,14 @@
 add_library(core
   src/check_names.cc
   src/counter.cc
-  src/detail/builder.impl.h
+  src/detail/builder.cc
   src/detail/ckms_quantiles.cc
   src/detail/time_window_quantiles.cc
   src/detail/utils.cc
+  src/family.cc
   src/gauge.cc
-  src/family.impl.h
   src/histogram.cc
   src/registry.cc
-  src/registry.impl.h
   src/serializer.cc
   src/summary.cc
   src/text_serializer.cc

core/include/prometheus/detail/builder.h

@@ -3,12 +3,11 @@
 #include <map>
 #include <string>
 
-#include "prometheus/registry.h"
-
 namespace prometheus {
 
 template <typename T>
 class Family;
+class Registry;
 
 namespace detail {
 

core/include/prometheus/registry.h

@@ -14,6 +14,11 @@
 
 namespace prometheus {
 
+class Counter;
+class Gauge;
+class Histogram;
+class Summary;
+
 namespace detail {
 
 template <typename T>
@@ -35,6 +40,12 @@ class Builder;
 /// a data race.
 class PROMETHEUS_CPP_CORE_EXPORT Registry : public Collectable {
  public:
+  /// \brief name Create a new registry.
+  Registry();
+
+  /// \brief name Destroys a registry.
+  ~Registry();
+
   /// \brief Returns a list of metrics and their samples.
   ///
   /// Every time the Registry is scraped it calls each of the metrics Collect

core/src/counter.cc

@@ -1,9 +1,5 @@
 #include "prometheus/counter.h"
 
-#include "detail/builder.impl.h"
-#include "family.impl.h"
-#include "registry.impl.h"
-
 namespace prometheus {
 
 void Counter::Increment() { gauge_.Increment(); }
@@ -18,13 +14,4 @@ ClientMetric Counter::Collect() const {
   return metric;
 }
 
-template class PROMETHEUS_CPP_CORE_EXPORT detail::Builder<Counter>;
-template class PROMETHEUS_CPP_CORE_EXPORT Family<Counter>;
-
-template Family<Counter>& Registry::Add(
-    const std::string& name, const std::string& help,
-    const std::map<std::string, std::string>& labels);
-
-detail::Builder<Counter> BuildCounter() { return {}; }
-
 }  // namespace prometheus

core/src/detail/builder.impl.h → core/src/detail/builder.cc

@@ -1,7 +1,11 @@
-#pragma once
-
 #include "prometheus/detail/builder.h"
 
+#include "prometheus/counter.h"
+#include "prometheus/gauge.h"
+#include "prometheus/histogram.h"
+#include "prometheus/registry.h"
+#include "prometheus/summary.h"
+
 namespace prometheus {
 
 namespace detail {
@@ -30,6 +34,16 @@ Family<T>& Builder<T>::Register(Registry& registry) {
   return registry.Add<T>(name_, help_, labels_);
 }
 
+template class PROMETHEUS_CPP_CORE_EXPORT Builder<Counter>;
+template class PROMETHEUS_CPP_CORE_EXPORT Builder<Gauge>;
+template class PROMETHEUS_CPP_CORE_EXPORT Builder<Histogram>;
+template class PROMETHEUS_CPP_CORE_EXPORT Builder<Summary>;
+
 }  // namespace detail
 
+detail::Builder<Counter> BuildCounter() { return {}; }
+detail::Builder<Gauge> BuildGauge() { return {}; }
+detail::Builder<Histogram> BuildHistogram() { return {}; }
+detail::Builder<Summary> BuildSummary() { return {}; }
+
 }  // namespace prometheus

core/src/family.impl.h → core/src/family.cc

@@ -1,7 +1,10 @@
-#pragma once
-
 #include "prometheus/family.h"
 
+#include "prometheus/counter.h"
+#include "prometheus/gauge.h"
+#include "prometheus/histogram.h"
+#include "prometheus/summary.h"
+
 namespace prometheus {
 
 template <typename T>
@@ -84,4 +87,9 @@ ClientMetric Family<T>::CollectMetric(std::size_t hash, T* metric) {
   return collected;
 }
 
+template class PROMETHEUS_CPP_CORE_EXPORT Family<Counter>;
+template class PROMETHEUS_CPP_CORE_EXPORT Family<Gauge>;
+template class PROMETHEUS_CPP_CORE_EXPORT Family<Histogram>;
+template class PROMETHEUS_CPP_CORE_EXPORT Family<Summary>;
+
 }  // namespace prometheus

core/src/gauge.cc

@@ -1,9 +1,5 @@
 #include "prometheus/gauge.h"
 
-#include "detail/builder.impl.h"
-#include "family.impl.h"
-#include "registry.impl.h"
-
 #include <ctime>
 
 namespace prometheus {
@@ -49,13 +45,4 @@ ClientMetric Gauge::Collect() const {
   return metric;
 }
 
-template class PROMETHEUS_CPP_CORE_EXPORT Family<Gauge>;
-template class PROMETHEUS_CPP_CORE_EXPORT detail::Builder<Gauge>;
-
-template Family<Gauge>& Registry::Add(
-    const std::string& name, const std::string& help,
-    const std::map<std::string, std::string>& labels);
-
-detail::Builder<Gauge> BuildGauge() { return {}; }
-
 }  // namespace prometheus

core/src/histogram.cc

@@ -1,9 +1,5 @@
 #include "prometheus/histogram.h"
 
-#include "detail/builder.impl.h"
-#include "family.impl.h"
-#include "registry.impl.h"
-
 #include <algorithm>
 #include <cassert>
 #include <iterator>
@@ -64,13 +60,4 @@ ClientMetric Histogram::Collect() const {
   return metric;
 }
 
-template class PROMETHEUS_CPP_CORE_EXPORT Family<Histogram>;
-template class PROMETHEUS_CPP_CORE_EXPORT detail::Builder<Histogram>;
-
-template Family<Histogram>& Registry::Add(
-    const std::string& name, const std::string& help,
-    const std::map<std::string, std::string>& labels);
-
-detail::Builder<Histogram> BuildHistogram() { return {}; }
-
 }  // namespace prometheus

core/src/registry.cc

@@ -1,9 +1,18 @@
 #include "prometheus/registry.h"
 
+#include "prometheus/counter.h"
+#include "prometheus/gauge.h"
+#include "prometheus/histogram.h"
+#include "prometheus/summary.h"
+
 #include <iterator>
 
 namespace prometheus {
 
+Registry::Registry() = default;
+
+Registry::~Registry() = default;
+
 std::vector<MetricFamily> Registry::Collect() {
   std::lock_guard<std::mutex> lock{mutex_};
   auto results = std::vector<MetricFamily>{};
@@ -16,4 +25,30 @@ std::vector<MetricFamily> Registry::Collect() {
   return results;
 }
 
+template <typename T>
+Family<T>& Registry::Add(const std::string& name, const std::string& help,
+                         const std::map<std::string, std::string>& labels) {
+  std::lock_guard<std::mutex> lock{mutex_};
+  auto family = detail::make_unique<Family<T>>(name, help, labels);
+  auto& ref = *family;
+  collectables_.push_back(std::move(family));
+  return ref;
+}
+
+template Family<Counter>& Registry::Add(
+    const std::string& name, const std::string& help,
+    const std::map<std::string, std::string>& labels);
+
+template Family<Gauge>& Registry::Add(
+    const std::string& name, const std::string& help,
+    const std::map<std::string, std::string>& labels);
+
+template Family<Summary>& Registry::Add(
+    const std::string& name, const std::string& help,
+    const std::map<std::string, std::string>& labels);
+
+template Family<Histogram>& Registry::Add(
+    const std::string& name, const std::string& help,
+    const std::map<std::string, std::string>& labels);
+
 }  // namespace prometheus

core/src/summary.cc

@@ -1,9 +1,5 @@
 #include "prometheus/summary.h"
 
-#include "detail/builder.impl.h"
-#include "family.impl.h"
-#include "registry.impl.h"
-
 namespace prometheus {
 
 Summary::Summary(const Quantiles& quantiles,
@@ -38,13 +34,4 @@ ClientMetric Summary::Collect() {
   return metric;
 }
 
-template class PROMETHEUS_CPP_CORE_EXPORT Family<Summary>;
-template class PROMETHEUS_CPP_CORE_EXPORT detail::Builder<Summary>;
-
-template Family<Summary>& Registry::Add(
-    const std::string& name, const std::string& help,
-    const std::map<std::string, std::string>& labels);
-
-detail::Builder<Summary> BuildSummary() { return {}; }
-
 }  // namespace prometheus