Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ __fuzz__
#==============================================================================#
.DS_Store
.env
.envrc
.direnv
Cargo.lock # this is ignored so you don't update by accident, but is committed.
docker-sync.yml
libtest.so
Expand Down
2 changes: 1 addition & 1 deletion libdd-data-pipeline-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ build_common = { path = "../build-common" }
[dev-dependencies]
httpmock = "0.8.0-alpha.1"
rmp-serde = "1.1.1"
libdd-trace-utils = { path = "../libdd-trace-utils" }

[dependencies]
libdd-data-pipeline = { path = "../libdd-data-pipeline" }
libdd-common-ffi = { path = "../libdd-common-ffi", default-features = false }
libdd-tinybytes = { path = "../libdd-tinybytes" }
libdd-trace-utils = { path = "../libdd-trace-utils", default-features = false }
tracing = { version = "0.1", default-features = false }
4 changes: 3 additions & 1 deletion libdd-data-pipeline-ffi/cbindgen.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ renaming_overrides_prefixing = true
"ExporterResponse" = "ddog_TraceExporterResponse"
"ExporterErrorCode" = "ddog_TraceExporterErrorCode"
"ExporterError" = "ddog_TraceExporterError"
"TracerSpan" = "ddog_TracerSpan"
"TracerTraceChunks" = "ddog_TracerTraceChunks"

[export.mangle]
rename_types = "PascalCase"
Expand All @@ -36,4 +38,4 @@ must_use = "DDOG_CHECK_RETURN"

[parse]
parse_deps = true
include = ["libdd-common", "libdd-common-ffi", "libdd-data-pipeline"]
include = ["libdd-common", "libdd-common-ffi", "libdd-data-pipeline", "libdd-trace-utils"]
1 change: 1 addition & 0 deletions libdd-data-pipeline-ffi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
mod error;
mod response;
mod trace_exporter;
mod tracer;

#[cfg(all(feature = "catch_panic", panic = "unwind"))]
macro_rules! catch_panic {
Expand Down
27 changes: 18 additions & 9 deletions libdd-data-pipeline-ffi/src/trace_exporter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use libdd_data_pipeline::trace_exporter::{
TelemetryConfig, TraceExporter, TraceExporterInputFormat, TraceExporterOutputFormat,
};
use std::{ptr::NonNull, time::Duration};
use tracing::{debug, error};
use tracing::debug;

#[inline]
fn sanitize_string(str: CharSlice) -> Result<String, Box<ExporterError>> {
Expand Down Expand Up @@ -73,12 +73,15 @@ pub struct TraceExporterConfig {
#[no_mangle]
pub unsafe extern "C" fn ddog_trace_exporter_config_new(
out_handle: NonNull<Box<TraceExporterConfig>>,
) {
) -> Option<Box<ExporterError>> {
catch_panic!(
out_handle
.as_ptr()
.write(Box::<TraceExporterConfig>::default()),
()
{
out_handle
.as_ptr()
.write(Box::<TraceExporterConfig>::default());
None
},
gen_error!(ErrorCode::Panic)
)
}

Expand Down Expand Up @@ -542,7 +545,9 @@ mod tests {
unsafe {
let mut config: MaybeUninit<Box<TraceExporterConfig>> = MaybeUninit::uninit();

ddog_trace_exporter_config_new(NonNull::new_unchecked(&mut config).cast());
let err =
ddog_trace_exporter_config_new(NonNull::new_unchecked(&mut config).cast());
assert_eq!(err, None);

let cfg = config.assume_init();
assert_eq!(cfg.url, None);
Expand Down Expand Up @@ -848,7 +853,9 @@ mod tests {
fn exporter_constructor_test() {
unsafe {
let mut config: MaybeUninit<Box<TraceExporterConfig>> = MaybeUninit::uninit();
ddog_trace_exporter_config_new(NonNull::new_unchecked(&mut config).cast());
let err =
ddog_trace_exporter_config_new(NonNull::new_unchecked(&mut config).cast());
assert_eq!(err, None);

let mut cfg = config.assume_init();
let error = ddog_trace_exporter_config_set_url(
Expand Down Expand Up @@ -877,7 +884,9 @@ mod tests {
fn exporter_constructor_error_test() {
unsafe {
let mut config: MaybeUninit<Box<TraceExporterConfig>> = MaybeUninit::uninit();
ddog_trace_exporter_config_new(NonNull::new_unchecked(&mut config).cast());
let err =
ddog_trace_exporter_config_new(NonNull::new_unchecked(&mut config).cast());
assert_eq!(err, None);

let mut cfg = config.assume_init();
let error = ddog_trace_exporter_config_set_service(
Expand Down
Loading
Loading