#112 escaping tag values in es reporter, this should move to part of …

…the payload builder
AppMetrics · Apr 15, 2017 · 6847781 · 6847781
1 parent 8fa338c
commit 6847781
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/App.Metrics.Extensions.Reporting.ElasticSearch/Client/BulkPayload.cs b/src/App.Metrics.Extensions.Reporting.ElasticSearch/Client/BulkPayload.cs
@@ -32,17 +32,17 @@ public void Add(MetricsDocument document)
         {
             if (document == null)
             {
-                throw new ArgumentNullException(nameof(document));
+                return;
             }
 
             _documents.Add(document);
         }
 
-        public void Write(TextWriter textWriter)
+        public void Format(TextWriter textWriter)
         {
             if (textWriter == null)
             {
-                throw new ArgumentNullException(nameof(textWriter));
+                return;
             }
 
             foreach (var document in _documents)

diff --git a/src/App.Metrics.Extensions.Reporting.ElasticSearch/Client/BulkPayloadBuilder.cs b/src/App.Metrics.Extensions.Reporting.ElasticSearch/Client/BulkPayloadBuilder.cs
@@ -68,7 +68,7 @@ public void Pack(string name, object value, MetricTags tags)
         public string PayloadFormatted()
         {
             var result = new StringWriter();
-            _payload.Write(result);
+            _payload.Format(result);
             return result.ToString();
         }
     }

diff --git a/src/App.Metrics.Extensions.Reporting.ElasticSearch/Client/ElasticSearchBulkClient.cs b/src/App.Metrics.Extensions.Reporting.ElasticSearch/Client/ElasticSearchBulkClient.cs
@@ -67,7 +67,7 @@ public class ElasticSearchBulkClient
             }
 
             var writer = new StringWriter();
-            payload.Write(writer);
+            payload.Format(writer);
             var content = new StringContent(writer.ToString(), Encoding.UTF8, "application/json");
 
             try

diff --git a/src/App.Metrics.Extensions.Reporting.ElasticSearch/ElasticSearchReporterSettings.cs b/src/App.Metrics.Extensions.Reporting.ElasticSearch/ElasticSearchReporterSettings.cs
@@ -43,7 +43,10 @@ public ElasticSearchReporterSettings()
             MetricNameFormatter = (metricContext, metricName) => string.IsNullOrWhiteSpace(metricContext)
                 ? $"{metricName}".Replace(' ', '_').ToLowerInvariant()
                 : $"{metricContext}__{metricName}".Replace(' ', '_').ToLowerInvariant();
-            MetricTagValueFormatter = tagValue => tagValue.Replace(' ', '_');
+            MetricTagValueFormatter = tagValue => tagValue.Replace("=", "\\=")
+                                                          .Replace(" ", "\\ ")
+                                                          .Replace(@"\", @"\\\")
+                                                          .Replace(",", "\\,");
         }
 
         /// <summary>