Use string create if net6.0 or greater (#4183)

* Use string create if net6.0 or greater * run benchmarks on net6.0 * Revert some changes * revert * Fix BenchmarkComparer * Ensure both data set exists for comparison.
DataDog · Jun 20, 2023 · 89ce11d · 89ce11d
1 parent 477702e
commit 89ce11d
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 5 deletions.
diff --git a/tracer/build/_build/BenchmarkComparison/BenchmarkComparer.cs b/tracer/build/_build/BenchmarkComparison/BenchmarkComparer.cs
@@ -57,9 +57,14 @@ public static class BenchmarkComparer
                                                {
                                                    var baseBenchmark = GetValueOrDefault(baseBenchmarksByName, id);
                                                    var diffBenchmark = GetValueOrDefault(diffBenchmarksByName, id);
+                                                   if (baseBenchmark is null || diffBenchmark is null)
+                                                   {
+                                                       return default;
+                                                   }
 
                                                    return (Id: id, Base: baseBenchmark, Diff: diffBenchmark);
                                                })
+                                              .Where(i => i.Id is not null)
                                               .ToList();
                        var benchmarkComparisons = matchedBenchmarks
                                                  .Select(x => new BenchmarkComparison(x.Id, x.Base, x.Diff, EquivalenceTestConclusion.Unknown))
@@ -75,9 +80,20 @@ public static class BenchmarkComparer
                    })
                   .ToList();
 
-            static string GetName(Benchmark benchmark) => benchmark.DisplayInfo.Contains("Toolchain=net472")
-                                                       ? $"{benchmark.FullName}-net472"
-                                                       : $"{benchmark.FullName}-netcoreapp3.1";
+            static string GetName(Benchmark benchmark)
+            {
+                if (benchmark.DisplayInfo.Contains("Toolchain=net472"))
+                {
+                    return $"{benchmark.FullName}-net472";
+                }
+
+                if (benchmark.DisplayInfo.Contains("Toolchain=net6.0"))
+                {
+                    return $"{benchmark.FullName}-net6.0";
+                }
+
+                return $"{benchmark.FullName}-netcoreapp3.1";
+            }
 
             static T GetValueOrDefault<T>(Dictionary<string, T> dict, string key)
                 => dict.TryGetValue(key, out var value) ? value : default;

diff --git a/tracer/build/_build/Build.cs b/tracer/build/_build/Build.cs
@@ -416,7 +416,7 @@ void DeleteReparsePoints(string path)
                 var (framework, runtimes) = IsOsx switch
                 {
                     true => (TargetFramework.NETCOREAPP3_1, "net6.0"),
-                    false => (TargetFramework.NET6_0, "net472 netcoreapp3.1"),
+                    false => (TargetFramework.NET6_0, "net472 netcoreapp3.1 net6.0"),
                 };
                 
                 DotNetRun(s => s

diff --git a/tracer/src/Datadog.Trace/Propagators/B3SingleHeaderContextPropagator.cs b/tracer/src/Datadog.Trace/Propagators/B3SingleHeaderContextPropagator.cs
@@ -138,7 +138,11 @@ internal static string CreateHeader(SpanContext context)
             var samplingPriority = context.TraceContext?.SamplingPriority ?? context.SamplingPriority;
             var sampled = samplingPriority > 0 ? "1" : "0";
 
+#if NET6_0_OR_GREATER
+            return string.Create(null, stackalloc char[128], $"{context.RawTraceId}-{context.RawSpanId}-{sampled}");
+#else
             return $"{context.RawTraceId}-{context.RawSpanId}-{sampled}";
+#endif
         }
     }
 }
diff --git a/tracer/src/Datadog.Trace/Propagators/W3CTraceContextPropagator.cs b/tracer/src/Datadog.Trace/Propagators/W3CTraceContextPropagator.cs
@@ -122,8 +122,11 @@ internal static string CreateTraceParentHeader(SpanContext context)
         {
             var samplingPriority = context.TraceContext?.SamplingPriority ?? context.SamplingPriority ?? SamplingPriorityValues.AutoKeep;
             var sampled = samplingPriority > 0 ? "01" : "00";
-
+#if NET6_0_OR_GREATER
+            return string.Create(null, stackalloc char[128], $"00-{context.RawTraceId}-{context.RawSpanId}-{sampled}");
+#else
             return $"00-{context.RawTraceId}-{context.RawSpanId}-{sampled}";
+#endif
         }
 
         internal static string CreateTraceStateHeader(SpanContext context)

diff --git a/tracer/src/Datadog.Trace/ServiceFabric/ServiceRemotingHelpers.cs b/tracer/src/Datadog.Trace/ServiceFabric/ServiceRemotingHelpers.cs
@@ -90,7 +90,11 @@ public static void GetMessageHeaders(EventArgs? eventArgs, out IServiceRemotingR
 
         public static string GetSpanName(string spanKind)
         {
+#if NET6_0_OR_GREATER
+            return string.Create(null, stackalloc char[128], $"{SpanNamePrefix}.{spanKind}");
+#else
             return $"{SpanNamePrefix}.{spanKind}";
+#endif
         }
 
         public static Span CreateSpan(