From 25a9b27880b420fa71434d5f4af54f76db8ae9f5 Mon Sep 17 00:00:00 2001
From: Paul Harrington <pharring@microsoft.com>
Date: Wed, 17 Jan 2018 12:59:37 -0800
Subject: [PATCH] Use InvariantCulture to convert property values

---
 .../DiagnosticSourceListenerSubscription.cs                    | 3 ++-
 .../DiagnosticSourceTelemetryModuleTests.cs                    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/DiagnosticSourceListener/DiagnosticSourceListenerSubscription.cs b/src/DiagnosticSourceListener/DiagnosticSourceListenerSubscription.cs
index f8cca577..d89337ff 100644
--- a/src/DiagnosticSourceListener/DiagnosticSourceListenerSubscription.cs
+++ b/src/DiagnosticSourceListener/DiagnosticSourceListenerSubscription.cs
@@ -8,6 +8,7 @@ namespace Microsoft.ApplicationInsights.DiagnosticSourceListener
 {
     using System;
     using System.Collections.Generic;
+    using System.Globalization;
     using Microsoft.ApplicationInsights.DataContracts;
 
     internal class DiagnosticSourceListenerSubscription : IObserver<KeyValuePair<string, object>>
@@ -58,7 +59,7 @@ public void OnNext(KeyValuePair<string, object> @event)
                 {
                     if (!property.IsSpecialName)
                     {
-                        telemetry.Properties.Add(property.Name, Convert.ToString(property.GetValue(payload)));
+                        telemetry.Properties.Add(property.Name, Convert.ToString(property.GetValue(payload), CultureInfo.InvariantCulture));
                     }
                 }
             }
diff --git a/test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceTelemetryModuleTests.cs b/test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceTelemetryModuleTests.cs
index e8d7b958..e4c509bf 100644
--- a/test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceTelemetryModuleTests.cs
+++ b/test/DiagnosticSourceListener.netcoreapp10.Tests/DiagnosticSourceTelemetryModuleTests.cs
@@ -74,7 +74,7 @@ public void HandlesPropertiesWithNullValues()
 
                 TraceTelemetry telemetry = (TraceTelemetry)this.adapterHelper.Channel.SentItems.First();
                 Assert.AreEqual("Hey!", telemetry.Message);
-                Assert.AreEqual(Convert.ToString(null), telemetry.Properties["Prop1"]);
+                Assert.AreEqual(string.Empty, telemetry.Properties["Prop1"]);
             }
         }