Merge pull request #79 from mikea/master

jupp0r · web-flow · commit b9906b514baa · 2017-12-06T10:37:03.000-08:00
Exposing metrics serializers
diff --git a/BUILD b/BUILD
@@ -12,13 +12,9 @@ cc_library(
         "lib/histogram.cc",
         "lib/histogram_builder.cc",
         "lib/json_serializer.cc",
-        "lib/json_serializer.h",
         "lib/protobuf_delimited_serializer.cc",
-        "lib/protobuf_delimited_serializer.h",
         "lib/registry.cc",
-        "lib/serializer.h",
         "lib/text_serializer.cc",
-        "lib/text_serializer.h",
     ],
     hdrs = glob(
         ["include/prometheus/*.h"],
diff --git a/include/prometheus/json_serializer.h b/include/prometheus/json_serializer.h
diff --git a/include/prometheus/protobuf_delimited_serializer.h b/include/prometheus/protobuf_delimited_serializer.h
diff --git a/include/prometheus/serializer.h b/include/prometheus/serializer.h
@@ -13,4 +13,4 @@ class Serializer {
   virtual std::string Serialize(
       const std::vector<io::prometheus::client::MetricFamily>&) = 0;
 };
-}
+}  // namespace prometheus
diff --git a/include/prometheus/text_serializer.h b/include/prometheus/text_serializer.h
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -26,13 +26,9 @@ add_library(prometheus-cpp
   histogram.cc
   histogram_builder.cc
   json_serializer.cc
-  json_serializer.h
   protobuf_delimited_serializer.cc
-  protobuf_delimited_serializer.h
   registry.cc
-  serializer.h
   text_serializer.cc
-  text_serializer.h
 
   # civetweb
 
diff --git a/lib/handler.cc b/lib/handler.cc
@@ -1,8 +1,8 @@
 #include "handler.h"
-#include "json_serializer.h"
-#include "protobuf_delimited_serializer.h"
-#include "serializer.h"
-#include "text_serializer.h"
+#include "prometheus/json_serializer.h"
+#include "prometheus/protobuf_delimited_serializer.h"
+#include "prometheus/serializer.h"
+#include "prometheus/text_serializer.h"
 
 namespace prometheus {
 namespace detail {
diff --git a/lib/json_serializer.cc b/lib/json_serializer.cc
@@ -4,7 +4,7 @@
 #include <google/protobuf/util/json_util.h>
 #include <google/protobuf/util/message_differencer.h>
 
-#include "json_serializer.h"
+#include "prometheus/json_serializer.h"
 
 namespace prometheus {
 
diff --git a/lib/protobuf_delimited_serializer.cc b/lib/protobuf_delimited_serializer.cc
@@ -4,7 +4,7 @@
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
 
-#include "protobuf_delimited_serializer.h"
+#include "prometheus/protobuf_delimited_serializer.h"
 
 namespace prometheus {
 
diff --git a/lib/text_serializer.cc b/lib/text_serializer.cc
@@ -1,4 +1,4 @@
-#include "text_serializer.h"
+#include "prometheus/text_serializer.h"
 #include <cmath>
 #include <iostream>
 #include <sstream>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "text_serializer.h"`
	`1`	`+#include "prometheus/text_serializer.h"`
`2`	`2`	`#include <cmath>`
`3`	`3`	`#include <iostream>`
`4`	`4`	`#include <sstream>`