Merge branch 'master' into chrisnas/flacky_etw_tests

Author: chrisnas

tracer/build/_build/CodeGenerators/CallSitesGenerator.cs

@@ -251,6 +251,7 @@ static string GetArgument(Mono.Cecil.CustomAttributeArgument customAttributeArgu
         internal static void GenerateFile(Dictionary<string, AspectClass> aspectClasses, AbsolutePath outputPath)
         {
             var sb = new StringBuilder();
+            bool inWin32Section = false;
             sb.AppendLine("""
                 // <copyright company="Datadog">
                 // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
@@ -273,7 +274,25 @@ namespace trace
 
                 foreach (var method in aspectClass.Value.Aspects.OrderBy(static k => k.Key.ToString(), StringComparer.OrdinalIgnoreCase))
                 {
-                    sb.AppendLine(Format("  " + method.Key + method.Value.Subfix()));
+                    bool win32Only = method.Value.Tfms.IsNetFxOnly();
+                    if (win32Only && !inWin32Section)
+                    {
+                        inWin32Section = true;
+                        sb.AppendLine("#if _WIN32");
+                    }
+                    else if (!win32Only && inWin32Section)
+                    {
+                        inWin32Section = false;
+                        sb.AppendLine("#endif");
+                    }
+
+                    sb.AppendLine(Format("  " + method.Key + method.Value.Suffix()));
+                }
+
+                if (inWin32Section)
+                {
+                    inWin32Section = false;
+                    sb.AppendLine("#endif");
                 }
             }
 
@@ -319,7 +338,7 @@ public Aspect() { }
 
             public TargetFrameworks Tfms = TargetFrameworks.None;
 
-            public string Subfix()
+            public string Suffix()
             {
                 return $" {((long)Tfms).ToString()}";
             }

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

@@ -546,6 +546,7 @@ namespace trace
 
 
             //Write all CallTargets
+            bool inWin32Section = false;
             sb.AppendLine();
             sb.AppendLine("std::vector<CallTargetDefinition3> g_callTargets=");
             sb.AppendLine("{");
@@ -556,9 +557,27 @@ namespace trace
                                         .ThenBy(static x => x.Key.TargetTypeName)
                                         .ThenBy(static x => x.Key.TargetMethodName))
             {
+                bool win32Only = definition.Value.IsNetFxOnly();
+                if (win32Only && !inWin32Section)
+                {
+                    inWin32Section = true;
+                    sb.AppendLine("#if _WIN32");
+                }
+                else if (!win32Only && inWin32Section)
+                {
+                    inWin32Section = false;
+                    sb.AppendLine("#endif");
+                }
+
                 sb.AppendLine(GetCallTarget(definition.Key, signatures[GetSignature(definition.Key)], definition.Value, x++));
             }
 
+            if (inWin32Section)
+            {
+                inWin32Section = false;
+                sb.AppendLine("#endif");
+            }
+
             sb.AppendLine("""
                 };
                 }
@@ -639,7 +658,6 @@ internal static void GenerateJsonFile(Dictionary<CallTargetDefinitionSource, Tar
             Logger.Information("CallTarget definitions File saved: {File}", fileName);
         }
 
-
         internal static TargetFrameworks GetCategory(TargetFramework tfm)
         {
             return (TargetFrameworks)Enum.Parse<TargetFrameworks>(tfm.ToString().ToUpper().Replace('.', '_'));

tracer/build/_build/CodeGenerators/TargetFrameworks.cs

@@ -16,14 +16,16 @@ internal enum TargetFrameworks : uint
     // NOTE : When modifying this file make sure to update the TargetFrameworks enum in the ClrProfiler folder inside the Datadog.Trace project
 
     NET461 = 1,
-    NET462 = 2,
-    NETSTANDARD2_0 = 4,
-    NETCOREAPP2_1 = 8,
-    NETCOREAPP3_0 = 16,
-    NETCOREAPP3_1 = 32,
-    NET5_0 = 64,
-    NET6_0 = 128,
-    NET7_0 = 256,
-    NET8_0 = 512,
-    NET0_0 = 1024,
+    NETSTANDARD2_0 = 2,
+    NETCOREAPP3_1 = 4,
+    NET6_0 = 8,
+}
+
+
+internal static class TargetFrameworksExtensions
+{ 
+    public static bool IsNetFxOnly(this TargetFrameworks tfm)
+    {
+        return tfm == TargetFrameworks.NET461;
+    }
 }

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

@@ -14,14 +14,7 @@ internal enum TargetFrameworks : uint
     // NOTE : When modifying this file make sure to update the TargetFrameworks enum in the CodeGenerator folder inside the _build project
 
     NET461 = 1,
-    NET462 = 2,
-    NETSTANDARD2_0 = 4,
-    NETCOREAPP2_1 = 8,
-    NETCOREAPP3_0 = 16,
-    NETCOREAPP3_1 = 32,
-    NET5_0 = 64,
-    NET6_0 = 128,
-    NET7_0 = 256,
-    NET8_0 = 512,
-    NET9_0 = 1024,
+    NETSTANDARD2_0 = 2,
+    NETCOREAPP3_1 = 4,
+    NET6_0 = 8,
 }

