Add tests

DataDog · Nov 15, 2024 · c8ef7f1 · c8ef7f1
1 parent 9c86443
commit c8ef7f1
Show file tree

Hide file tree

Showing 3 changed files with 322 additions and 101 deletions.
diff --git a/tracer/src/Datadog.Trace/Debugger/SpanCodeOrigin/EndpointDetector.cs b/tracer/src/Datadog.Trace/Debugger/SpanCodeOrigin/EndpointDetector.cs
@@ -165,10 +165,24 @@ private static bool HasAttributeFromSet(CustomAttributeHandleCollection attribut
     {
         foreach (var attributeHandle in attributes)
         {
+            string fullName;
             var attribute = reader.GetCustomAttribute(attributeHandle);
-            var ctor = reader.GetMemberReference((MemberReferenceHandle)attribute.Constructor);
-            var attributeType = reader.GetTypeReference((TypeReferenceHandle)ctor.Parent);
-            var fullName = GetFullTypeName(attributeType.Namespace, attributeType.Name, reader);
+            if (attribute.Constructor.Kind == HandleKind.MemberReference)
+            {
+                var ctor = reader.GetMemberReference((MemberReferenceHandle)attribute.Constructor);
+                var attributeType = reader.GetTypeReference((TypeReferenceHandle)ctor.Parent);
+                fullName = GetFullTypeName(attributeType.Namespace, attributeType.Name, reader);
+            }
+            else if (attribute.Constructor.Kind == HandleKind.MethodDefinition)
+            {
+                var ctor = reader.GetMethodDefinition((MethodDefinitionHandle)attribute.Constructor);
+                var attributeType = reader.GetTypeDefinition(ctor.GetDeclaringType());
+                fullName = GetFullTypeName(attributeType.Namespace, attributeType.Name, reader);
+            }
+            else
+            {
+                continue;
+            }
 
             if (attributeNames.Contains(fullName))
             {

diff --git a/tracer/src/Datadog.Trace/Debugger/SpanCodeOrigin/SpanCodeOriginManager.cs b/tracer/src/Datadog.Trace/Debugger/SpanCodeOrigin/SpanCodeOriginManager.cs
@@ -21,24 +21,24 @@ internal class SpanCodeOriginManager
     {
         private static readonly IDatadogLogger Log = DatadogLogging.GetLoggerFor(typeof(SpanCodeOriginManager));
 
-        private readonly int _maxUserFrames;
-
-        private readonly bool _isCodeOriginEnabled;
-
         private readonly ConcurrentDictionary<Assembly, AssemblyPdbInfo?> _assemblyPdbCache = new();
 
         private readonly CodeOriginTags _tags;
 
+        private readonly int _maxUserFrames;
+
+        private readonly bool _isCodeOriginEnabled;
+
         private readonly ImmutableHashSet<string> _thirdPartyDetectionExcludes;
 
         private readonly ImmutableHashSet<string> _thirdPartyDetectionIncludes;
 
         private SpanCodeOriginManager()
         {
+            _tags = new CodeOriginTags(_maxUserFrames);
             var settings = LiveDebugger.Instance?.Settings ?? DebuggerSettings.FromDefaultSource();
             _maxUserFrames = settings.CodeOriginMaxUserFrames;
             _isCodeOriginEnabled = settings.CodeOriginForSpansEnabled;
-            _tags = new CodeOriginTags(_maxUserFrames);
             _thirdPartyDetectionExcludes = settings.ThirdPartyDetectionExcludes;
             _thirdPartyDetectionIncludes = settings.ThirdPartyDetectionIncludes;
         }