Ruggerize aspects loading synchronization

daniel-romano-DD · daniel-romano-DD · commit 983e57799ed2 · 2025-11-23T22:45:50.000+01:00
diff --git a/tracer/src/Datadog.Tracer.Native/cor_profiler.cpp b/tracer/src/Datadog.Tracer.Native/cor_profiler.cpp
@@ -2070,6 +2070,7 @@ long CorProfiler::DisableCallTargetDefinitions(UINT32 disabledCategories)
 int CorProfiler::RegisterIastAspects(WCHAR** aspects, int aspectsLength, UINT32 enabledCategories, UINT32 platform)
 {
     auto _ = trace::Stats::Instance()->InitializeProfilerMeasure();
+    auto definitions = definitions_ids.Get(); // Synchronize Aspects loading
 
     auto dataflow = _dataflow;
     if (dataflow == nullptr && IsCallSiteManagedActivationEnabled())
@@ -2082,7 +2083,10 @@ int CorProfiler::RegisterIastAspects(WCHAR** aspects, int aspectsLength, UINT32
     {
         Logger::Info("Registering Callsite Aspects.");
         dataflow->LoadAspects(aspects, aspectsLength, enabledCategories, platform);
-        _dataflow = dataflow;
+        if (_dataflow == nullptr)
+        {
+            _dataflow = dataflow;
+        }
         return aspectsLength;
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -2070,6 +2070,7 @@ long CorProfiler::DisableCallTargetDefinitions(UINT32 disabledCategories)`
`2070`	`2070`	`int CorProfiler::RegisterIastAspects(WCHAR** aspects, int aspectsLength, UINT32 enabledCategories, UINT32 platform)`
`2071`	`2071`	`{`
`2072`	`2072`	`auto _ = trace::Stats::Instance()->InitializeProfilerMeasure();`
	`2073`	`+ auto definitions = definitions_ids.Get(); // Synchronize Aspects loading`
`2073`	`2074`
`2074`	`2075`	`auto dataflow = _dataflow;`
`2075`	`2076`	`if (dataflow == nullptr && IsCallSiteManagedActivationEnabled())`
`@@ -2082,7 +2083,10 @@ int CorProfiler::RegisterIastAspects(WCHAR** aspects, int aspectsLength, UINT32`
`2082`	`2083`	`{`
`2083`	`2084`	`Logger::Info("Registering Callsite Aspects.");`
`2084`	`2085`	`dataflow->LoadAspects(aspects, aspectsLength, enabledCategories, platform);`
`2085`		`- _dataflow = dataflow;`
	`2086`	`+ if (_dataflow == nullptr)`
	`2087`	`+ {`
	`2088`	`+ _dataflow = dataflow;`
	`2089`	`+ }`
`2086`	`2090`	`return aspectsLength;`
`2087`	`2091`	`}`
`2088`	`2092`	`else`