Revert "build(profiling): update to libdatadog v7 (#2605)"

This reverts commit e670e76.
DataDog · Apr 4, 2024 · 3dbd00c · 3dbd00c
1 parent 633c5ad
commit 3dbd00c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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 = "v7.0.0" }
-ddcommon = { git = "https://github.com/DataDog/libdatadog", tag = "v7.0.0" }
+datadog-profiling = { git = "https://github.com/DataDog/libdatadog", tag = "v6.0.0" }
+ddcommon = { git = "https://github.com/DataDog/libdatadog", tag = "v6.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
@@ -168,7 +168,7 @@ impl Default for AgentEndpoint {
     }
 }
 
-impl TryFrom<AgentEndpoint> for ddcommon::Endpoint {
+impl TryFrom<AgentEndpoint> for datadog_profiling::exporter::Endpoint {
     type Error = anyhow::Error;
 
     fn try_from(value: AgentEndpoint) -> Result<Self, Self::Error> {
@@ -179,7 +179,7 @@ impl TryFrom<AgentEndpoint> for ddcommon::Endpoint {
     }
 }
 
-impl TryFrom<&AgentEndpoint> for ddcommon::Endpoint {
+impl TryFrom<&AgentEndpoint> for datadog_profiling::exporter::Endpoint {
     type Error = anyhow::Error;
 
     fn try_from(value: &AgentEndpoint) -> Result<Self, Self::Error> {

diff --git a/profiling/src/profiling/uploader.rs b/profiling/src/profiling/uploader.rs
@@ -4,8 +4,7 @@ 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::File;
-use ddcommon::Endpoint;
+use datadog_profiling::exporter::{Endpoint, File};
 use log::{debug, info, warn};
 use serde_json::json;
 use std::borrow::Cow;