Improved build execution order

Author: daniel-romano-DD

tracer/build/_build/Build.Steps.cs

@@ -2484,6 +2484,9 @@ string NormalizedPath(AbsolutePath ap)
             File.WriteAllText(descriptorFilePath, sb.ToString());
             Serilog.Log.Information("File saved: {File}", descriptorFilePath);
 
+            var nativeGeneratedFilesOutputPath = NativeTracerProject.Directory / "Generated";
+            CallSitesGenerator.GenerateCallSites(TargetFrameworks, tfm => DatadogTraceDirectory / "bin" / BuildConfiguration / tfm / Projects.DatadogTrace + ".dll", nativeGeneratedFilesOutputPath);
+
             static List<(string Assembly, string Type)> GetTypeReferences(string dllPath)
             {
                 // We check if the assembly file exists.
@@ -2561,16 +2564,6 @@ string NormalizedPath(AbsolutePath ap)
             }
         });
 
-    Target GenerateCallSites => _ => _
-       .Description("Generate CallSite native files")
-       .DependsOn(CompileManagedSrc)
-       .Before(CompileTracerNativeSrc)
-       .Executes(() =>
-       {
-            var outputPath = NativeTracerProject.Directory / "Generated";
-            CallSitesGenerator.GenerateCallSites(TargetFrameworks, tfm => DatadogTraceDirectory / "bin" / BuildConfiguration / tfm / Projects.DatadogTrace + ".dll", outputPath);
-       });
-
     Target CheckBuildLogsForErrors => _ => _
        .Unlisted()
        .Description("Reads the logs from build_data and checks for error lines")

tracer/build/_build/CodeGenerators/CallSitesGenerator.cs

@@ -15,6 +15,8 @@ internal static class CallSitesGenerator
 
         public static void GenerateCallSites(IEnumerable<TargetFramework> targetFrameworks, Func<string, string> getDllPath, AbsolutePath outputPath) 
         {
+            Serilog.Log.Debug("Generating CallSite definitions file ...");
+
             Dictionary<string, AspectClass> aspectClasses = new Dictionary<string, AspectClass>();
             foreach(var tfm in targetFrameworks)
             {
@@ -103,6 +105,10 @@ string GetAspectLine(Mono.Cecil.CustomAttribute data, out InstrumentationCategor
                         category = (InstrumentationCategory)Enum.Parse(typeof(InstrumentationCategory), arguments[1]);
                         return $"[AspectClass({arguments[0]},[None],Propagation,[]){version}]";
                     }
+                    else if (arguments.Count == 3)
+                    {
+                        return $"[AspectClass({arguments[0]},[None],{arguments[1]},{Check(arguments[2])}){version}]";
+                    }
                     else if (arguments.Count == 4)
                     {
                         category = (InstrumentationCategory)Enum.Parse(typeof(InstrumentationCategory), arguments[1]);
@@ -254,7 +260,10 @@ namespace trace
 
 
             if (!Directory.Exists(outputPath)) { Directory.CreateDirectory(outputPath); }
-            File.WriteAllText(outputPath / "generated_callsites.g.h", sb.ToString());
+            var fileName = outputPath / "generated_callsites.g.h";
+            File.WriteAllText(fileName, sb.ToString());
+
+            Serilog.Log.Information("CallSite definitions File saved: {File}", fileName);
 
             string Format(string line)
             {

tracer/src/Datadog.Trace/ClrProfiler/Instrumentation.cs

@@ -47,8 +47,6 @@ public static class Instrumentation
 
         private static readonly IDatadogLogger Log = DatadogLogging.GetLoggerFor(typeof(Instrumentation));
 
-        private static TargetFrameworks _targetFramework = TargetFrameworks.None;
-
         /// <summary>
         /// Gets a value indicating whether Datadog's profiler is attached to the current process.
         /// </summary>
@@ -109,8 +107,6 @@ public static void Initialize()
 
                     try
                     {
-                        _targetFramework = (TargetFrameworks)Enum.Parse(typeof(TargetFrameworks), ConfigTelemetryData.ManagedTracerTfmValue.ToUpper().Replace(".", "_"));
-
                         Log.Debug("Enabling CallTarget integration definitions in native library.");
 
                         InstrumentationCategory enabledCategories = InstrumentationCategory.Tracing;
@@ -541,7 +537,7 @@ private static void EnableCallSiteInstrumentations(InstrumentationCategory categ
                 var debugMsg = (isIast && raspEnabled) ? "IAST/RASP" : (isIast ? "IAST" : "RASP");
                 Log.Debug("Registering {DebugMsg} Callsite Dataflow Aspects into native library.", debugMsg);
 
-                var aspects = NativeMethods.InitEmbeddedCallSiteDefinitions(categories, _targetFramework);
+                var aspects = NativeMethods.InitEmbeddedCallSiteDefinitions(categories, ConfigTelemetryData.TargetFramework);
                 Log.Information<int, string>("{Aspects} {DebugMsg} Callsite Dataflow Aspects added to the profiler.", aspects, debugMsg);
 
                 if (isIast)

tracer/src/Datadog.Trace/Telemetry/DTOs/ConfigTelemetryData.cs

@@ -5,6 +5,8 @@
 
 #nullable enable
 
+using Datadog.Trace.ClrProfiler;
+
 namespace Datadog.Trace.Telemetry
 {
     internal static class ConfigTelemetryData
@@ -27,12 +29,16 @@ internal static class ConfigTelemetryData
         // We intentionally are using specific values here, not OR_GREATER_THAN
 #if NET6_0
         public const string ManagedTracerTfmValue = "net6.0";
+        internal const TargetFrameworks TargetFramework = TargetFrameworks.NET6_0;
 #elif NETCOREAPP3_1
         public const string ManagedTracerTfmValue = "netcoreapp3.1";
+        internal const TargetFrameworks TargetFramework = TargetFrameworks.NETCOREAPP3_1;
 #elif NETSTANDARD2_0
         public const string ManagedTracerTfmValue = "netstandard2.0";
+        internal const TargetFrameworks TargetFramework = TargetFrameworks.NETSTANDARD2_0;
 #elif NETFRAMEWORK
         public const string ManagedTracerTfmValue = "net461";
+        internal const TargetFrameworks TargetFramework = TargetFrameworks.NET461;
 #else
 #error Unexpected TFM
 #endif