dotnet-counters JSON Exporter improvements (#666)

* make timestamp non culture-sensitive, change 'counter type' to 'counterType'

* Remove more spaces from the JSON

diff --git a/src/Tools/dotnet-counters/Exporters/JSONExporter.cs b/src/Tools/dotnet-counters/Exporters/JSONExporter.cs
index ee18c0ab87f7fb6354c9fdc8f052ebb25aeb6503..7d843112ae1cd19afd2ce7f047487d4394abab5a 100644 (file)
--- a/src/Tools/dotnet-counters/Exporters/JSONExporter.cs
+++ b/src/Tools/dotnet-counters/Exporters/JSONExporter.cs
@@ -36,8 +36,8 @@ namespace Microsoft.Diagnostics.Tools.Counters.Exporters
             }
 
             builder = new StringBuilder();
-            builder.Append($"{{ \"Target Process\": \"{_processName}\", ");
-            builder.Append($"\"Start Time\": \"{DateTime.Now.ToString()}\", ");
+            builder.Append($"{{ \"TargetProcess\": \"{_processName}\", ");
+            builder.Append($"\"StartTime\": \"{DateTime.Now.ToString()}\", ");
             builder.Append($"\"Events\": [");
         }
 
@@ -57,10 +57,10 @@ namespace Microsoft.Diagnostics.Tools.Counters.Exporters
                 File.AppendAllText(_output, builder.ToString());
                 builder.Clear();
             }
-            builder.Append($"{{ \"timestamp\": \"{DateTime.Now.ToString()}\", ");
+            builder.Append($"{{ \"timestamp\": \"{DateTime.Now.ToString("u")}\", ");
             builder.Append($" \"provider\": \"{providerName}\", ");
             builder.Append($" \"name\": \"{payload.GetDisplay()}\", ");
-            builder.Append($" \"counter type\": \"{payload.GetCounterType()}\", ");
+            builder.Append($" \"counterType\": \"{payload.GetCounterType()}\", ");
             builder.Append($" \"value\": {payload.GetValue()} }},");
         }
 

diff --git a/src/tests/dotnet-counters/JSONExporterTests.cs b/src/tests/dotnet-counters/JSONExporterTests.cs
index 29ad426fb359a955b5a598a40b2ade2491162eca..6817fb0d2e087053eb5e330def2210425c89fc34 100644 (file)
--- a/src/tests/dotnet-counters/JSONExporterTests.cs
+++ b/src/tests/dotnet-counters/JSONExporterTests.cs
@@ -149,7 +149,7 @@ namespace DotnetCounters.UnitTests
         [JsonProperty("name")]
         public string name { get; set; }
 
-        [JsonProperty("counter type")]
+        [JsonProperty("counterType")]
         public string counterType { get; set; }
 
         [JsonProperty("value")]
@@ -158,10 +158,10 @@ namespace DotnetCounters.UnitTests
 
     class JSONCounterTrace
     {
-        [JsonProperty("Target Process")]
+        [JsonProperty("TargetProcess")]
         public string targetProcess { get; set; }
 
-        [JsonProperty("Start Time")]
+        [JsonProperty("StartTime")]
         public string startTime { get; set; }
 
         [JsonProperty("Events")]