refactor(libdd-data-pipeline): feature gate telemetry

libdd-data-pipeline-ffi/Cargo.toml

@@ -16,9 +16,11 @@ crate-type = ["lib", "staticlib", "cdylib"]
 bench = false
 
 [features]
-default = ["cbindgen", "catch_panic"]
+default = ["cbindgen", "catch_panic", "https", "telemetry"]
 catch_panic = []
 cbindgen = ["build_common/cbindgen", "libdd-common-ffi/cbindgen"]
+https = ["libdd-data-pipeline/https"]
+telemetry = ["libdd-data-pipeline/telemetry"]
 
 [build-dependencies]
 build_common = { path = "../build-common" }
@@ -29,8 +31,8 @@ rmp-serde = "1.1.1"
 libdd-trace-utils = { path = "../libdd-trace-utils" }
 
 [dependencies]
+libdd-data-pipeline = { path = "../libdd-data-pipeline", default-features = false }
 libdd-capabilities-impl = { version = "0.1.0", path = "../libdd-capabilities-impl" }
-libdd-data-pipeline = { path = "../libdd-data-pipeline" }
 libdd-common-ffi = { path = "../libdd-common-ffi", default-features = false }
 libdd-tinybytes = { path = "../libdd-tinybytes" }
 tracing = { version = "0.1", default-features = false }

libdd-data-pipeline-ffi/src/error.rs

@@ -1,7 +1,7 @@
 // Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
