Merge branch 'master' of https://github.com/open-telemetry/opentelemetry-dotnet

Author: lupengamzn

test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToActivityConverterTests.cs

@@ -131,6 +131,7 @@ public void ProfilerCommandToActivity_UsesIpEndPointAsEndPoint()
             var activity = new Activity("redis-profiler");
             IPEndPoint ipLocalEndPoint = new IPEndPoint(address, port);
             var profiledCommand = new Mock<IProfiledCommand>();
+            profiledCommand.Setup(m => m.CommandCreated).Returns(DateTime.UtcNow);
             profiledCommand.Setup(m => m.EndPoint).Returns(ipLocalEndPoint);
 
             var result = RedisProfilerEntryToActivityConverter.ProfilerCommandToActivity(activity, profiledCommand.Object);
@@ -148,6 +149,7 @@ public void ProfilerCommandToActivity_UsesDnsEndPointAsEndPoint()
 
             var activity = new Activity("redis-profiler");
             var profiledCommand = new Mock<IProfiledCommand>();
+            profiledCommand.Setup(m => m.CommandCreated).Returns(DateTime.UtcNow);
             profiledCommand.Setup(m => m.EndPoint).Returns(dnsEndPoint);
 
             var result = RedisProfilerEntryToActivityConverter.ProfilerCommandToActivity(activity, profiledCommand.Object);
@@ -165,6 +167,7 @@ public void ProfilerCommandToActivity_UsesOtherEndPointAsEndPoint()
             var unixEndPoint = new UnixDomainSocketEndPoint("https://opentelemetry.io/");
             var activity = new Activity("redis-profiler");
             var profiledCommand = new Mock<IProfiledCommand>();
+            profiledCommand.Setup(m => m.CommandCreated).Returns(DateTime.UtcNow);
             profiledCommand.Setup(m => m.EndPoint).Returns(unixEndPoint);
 
             var result = RedisProfilerEntryToActivityConverter.ProfilerCommandToActivity(activity, profiledCommand.Object);

test/OpenTelemetry.Tests/Logs/LogRecordTest.cs

@@ -21,6 +21,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Exporter;
@@ -213,7 +214,16 @@ public void CheckStateForStrucutredLogWithGeneralType()
             Assert.Contains(state, item => item.Key == "{OriginalFormat}");
             Assert.Equal("{food}", state.First(item => item.Key == "{OriginalFormat}").Value);
 
-            Assert.Equal("[Name, truffle], [Price, 299.99]", state.ToString());
+            var prevCulture = CultureInfo.CurrentCulture;
+            CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
+            try
+            {
+                Assert.Equal("[Name, truffle], [Price, 299.99]", state.ToString());
+            }
+            finally
+            {
+                CultureInfo.CurrentCulture = prevCulture;
+            }
         }
 
         [Fact]