Skip to content

Commit e44d78d

Browse files
build(prof): bump libdatadog to version 15 (#3048)
* bump libdatadog to version `15` * fix setup-php version
1 parent 6b36477 commit e44d78d

File tree

4 files changed

+30
-106
lines changed

4 files changed

+30
-106
lines changed

.github/workflows/prof_correctness.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
submodules: true
2525

2626
- name: Setup PHP
27-
uses: shivammathur/setup-php@v2
27+
uses: shivammathur/setup-php@2.32.0
2828
with:
2929
php-version: ${{ matrix.php-version }}
3030
extensions: ${{ matrix.extensions }}

Cargo.lock

Lines changed: 24 additions & 98 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

profiling/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ cfg-if = { version = "1.0" }
1919
cpu-time = { version = "1.0" }
2020
chrono = { version = "0.4" }
2121
crossbeam-channel = { version = "0.5", default-features = false, features = ["std"] }
22-
datadog-alloc = { git = "https://github.com/DataDog/libdatadog", tag = "v10.0.0" }
23-
datadog-profiling = { git = "https://github.com/DataDog/libdatadog", tag = "v10.0.0" }
24-
ddcommon = { git = "https://github.com/DataDog/libdatadog", tag = "v10.0.0" }
22+
datadog-alloc = { git = "https://github.com/DataDog/libdatadog", tag = "v15.0.0" }
23+
datadog-profiling = { git = "https://github.com/DataDog/libdatadog", tag = "v15.0.0" }
24+
ddcommon = { git = "https://github.com/DataDog/libdatadog", tag = "v15.0.0" }
2525
env_logger = { version = "0.11", default-features = false }
2626
indexmap = { version = "2.2" }
2727
lazy_static = { version = "1.4" }

profiling/src/profiling/uploader.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use std::borrow::Cow;
1313
use std::str;
1414
use std::sync::atomic::Ordering;
1515
use std::sync::{Arc, Barrier};
16-
use std::time::Duration;
1716

1817
pub struct Uploader {
1918
fork_barrier: Arc<Barrier>,
@@ -70,7 +69,7 @@ impl Uploader {
7069
let endpoint = Endpoint::try_from(agent_endpoint)?;
7170

7271
let tags = Some(Arc::unwrap_or_clone(index.tags));
73-
let exporter = datadog_profiling::exporter::ProfileExporter::new(
72+
let mut exporter = datadog_profiling::exporter::ProfileExporter::new(
7473
profiling_library_name,
7574
profiling_library_version,
7675
"php",
@@ -87,7 +86,7 @@ impl Uploader {
8786
name: "profile.pprof",
8887
bytes: serialized.buffer.as_slice(),
8988
}];
90-
let timeout = Duration::from_secs(10);
89+
exporter.set_timeout(10000); // 10 seconds in milliseconds
9190
let request = exporter.build(
9291
start,
9392
end,
@@ -97,7 +96,6 @@ impl Uploader {
9796
endpoint_counts,
9897
Self::create_internal_metadata(),
9998
self.create_profiler_info(),
100-
timeout,
10199
)?;
102100
debug!("Sending profile to: {agent_endpoint}");
103101
let result = exporter.send(request, None)?;

0 commit comments

Comments
 (0)