Address PR comment

Author: gleocadie

tracer/build/_build/Build.Profiler.Steps.cs

@@ -390,7 +390,7 @@ async Task DownloadAndExtractVcpkg(AbsolutePath destinationFolder)
             var sourceDir = ProfilerDeployDirectory / arch;
             EnsureExistingDirectory(MonitoringHomeDirectory / arch);
 
-            var files = new[] { "Datadog.Profiler.Native.so" };
+            var files = new[] { "Datadog.Profiler.Native.so", "libdatadog_profiling.so" };
             foreach (var file in files)
             {
                 var source = sourceDir / file;
@@ -426,16 +426,20 @@ async Task DownloadAndExtractVcpkg(AbsolutePath destinationFolder)
         .After(CompileProfilerNativeSrc)
         .Executes(() =>
         {
-            foreach (var architecture in ArchitecturesForPlatformForProfiler)
+            var files = new[] { "Datadog.Profiler.Native", "datadog_profiling_ffi" };
+            foreach (var file in files)
             {
-                var sourceDir = ProfilerDeployDirectory / $"win-{architecture}";
-                var source = sourceDir / "Datadog.Profiler.Native.dll";
-                var dest = MonitoringHomeDirectory / $"win-{architecture}";
-                CopyFileToDirectory(source, dest, FileExistsPolicy.Overwrite);
-
-                source = sourceDir / "Datadog.Profiler.Native.pdb";
-                dest = SymbolsDirectory / $"win-{architecture}" / Path.GetFileName(source);
-                CopyFile(source, dest, FileExistsPolicy.Overwrite);
+                foreach (var architecture in ArchitecturesForPlatformForProfiler)
+                {
+                    var sourceDir = ProfilerDeployDirectory / $"win-{architecture}";
+                    var source = sourceDir / $"{file}.dll";
+                    var dest = MonitoringHomeDirectory / $"win-{architecture}";
+                    CopyFileToDirectory(source, dest, FileExistsPolicy.Overwrite);
+
+                    source = sourceDir / $"{file}.pdb";
+                    dest = SymbolsDirectory / $"win-{architecture}" / Path.GetFileName(source);
+                    CopyFile(source, dest, FileExistsPolicy.Overwrite);
+                }
             }
         });
 
@@ -953,7 +957,7 @@ void RunCppCheck(string projectName, MSBuildTargetPlatform platform)
         .Executes(() =>
         {
             var (arch, extension) = GetUnixArchitectureAndExtension();
-            var dest = ProfilerDeployDirectory / arch / $"{FileNames.NativeProfiler}.{extension}";
+            var files = new[] {$"{FileNames.NativeProfiler}.{extension}", $"libdatadog_profiling.{extension}"};
 
             // If we need to increase this version on arm64 later, that is ok as long
             // as it doesn't go above 2.23. Just update the version below. We must
@@ -965,8 +969,14 @@ void RunCppCheck(string projectName, MSBuildTargetPlatform platform)
                 ? new Version(2, 18)
                 : new Version(2, 17);
 
-            ValidateNativeLibraryGlibcCompatibility(dest, expectedGlibcVersion);
+            foreach (var file in files)
+            {
+                var dest = ProfilerDeployDirectory / arch / file;
+
+                ValidateNativeLibraryGlibcCompatibility(dest, expectedGlibcVersion);
+            }
         });
+
     enum SanitizerKind
     {
         None,

tracer/build/_build/Build.Shared.Steps.cs

@@ -267,50 +267,6 @@ partial class Build
                 true);
         });
 
