Skip to content

Andrew/r and d/non recording spans #7916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
andrewlock wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

Andrew/r and d/non recording spans #7916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4a106d8
Add SamplingContext object to allow running sampling _without_ a whol…
andrewlock Dec 2, 2025
57972df
Hack together support for unrecorded spans
andrewlock Dec 2, 2025
84f8cba
Migrate to new approach
andrewlock Apr 17, 2026
bbf025f
Update benchmark
andrewlock Apr 17, 2026
3691f59
HACKETY HACK to make it compile
andrewlock Apr 17, 2026
e5ed1b7
More hackery
andrewlock Apr 17, 2026
411cef6
So much hack
andrewlock Apr 20, 2026
bc1c84c
Hackery
andrewlock Apr 23, 2026
5f63e40
HAAAAACK
andrewlock Apr 23, 2026
87754a1
Hack around rebasing issue - we need to work out stats at some point....
andrewlock Apr 23, 2026
1909db4
Fix some issues
andrewlock May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tracer/src/Datadog.Trace.MSBuild/DatadogLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private void EventSource_BuildStarted(object sender, BuildStartedEventArgs e)
{
Log.Debug("Build Started");

_buildSpan = _tracer.StartSpan(BuildTags.BuildOperationName);
_buildSpan = null; // HACK: _tracer.StartSpan(BuildTags.BuildOperationName);
_buildSpan.SetMetric(Tags.Analytics, 1.0d);

if (_buildSpan.Context.TraceContext is { } traceContext)
Expand Down Expand Up @@ -186,7 +186,7 @@ private void EventSource_ProjectStarted(object sender, ProjectStartedEventArgs e
string projectName = Path.GetFileName(e.ProjectFile);

string targetName = string.IsNullOrEmpty(e.TargetNames) ? "build" : e.TargetNames?.ToLowerInvariant();
Span projectSpan = _tracer.StartSpan($"msbuild.{targetName}", parent: parentSpan.Context);
Span projectSpan = null; // HACK: _tracer.StartSpan($"msbuild.{targetName}", parent: parentSpan.Context);

if (projectName != null)
{
Expand All @@ -206,7 +206,7 @@ private void EventSource_ProjectStarted(object sender, ProjectStartedEventArgs e
}
}

projectSpan.ResourceName = (string.IsNullOrEmpty(e.TargetNames) ? "Build" : e.TargetNames) + $"/{targetFramework}";
// HACK: projectSpan.ResourceName = (string.IsNullOrEmpty(e.TargetNames) ? "Build" : e.TargetNames) + $"/{targetFramework}";

projectSpan.SetTag(BuildTags.ProjectFile, e.ProjectFile);
projectSpan.SetTag(BuildTags.ProjectSenderName, e.SenderName);
Expand Down
6 changes: 3 additions & 3 deletions tracer/src/Datadog.Trace.OpenTracing/OpenTracingSpan.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ internal OpenTracingSpan(ISpan span)

public global::OpenTracing.ISpan SetOperationName(string operationName)
{
Span.OperationName = operationName;
// HACK: Span.OperationName = operationName;
return this;
}

Expand Down Expand Up @@ -93,13 +93,13 @@ public string GetTag(string key)
switch (key)
{
case DatadogTags.ResourceName:
Span.ResourceName = value;
// HACK: Span.ResourceName = value;
return this;
case DatadogTags.SpanType:
Span.Type = value;
return this;
case DatadogTags.ServiceName:
Span.ServiceName = value;
// HACK: Span.ServiceName = value;
return this;
case DatadogTags.ServiceVersion:
Span.SetTag(Tags.Version, value);
Expand Down
246 changes: 4 additions & 242 deletions tracer/src/Datadog.Trace.Tools.Runner/Crank/Importer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
// </copyright>

using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Datadog.Trace.Ci;
using Datadog.Trace.Ci.CiEnvironment;
using Datadog.Trace.Ci.Tags;
using Datadog.Trace.ExtensionMethods;
using Datadog.Trace.Sampling;
using Datadog.Trace.Vendors.Newtonsoft.Json;
using Spectre.Console;

#pragma warning disable SA1201 // Elements should appear in the correct order
Expand All @@ -24,240 +14,12 @@ internal class Importer
public const string RateLimit = "rate-limit";
public const string PayloadSize = "payload-size";

private static readonly IResultConverter[] Converters = new IResultConverter[]
{
new MsTimeResultConverter("benchmarks/start-time"),
new MsTimeResultConverter("benchmarks/build-time"),
new KbSizeResultConverter("benchmarks/published-size"),
new MbSizeResultConverter("benchmarks/working-set"),
new PercentageResultConverter("benchmarks/cpu"),

new PercentageResultConverter("runtime-counter/cpu-usage"),
new MbSizeResultConverter("runtime-counter/working-set"),
new MbSizeResultConverter("runtime-counter/gc-heap-size"),
new NumberResultConverter("runtime-counter/gen-0-gc-count"),
new NumberResultConverter("runtime-counter/gen-1-gc-count"),
new NumberResultConverter("runtime-counter/gen-2-gc-count"),
new NumberResultConverter("runtime-counter/exception-count"),
new NumberResultConverter("runtime-counter/threadpool-thread-count"),
new NumberResultConverter("runtime-counter/monitor-lock-contention-count"),
new NumberResultConverter("runtime-counter/threadpool-queue-length"),
new NumberResultConverter("runtime-counter/threadpool-completed-items-count"),
new PercentageResultConverter("runtime-counter/time-in-gc"),
new ByteSizeResultConverter("runtime-counter/gen-0-size"),
new ByteSizeResultConverter("runtime-counter/gen-1-size"),
new ByteSizeResultConverter("runtime-counter/gen-2-size"),
new ByteSizeResultConverter("runtime-counter/loh-size"),
new NumberResultConverter("runtime-counter/alloc-rate"),
new NumberResultConverter("runtime-counter/assembly-count"),
new NumberResultConverter("runtime-counter/active-timer-count"),

new NumberResultConverter("aspnet-counter/requests-per-second"),
new NumberResultConverter("aspnet-counter/total-requests"),
new NumberResultConverter("aspnet-counter/current-requests"),
new NumberResultConverter("aspnet-counter/failed-requests"),

new MsTimeResultConverter("http/firstrequest"),

new NumberResultConverter("bombardier/requests"),
new NumberResultConverter("bombardier/badresponses"),
new UsTimeResultConverter("bombardier/latency/mean"),
new UsTimeResultConverter("bombardier/latency/max"),
new NumberResultConverter("bombardier/rps/max"),
new NumberResultConverter("bombardier/rps/mean"),
new NumberResultConverter("bombardier/throughput"),
new BombardierRawConverter("bombardier/raw"),
};

public static int Process(string jsonFilePath)
{
AnsiConsole.WriteLine("Importing Crank json result file...");
try
{
string jsonContent = File.ReadAllText(jsonFilePath);
var result = JsonConvert.DeserializeObject<Models.ExecutionResult>(jsonContent);

var testOptimization = TestOptimization.Instance;
if (result?.JobResults?.Jobs?.Count > 0)
{
var fileName = Path.GetFileName(jsonFilePath);

testOptimization.Initialize();
Tracer tracer = Tracer.Instance;

foreach (var jobItem in result.JobResults.Jobs)
{
var jobResult = jobItem.Value;
if (jobResult is null)
{
continue;
}

DateTimeOffset minTimeStamp = DateTimeOffset.UtcNow;
DateTimeOffset maxTimeStamp = minTimeStamp;
var measurements = jobResult.Measurements?.SelectMany(i => i).ToList() ?? new List<Models.Measurement>();
if (measurements.Count > 0)
{
maxTimeStamp = measurements.Max(i => i.Timestamp).ToUniversalTime();
minTimeStamp = measurements.Min(i => i.Timestamp).ToUniversalTime();
}

var duration = (maxTimeStamp - minTimeStamp);

Span span = tracer.StartSpan("crank.test", startTime: minTimeStamp, serviceName: "crank");

span.Context.TraceContext?.SetSamplingPriority(SamplingPriorityValues.AutoKeep);
span.Type = SpanTypes.Test;
span.ResourceName = $"{fileName}/{jobItem.Key}";
CIEnvironmentValues.Instance.DecorateSpan(span);

span.SetTag(TestTags.Name, jobItem.Key);
span.SetTag(TestTags.Type, TestTags.TypeBenchmark);
span.SetTag(TestTags.Suite, $"Crank.{fileName}");
span.SetTag(TestTags.Framework, "Crank");
span.SetTag(TestTags.Status, result.ReturnCode == 0 ? TestTags.StatusPass : TestTags.StatusFail);

if (result.JobResults.Properties?.Count > 0)
{
string scenario = string.Empty;
string profile = string.Empty;
string arch = string.Empty;
string rateLimit = string.Empty;
string payloadSize = string.Empty;
string testName = jobItem.Key;
foreach (var propItem in result.JobResults.Properties)
{
span.SetTag("test.properties." + propItem.Key, propItem.Value);

if (propItem.Key == "name")
{
testName = propItem.Value + "." + jobItem.Key;
}
else if (propItem.Key == "scenario")
{
scenario = propItem.Value;
}
else if (propItem.Key == "profile")
{
profile = propItem.Value;
}
else if (propItem.Key == "arch")
{
arch = propItem.Value;
}
else if (propItem.Key == RateLimit)
{
rateLimit = propItem.Value;
}
else if (propItem.Key == PayloadSize)
{
payloadSize = propItem.Value;
}
}

string suite = fileName;
if (!string.IsNullOrEmpty(scenario))
{
suite = scenario;

if (!string.IsNullOrEmpty(profile))
{
suite += "." + profile;
}

if (!string.IsNullOrEmpty(arch))
{
suite += "." + arch;
}
}

span.SetTag(TestTags.Suite, $"Crank.{suite}");
span.SetTag(TestTags.Name, testName);

if (rateLimit != string.Empty)
{
span.SetTag(RateLimit, rateLimit);
}

if (payloadSize != string.Empty)
{
span.SetTag(PayloadSize, payloadSize);
}

span.ResourceName = $"{suite}/{testName}";
}

try
{
if (jobResult.Results?.Count > 0)
{
foreach (var resultItem in jobResult.Results)
{
if (string.IsNullOrEmpty(resultItem.Key))
{
continue;
}

if (resultItem.Value is string valueString)
{
span.SetTag("test.results." + resultItem.Key.Replace("/", ".").Replace("-", "_"), valueString);
}
else
{
NumberResultConverter numberConverter = default;

bool converted = false;
foreach (var converter in Converters)
{
if (converter.CanConvert(resultItem.Key))
{
converter.SetToSpan(span, "test.results." + resultItem.Key.Replace("/", ".").Replace("-", "_"), resultItem.Value);
converted = true;
break;
}
}

if (!converted)
{
numberConverter.SetToSpan(span, "test.results." + resultItem.Key.Replace("/", ".").Replace("-", "_"), resultItem.Value);
}
}
}
}

if (jobResult.Environment?.Count > 0)
{
foreach (var envItem in jobResult.Environment)
{
span.SetTag("environment." + envItem.Key, envItem.Value?.ToString() ?? "(null)");
}
}
}
finally
{
if (duration == TimeSpan.Zero)
{
span.Finish();
}
else
{
span.Finish(span.StartTime.Add(duration));
}
}
}

// Ensure all the spans gets flushed before we report the success.
// In some cases the process finishes without sending the traces in the buffer.
testOptimization.Flush();
}
}
catch (Exception ex)
{
AnsiConsole.WriteException(ex);
return 1;
}

AnsiConsole.WriteLine("The result file was imported successfully.");
// Temporarily stubbed out for the non-recording-spans experiment.
// The Span/Tracer APIs used here (StartSpan with serviceName, settable ResourceName)
// were removed on this branch. Restore this body once the experiment lands or is reverted.
AnsiConsole.WriteLine($"Crank import is disabled in this experimental build (path: {jsonFilePath}).");
return 0;
}
}
Expand Down
Loading
Loading