diff --git a/Cargo.lock b/Cargo.lock index 3a813d980c..9924264c1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -744,7 +744,7 @@ dependencies = [ "criterion-perf-events", "crossbeam-channel", "datadog-profiling", - "ddcommon 6.0.0", + "ddcommon 7.0.0", "env_logger", "indexmap 2.2.3", "lazy_static", @@ -761,8 +761,8 @@ dependencies = [ [[package]] name = "datadog-profiling" -version = "6.0.0" -source = "git+https://github.com/DataDog/libdatadog?tag=v6.0.0#724a83c3a1875ac1eb1685b92d42a135b7bf2366" +version = "7.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v7.0.0#1fe7d8cb4b54c723831d6169e3be3c462367ac8a" dependencies = [ "anyhow", "backtrace", @@ -770,7 +770,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "ddcommon 6.0.0", + "ddcommon 7.0.0", "derivative", "futures", "futures-core", @@ -945,8 +945,8 @@ dependencies = [ [[package]] name = "ddcommon" -version = "6.0.0" -source = "git+https://github.com/DataDog/libdatadog?tag=v6.0.0#724a83c3a1875ac1eb1685b92d42a135b7bf2366" +version = "7.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v7.0.0#1fe7d8cb4b54c723831d6169e3be3c462367ac8a" dependencies = [ "anyhow", "futures", diff --git a/profiling/Cargo.toml b/profiling/Cargo.toml index 9ff6b78b49..cc0b1d8e92 100644 --- a/profiling/Cargo.toml +++ b/profiling/Cargo.toml @@ -20,8 +20,8 @@ bumpalo = { version = "3.12", features = ["collections"] } cfg-if = { version = "1.0" } cpu-time = { version = "1.0" } crossbeam-channel = { version = "0.5", default-features = false, features = ["std"] } -datadog-profiling = { git = "https://github.com/DataDog/libdatadog", tag = "v6.0.0" } -ddcommon = { git = "https://github.com/DataDog/libdatadog", tag = "v6.0.0" } +datadog-profiling = { git = "https://github.com/DataDog/libdatadog", tag = "v7.0.0" } +ddcommon = { git = "https://github.com/DataDog/libdatadog", tag = "v7.0.0" } env_logger = { version = "0.10" } indexmap = { version = "2.2.0" } lazy_static = { version = "1.4" } diff --git a/profiling/src/config.rs b/profiling/src/config.rs index 648a2f8665..e192b41eab 100644 --- a/profiling/src/config.rs +++ b/profiling/src/config.rs @@ -168,7 +168,7 @@ impl Default for AgentEndpoint { } } -impl TryFrom for datadog_profiling::exporter::Endpoint { +impl TryFrom for ddcommon::Endpoint { type Error = anyhow::Error; fn try_from(value: AgentEndpoint) -> Result { @@ -179,7 +179,7 @@ impl TryFrom for datadog_profiling::exporter::Endpoint { } } -impl TryFrom<&AgentEndpoint> for datadog_profiling::exporter::Endpoint { +impl TryFrom<&AgentEndpoint> for ddcommon::Endpoint { type Error = anyhow::Error; fn try_from(value: &AgentEndpoint) -> Result { diff --git a/profiling/src/profiling/uploader.rs b/profiling/src/profiling/uploader.rs index 1ad7681789..d439b2b357 100644 --- a/profiling/src/profiling/uploader.rs +++ b/profiling/src/profiling/uploader.rs @@ -4,7 +4,8 @@ use crate::exception::EXCEPTION_PROFILING_EXCEPTION_COUNT; use crate::profiling::{UploadMessage, UploadRequest}; use crate::{PROFILER_NAME_STR, PROFILER_VERSION_STR}; use crossbeam_channel::{select, Receiver}; -use datadog_profiling::exporter::{Endpoint, File}; +use datadog_profiling::exporter::File; +use ddcommon::Endpoint; use log::{debug, info, warn}; use serde_json::json; use std::borrow::Cow;