-use libdd_data_pipeline::trace_exporter::error::{
+use libdd_data_pipeline::trace_exporter::{
     AgentErrorKind, BuilderErrorKind, InternalErrorKind, NetworkErrorKind, TraceExporterError,
 };
 use std::ffi::{c_char, CString};

libdd-data-pipeline-ffi/src/response.rs

@@ -3,7 +3,7 @@
 
 //! Define FFI compatible AgentResponse struct
 
-use libdd_data_pipeline::trace_exporter::agent_response::AgentResponse;
+use libdd_data_pipeline::trace_exporter::AgentResponse;
 use std::ptr::null;
 
 /// Structure containing the agent response to a trace payload

libdd-data-pipeline-ffi/src/trace_exporter.rs

@@ -10,14 +10,16 @@ use libdd_common_ffi::{
     {slice::AsBytes, slice::ByteSlice},
 };
 
+#[cfg(feature = "telemetry")]
+use libdd_data_pipeline::trace_exporter::TelemetryConfig;
 use libdd_data_pipeline::trace_exporter::{
-    TelemetryConfig, TraceExporter as GenericTraceExporter, TraceExporterInputFormat,
-    TraceExporterOutputFormat,
+    TraceExporter as GenericTraceExporter, TraceExporterInputFormat, TraceExporterOutputFormat,
 };
 
 type TraceExporter = GenericTraceExporter<NativeCapabilities>;
 
 use std::{ptr::NonNull, time::Duration};
+#[cfg(feature = "telemetry")]
 use tracing::debug;
 
 #[inline]
@@ -32,6 +34,7 @@ fn sanitize_string(str: CharSlice) -> Result<String, Box<ExporterError>> {
 }
 
 /// FFI compatible configuration for the TelemetryClient.
+#[cfg(feature = "telemetry")]
 #[derive(Debug)]
 #[repr(C)]
 pub struct TelemetryClientConfig<'a> {
@@ -68,6 +71,7 @@ pub struct TraceExporterConfig {
     output_format: TraceExporterOutputFormat,
     compute_stats: bool,
     client_computed_stats: bool,
+    #[cfg(feature = "telemetry")]
     telemetry_cfg: Option<TelemetryConfig>,
     health_metrics_enabled: bool,
     process_tags: Option<String>,
@@ -291,6 +295,7 @@ pub unsafe extern "C" fn ddog_trace_exporter_config_enable_health_metrics(
 }
 
 /// Enables telemetry metrics.
+#[cfg(feature = "telemetry")]
 #[no_mangle]
 pub unsafe extern "C" fn ddog_trace_exporter_config_enable_telemetry(
     config: Option<&mut TraceExporterConfig>,
@@ -490,6 +495,7 @@ pub unsafe extern "C" fn ddog_trace_exporter_new(
                 builder.set_client_computed_stats();
             }
 
+            #[cfg(feature = "telemetry")]
             if let Some(cfg) = &config.telemetry_cfg {
                 builder.enable_telemetry(cfg.clone());
             }
@@ -596,6 +602,7 @@ mod tests {
             assert_eq!(cfg.input_format, TraceExporterInputFormat::V04);
             assert_eq!(cfg.output_format, TraceExporterOutputFormat::V04);
             assert!(!cfg.compute_stats);
+            #[cfg(feature = "telemetry")]
             assert!(cfg.telemetry_cfg.is_none());
             assert!(!cfg.health_metrics_enabled);
             assert!(cfg.process_tags.is_none());
@@ -828,6 +835,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "telemetry")]
     fn config_telemetry_test() {
         unsafe {
             let error = ddog_trace_exporter_config_enable_telemetry(
@@ -1106,6 +1114,7 @@ mod tests {
     // Ignore because it seems, at least in the version we're currently using, miri can't emulate
     // libc::socket function.
     #[cfg_attr(miri, ignore)]
+    #[cfg(feature = "telemetry")]
     fn exporter_send_telemetry_test() {
         unsafe {
             let server = MockServer::start();

libdd-data-pipeline/Cargo.toml

@@ -72,11 +72,11 @@ tokio = { version = "1.23", features = [
 
 [features]
 default = ["https", "telemetry"]
-telemetry = ["libdd-telemetry"]
 https = [
     "libdd-common/https",
     "libdd-telemetry?/https",
     "libdd-trace-utils/https",
     "libdd-dogstatsd-client/https",
 ]
+telemetry = [ "dep:libdd-telemetry" ]
 test-utils = []

libdd-data-pipeline/examples/send-traces-with-stats.rs

@@ -4,7 +4,7 @@
 use clap::Parser;
 use libdd_capabilities_impl::NativeCapabilities;
 use libdd_data_pipeline::trace_exporter::{
-    TelemetryConfig, TraceExporter, TraceExporterInputFormat, TraceExporterOutputFormat,
+    TraceExporter, TraceExporterInputFormat, TraceExporterOutputFormat,
 };
 use libdd_log::logger::{
     logger_configure_std, logger_set_log_level, LogEventLevel, StdConfig, StdTarget,
@@ -55,7 +55,6 @@ fn main() {
     logger_set_log_level(LogEventLevel::Debug).expect("Failed to set log level");
 
     let args = Args::parse();
-    let telemetry_cfg = TelemetryConfig::default();
     let mut builder = TraceExporter::<NativeCapabilities>::builder();
     builder
         .set_url(&args.url)
@@ -68,8 +67,9 @@ fn main() {
         .set_language_version(env!("CARGO_PKG_RUST_VERSION"))
         .set_input_format(TraceExporterInputFormat::V04)
         .set_output_format(TraceExporterOutputFormat::V04)
-        .enable_telemetry(telemetry_cfg)
         .enable_stats(Duration::from_secs(10));
+    #[cfg(feature = "telemetry")]
+    builder.enable_telemetry(libdd_data_pipeline::telemetry::TelemetryConfig::default());
     let exporter = builder
         .build::<NativeCapabilities>()
         .expect("Failed to build TraceExporter");

libdd-data-pipeline/src/lib.rs

@@ -16,8 +16,7 @@ pub(crate) mod otlp;
 #[cfg(not(target_arch = "wasm32"))]
 mod pausable_worker;
 #[allow(missing_docs)]
-pub mod stats_exporter;
-#[cfg(feature = "telemetry")]
-pub(crate) mod telemetry;
+pub(crate) mod stats_exporter;
+pub mod telemetry;
 #[allow(missing_docs)]
 pub mod trace_exporter;

libdd-data-pipeline/src/stats_exporter.rs

@@ -21,8 +21,6 @@ use tokio::select;
 use tokio_util::sync::CancellationToken;
 use tracing::error;
 
-const STATS_ENDPOINT_PATH: &str = "/v0.6/stats";
-
 /// An exporter that concentrates and sends stats to the agent.
 ///
 /// `H` is the HTTP client implementation, see [`HttpClientTrait`]. Leaf crates
@@ -193,13 +191,6 @@ fn encode_stats_payload(
     }
 }
 
-/// Return the stats endpoint url to send stats to the agent at `agent_url`
-pub fn stats_url_from_agent_url(agent_url: &str) -> anyhow::Result<http::Uri> {
-    let mut parts = agent_url.parse::<http::Uri>()?.into_parts();
-    parts.path_and_query = Some(http::uri::PathAndQuery::from_static(STATS_ENDPOINT_PATH));
-    Ok(http::Uri::from_parts(parts)?)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -211,11 +202,20 @@ mod tests {
     use time::Duration;
     use time::SystemTime;
 
+    const STATS_ENDPOINT_PATH: &str = "/v0.6/stats";
+
     fn is_send<T: Send>() {}
     fn is_sync<T: Sync>() {}
 
     const BUCKETS_DURATION: Duration = Duration::from_secs(10);
 
+    /// Return the stats endpoint url to send stats to the agent at `agent_url`
+    fn stats_url_from_agent_url(agent_url: &str) -> anyhow::Result<http::Uri> {
+        let mut parts = agent_url.parse::<http::Uri>()?.into_parts();
+        parts.path_and_query = Some(http::uri::PathAndQuery::from_static(STATS_ENDPOINT_PATH));
+        Ok(http::Uri::from_parts(parts)?)
+    }
+
     /// Fails to compile if stats exporter is not Send and Sync
     #[test]
     fn test_stats_exporter_sync_send() {