-    Target PublishLibdatadog => _ => _
-        .Unlisted()
-        .DependsOn(PublishLibdatadogWindows)
-        .DependsOn(PublishLibdatadogLinux);
-
-    Target PublishLibdatadogWindows => _ => _
-        .Unlisted()
-        .OnlyWhenStatic(() => IsWin)
-        .After(CompileProfilerNativeSrc)
-        .Executes(() =>
-        {
-            const string fileName = "datadog_profiling_ffi";
-            foreach (var architecture in ArchitecturesForPlatformForProfiler)
-            {
-                var sourceDir = ProfilerDeployDirectory / $"win-{architecture}";
-                var source = sourceDir / $"{fileName}.dll";
-                var dest = MonitoringHomeDirectory / $"win-{architecture}";
-                CopyFileToDirectory(source, dest, FileExistsPolicy.Overwrite);
-
-                source = sourceDir / $"{fileName}.pdb";
-                dest = SymbolsDirectory / $"win-{architecture}" / Path.GetFileName(source);
-                CopyFile(source, dest, FileExistsPolicy.Overwrite);
-            }
-        });
-
-    Target PublishLibdatadogLinux => _ => _
-        .Unlisted()
-        .OnlyWhenStatic(() => IsLinux)
-        .After(CompileProfilerNativeSrc)
-        .Executes(() =>
-        {
-            var (arch, _) = GetUnixArchitectureAndExtension();
-            var sourceDir = ProfilerDeployDirectory / arch;
-            EnsureExistingDirectory(MonitoringHomeDirectory / arch);
-
-            var files = new[] { "libdatadog_profiling.so" };
-            foreach (var file in files)
-            {
-                var source = sourceDir / file;
-                var dest = MonitoringHomeDirectory / arch / file;
-                CopyFile(source, dest, FileExistsPolicy.Overwrite);
-            }
-        });
-
     Target ValidateNativeTracerGlibcCompatibility => _ => _
         .Unlisted()
         .OnlyWhenStatic(() => IsLinux)
@@ -320,7 +276,7 @@ partial class Build
         .Executes(() =>
         {
             var (arch, extension) = GetUnixArchitectureAndExtension();
-            var dest = MonitoringHomeDirectory / arch / $"{NativeTracerProject.Name}.{extension}";
+            var files = new[] {$"{NativeTracerProject.Name}.{extension}", $"libddwaf.{extension}"};
 
             // If we need to increase this version on arm64 later, that is ok as long
             // as it doesn't go above 2.23. Just update the version below. We must
@@ -332,7 +288,12 @@ partial class Build
                 ? new Version(2, 18)
                 : new Version(2, 17);
 
-            ValidateNativeLibraryGlibcCompatibility(dest, expectedGlibcVersion);
+            foreach (var file in files)
+            {
+                var dest = MonitoringHomeDirectory / arch / $"{file}";
+
+                ValidateNativeLibraryGlibcCompatibility(dest, expectedGlibcVersion);
+            }
         });
 
     void ValidateNativeLibraryGlibcCompatibility(AbsolutePath libraryPath, Version expectedGlibcVersion)
@@ -346,7 +307,7 @@ void ValidateNativeLibraryGlibcCompatibility(AbsolutePath libraryPath, Version e
         {
             throw new Exception($"Alpine build of {filename} should not have glibc symbols in the binary, but found {glibcVersion}");
         }
-        else if (!IsAlpine && glibcVersion != expectedGlibcVersion)
+        else if (!IsAlpine && glibcVersion > expectedGlibcVersion)
         {
             throw new Exception($"{filename} should have a minimum required glibc version of {expectedGlibcVersion} but has {glibcVersion}");
         }

tracer/build/_build/Build.cs

@@ -231,8 +231,7 @@ void DeleteReparsePoints(string path)
         .Description("Builds the Profiler native and managed src, and publishes the profiler home directory")
         .After(Clean)
         .DependsOn(CompileProfilerNativeSrc)
-        .DependsOn(PublishProfiler)
-        .DependsOn(PublishLibdatadog);
+        .DependsOn(PublishProfiler);
 
     Target BuildNativeLoader => _ => _
         .Description("Builds the Native Loader, and publishes to the monitoring home directory")