feat: move span code to sidecar-ffi

Signed-off-by: Alexandre Rulleau <[email protected]>

Author: Leiyks

Cargo.lock

@@ -23,10 +23,10 @@ build_common = { path = "../build-common" }
 
 [dev-dependencies]
 httpmock = "0.7.0"
+rmp-serde = "1.1.1"
+datadog-trace-utils = { path = "../datadog-trace-utils" }
 
 [dependencies]
 data-pipeline = { path = "../data-pipeline" }
-datadog-trace-utils = { path = "../datadog-trace-utils" }
 ddcommon-ffi = { path = "../ddcommon-ffi", default-features = false }
-rmp-serde = "1.1.1"
 tinybytes = { path = "../tinybytes" }

data-pipeline-ffi/Cargo.toml

@@ -4,14 +4,8 @@
 language = "C"
 cpp_compat = true
 tab_width = 2
-header = """// Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
+header = """// Copyright 2021-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
-
-typedef struct ddog_SpanBytes ddog_SpanBytes;
-typedef struct ddog_SpanLinkBytes ddog_SpanLinkBytes;
-typedef struct ddog_SpanEventBytes ddog_SpanEventBytes;
-typedef struct ddog_AttributeAnyValueBytes ddog_AttributeAnyValueBytes;
-typedef struct ddog_AttributeArrayValueBytes ddog_AttributeArrayValueBytes;
 """
 include_guard = "DDOG_DATA_PIPELINE_H"
 includes = ["common.h"]
@@ -29,9 +23,6 @@ renaming_overrides_prefixing = true
 "ExporterResponse" = "ddog_TraceExporterResponse"
 "ExporterErrorCode" = "ddog_TraceExporterErrorCode"
 "ExporterError" = "ddog_TraceExporterError"
-"Span" = "ddog_Span"
-"SpanBytes" = "ddog_SpanBytes"
-"SpanText" = "ddog_SpanText"
 
 [export.mangle]
 rename_types = "PascalCase"

data-pipeline-ffi/cbindgen.toml

@@ -8,5 +8,4 @@
 
 mod error;
 mod response;
-pub mod span;
 mod trace_exporter;

data-pipeline-ffi/src/lib.rs

@@ -20,11 +20,11 @@ ddcommon-ffi = { path = "../ddcommon-ffi", default-features = false }
 ddtelemetry-ffi = { path = "../ddtelemetry-ffi", default-features = false }
 datadog-remote-config = { path = "../datadog-remote-config" }
 datadog-live-debugger = { path = "../datadog-live-debugger" }
+dogstatsd-client = { path = "../dogstatsd-client" }
+tinybytes = { path = "../tinybytes" }
 paste = "1"
 libc = "0.2"
-dogstatsd-client = { path = "../dogstatsd-client" }
 tracing = { version = "0.1", default-features = false }
-data-pipeline-ffi = { path = "../data-pipeline-ffi" }
 rmp-serde = "1.1.1"
 
 

datadog-sidecar-ffi/Cargo.toml

@@ -5,6 +5,12 @@ language = "C"
 tab_width = 2
 header = """// Copyright 2021-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
+
+typedef struct ddog_SpanBytes ddog_SpanBytes;
+typedef struct ddog_SpanLinkBytes ddog_SpanLinkBytes;
+typedef struct ddog_SpanEventBytes ddog_SpanEventBytes;
+typedef struct ddog_AttributeAnyValueBytes ddog_AttributeAnyValueBytes;
+typedef struct ddog_AttributeArrayValueBytes ddog_AttributeArrayValueBytes;
 """
 include_guard = "DDOG_SIDECAR_H"
 style = "both"

datadog-sidecar-ffi/cbindgen.toml

@@ -7,7 +7,9 @@
 #![cfg_attr(not(test), deny(clippy::todo))]
 #![cfg_attr(not(test), deny(clippy::unimplemented))]
 
-use data_pipeline_ffi::span::TracesBytes;
+pub mod span;
+
+use crate::span::TracesBytes;
 #[cfg(windows)]
 use datadog_crashtracker_ffi::Metadata;
 use datadog_ipc::platform::{
@@ -1114,4 +1116,4 @@ pub unsafe extern "C" fn ddog_send_traces_to_sidecar(
 /// Drops the agent info reader.
 #[no_mangle]
 #[allow(clippy::missing_safety_doc)]
-pub unsafe extern "C" fn ddog_drop_agent_info_reader(_: Box<AgentInfoReader>) {}
+pub unsafe extern "C" fn ddog_drop_agent_info_reader(_: Box<AgentInfoReader>) {}