build(prof): bump libdatadog to version 15 (#3048)

* bump libdatadog to version `15` * fix setup-php version
DataDog · Jan 21, 2025 · e44d78d · e44d78d
1 parent 6b36477
commit e44d78d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 106 deletions.
diff --git a/.github/workflows/prof_correctness.yml b/.github/workflows/prof_correctness.yml
@@ -24,7 +24,7 @@ jobs:
           submodules: true
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@2.32.0
         with:
           php-version: ${{ matrix.php-version }}
           extensions: ${{ matrix.extensions }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/profiling/Cargo.toml b/profiling/Cargo.toml
@@ -19,9 +19,9 @@ cfg-if = { version = "1.0" }
 cpu-time = { version = "1.0" }
 chrono = { version = "0.4" }
 crossbeam-channel = { version = "0.5", default-features = false, features = ["std"] }
-datadog-alloc = { git = "https://github.com/DataDog/libdatadog", tag = "v10.0.0" }
-datadog-profiling = { git = "https://github.com/DataDog/libdatadog", tag = "v10.0.0" }
-ddcommon = { git = "https://github.com/DataDog/libdatadog", tag = "v10.0.0" }
+datadog-alloc = { git = "https://github.com/DataDog/libdatadog", tag = "v15.0.0" }
+datadog-profiling = { git = "https://github.com/DataDog/libdatadog", tag = "v15.0.0" }
+ddcommon = { git = "https://github.com/DataDog/libdatadog", tag = "v15.0.0" }
 env_logger = { version = "0.11", default-features = false }
 indexmap = { version = "2.2" }
 lazy_static = { version = "1.4" }

diff --git a/profiling/src/profiling/uploader.rs b/profiling/src/profiling/uploader.rs
@@ -13,7 +13,6 @@ use std::borrow::Cow;
 use std::str;
 use std::sync::atomic::Ordering;
 use std::sync::{Arc, Barrier};
-use std::time::Duration;
 
 pub struct Uploader {
     fork_barrier: Arc<Barrier>,
@@ -70,7 +69,7 @@ impl Uploader {
         let endpoint = Endpoint::try_from(agent_endpoint)?;
 
         let tags = Some(Arc::unwrap_or_clone(index.tags));
-        let exporter = datadog_profiling::exporter::ProfileExporter::new(
+        let mut exporter = datadog_profiling::exporter::ProfileExporter::new(
             profiling_library_name,
             profiling_library_version,
             "php",
@@ -87,7 +86,7 @@ impl Uploader {
             name: "profile.pprof",
             bytes: serialized.buffer.as_slice(),
         }];
-        let timeout = Duration::from_secs(10);
+        exporter.set_timeout(10000); // 10 seconds in milliseconds
         let request = exporter.build(
             start,
             end,
@@ -97,7 +96,6 @@ impl Uploader {
             endpoint_counts,
             Self::create_internal_metadata(),
             self.create_profiler_info(),
-            timeout,
         )?;
         debug!("Sending profile to: {agent_endpoint}");
         let result = exporter.send(request, None)?;