fix code for recursive messages

DataDog · Dec 19, 2024 · daf650f · daf650f
1 parent 6048926
commit daf650f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Protobuf/SchemaExtractor.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Protobuf/SchemaExtractor.cs
@@ -126,7 +126,10 @@ private ulong ExtractSchema(IMessageDescriptorProxy descriptor, int depth = 0)
 
             if (!_schemas.ContainsKey(descriptor.Name))
             {
-                _schemas.Add(descriptor.Name, new OpenApiSchema { Type = "object", Properties = ExtractFields(descriptor, depth) });
+                var schema = new OpenApiSchema { Type = "object" };
+                _schemas.Add(descriptor.Name, schema);
+                // It's important that we extract the fields AFTER adding the key to the dict, to make sure we don't re-extract on recursive message types
+                schema.Properties = ExtractFields(descriptor, depth);
             }
 
             return _computedHash;