tracer/src/Datadog.Trace/DuckTyping/DuckType.cs

@@ -1350,7 +1350,7 @@ public static CreateTypeResult GetProxy(Type targetType)
                     return default;
                 }
 
-                return GetProxy(instance.GetType()).CreateInstance<T>(instance);
+                return instance is T tInst ? tInst : GetProxy(instance.GetType()).CreateInstance<T>(instance);
             }
 
             /// <summary>
@@ -1368,7 +1368,7 @@ public static CreateTypeResult GetProxy(Type targetType)
                     return default;
                 }
 
-                return GetProxy(typeof(TOriginal)).CreateInstance<T, TOriginal>(instance);
+                return instance is T tInst ? tInst : GetProxy(typeof(TOriginal)).CreateInstance<T, TOriginal>(instance);
             }
 
             /// <summary>
@@ -1384,7 +1384,7 @@ public static bool CanCreate(object? instance)
                     return false;
                 }
 
-                return GetProxy(instance.GetType()).CanCreate();
+                return instance is T || GetProxy(instance.GetType()).CanCreate();
             }
 
             /// <summary>

tracer/src/Datadog.Trace/DuckTyping/DuckTypeExtensions.cs

@@ -48,6 +48,12 @@ public static object DuckCast(this object instance, Type targetType)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool TryDuckCast<T>(this object? instance, [NotNullWhen(true)] out T? value)
         {
+            if (instance is T tInst)
+            {
+                value = tInst;
+                return true;
+            }
+
             if (instance is not null &&
                 DuckType.CreateCache<T>.GetProxy(instance.GetType()) is { Success: true } proxyResult)
             {
@@ -71,11 +77,20 @@ public static bool TryDuckCast(this object? instance, Type targetType, [NotNullW
         {
             if (targetType is null) { ThrowHelper.ThrowArgumentNullException(nameof(targetType)); }
 
-            if (instance is not null &&
-                DuckType.GetOrCreateProxyType(targetType, instance.GetType()) is { Success: true } proxyResult)
+            if (instance is not null)
             {
-                value = proxyResult.CreateInstance(instance);
-                return true;
+                var instanceType = instance.GetType();
+                if (instanceType == targetType)
+                {
+                    value = instance;
+                    return true;
+                }
+
+                if (DuckType.GetOrCreateProxyType(targetType, instanceType) is { Success: true } proxyResult)
+                {
+                    value = proxyResult.CreateInstance(instance);
+                    return true;
+                }
             }
 
             value = default;
@@ -92,6 +107,11 @@ public static bool TryDuckCast(this object? instance, Type targetType, [NotNullW
         public static T? DuckAs<T>(this object? instance)
             where T : class
         {
+            if (instance is T tInst)
+            {
+                return tInst;
+            }
+
             if (instance is not null &&
                 DuckType.CreateCache<T>.GetProxy(instance.GetType()) is { Success: true } proxyResult)
             {
@@ -112,10 +132,18 @@ public static bool TryDuckCast(this object? instance, Type targetType, [NotNullW
         {
             if (targetType is null) { ThrowHelper.ThrowArgumentNullException(nameof(targetType)); }
 
-            if (instance is not null &&
-                DuckType.GetOrCreateProxyType(targetType, instance.GetType()) is { Success: true } proxyResult)
+            if (instance is not null)
             {
-                return proxyResult.CreateInstance(instance);
+                var instanceType = instance.GetType();
+                if (instanceType == targetType)
+                {
+                    return instance;
+                }
+
+                if (DuckType.GetOrCreateProxyType(targetType, instanceType) is { Success: true } proxyResult)
+                {
+                    return proxyResult.CreateInstance(instance);
+                }
             }
 
             return null;