fix(core): Properly serialize newlines in label values

jupp0r · Nov 3, 2019 · 2be75c5 · 2be75c5
1 parent 0152d14
commit 2be75c5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/core/src/text_serializer.cc b/core/src/text_serializer.cc
@@ -24,10 +24,23 @@ void WriteValue(std::ostream& out, double value) {
 
 void WriteValue(std::ostream& out, const std::string& value) {
   for (auto c : value) {
-    if (c == '\\' || c == '"' || c == '\n') {
-      out << "\\";
+    switch (c) {
+      case '\n':
+        out << '\\' << 'n';
+        break;
+
+      case '\\':
+        out << '\\' << c;
+        break;
+
+      case '"':
+        out << '\\' << c;
+        break;
+
+      default:
+        out << c;
+        break;
     }
-    out << c;
   }
 }
 

diff --git a/core/tests/text_serializer_test.cc b/core/tests/text_serializer_test.cc
@@ -56,7 +56,7 @@ TEST_F(TextSerializerTest, shouldEscapeBackslash) {
 TEST_F(TextSerializerTest, shouldEscapeNewline) {
   metric.label.resize(1, ClientMetric::Label{"k", "v\nv"});
   EXPECT_THAT(Serialize(MetricType::Gauge),
-              testing::HasSubstr(name + "{k=\"v\\\nv\"}"));
+              testing::HasSubstr(name + "{k=\"v\\nv\"}"));
 }
 
 TEST_F(TextSerializerTest, shouldEscapeDoubleQuote) {