Merge branch 'master' into nacho/IastUnitTestsDebugCI

DataDog · Feb 7, 2025 · fc0ef34 · fc0ef34
2 parents eb0283d + 8a195ac
commit fc0ef34
Show file tree

Hide file tree

Showing 17 changed files with 1,404 additions and 970 deletions.
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/OsSpecificApi.cpp b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/OsSpecificApi.cpp
@@ -300,11 +300,12 @@ std::chrono::seconds GetMachineBootTime()
         auto pos = sv.find("btime");
         if (std::string_view::npos != pos)
         {
-            auto pos2 = strchr(sv.data() + pos, ' ') + 1;
+            auto pos2 = strchr(sv.data() + pos, ' ');
             if (pos2 == nullptr)
                 break;
 
             // skip whitespaces
+            pos2++;
             pos2 = pos2 + strspn(pos2, " ");
             machineBootTime = std::atoll(pos2);
             break;

diff --git a/tracer/build/PackageVersionsLatestMajors.g.props b/tracer/build/PackageVersionsLatestMajors.g.props
diff --git a/tracer/build/PackageVersionsLatestMinors.g.props b/tracer/build/PackageVersionsLatestMinors.g.props
diff --git a/tracer/build/PackageVersionsLatestSpecific.g.props b/tracer/build/PackageVersionsLatestSpecific.g.props
diff --git a/tracer/build/_build/_build.csproj b/tracer/build/_build/_build.csproj
@@ -42,7 +42,7 @@
     <!-- Explicitly override the version of octokit used by Nuke -->
     <PackageReference Include="Octokit" Version="10.0.0" />
     <PackageReference Include="Perfolizer" Version="0.2.1" />
-    <PackageReference Include="Sep" Version="0.5.2" />
+    <PackageReference Include="Sep" Version="0.7.0" />
     <PackageReference Include="ByteSize" Version="2.1.0" />
     <!-- Enable binary serialization for .NET 9 -->
     <PackageReference Include="System.Runtime.Serialization.Formatters" Version="9.0.0" Condition="$(USE_NATIVE_SDK_VERSION) != 'true'" />