fix: more fixes

Author: Ganesh Jangir

data-pipeline-ffi/src/trace_exporter.rs

@@ -1079,8 +1079,8 @@ mod tests {
             let mock_metrics = server.mock(|when, then| {
                 when.method(POST)
                     .path("/telemetry/proxy/api/v2/apmtelemetry")
-                    .body_includes(r#""runtime_id":"foo""#)
-                    .body_includes(r#""metric":"trace_api."#);
+                    .body_contains(r#""runtime_id":"foo""#)
+                    .body_contains(r#""metric":"trace_api."#);
                 then.status(200)
                     .header("content-type", "application/json")
                     .body("");
@@ -1133,7 +1133,7 @@ mod tests {
 
             ddog_trace_exporter_free(exporter);
             // It should receive 1 metrics payload (excluding heartbeats)
-            mock_metrics.assert_calls(1);
+            mock_metrics.assert();
         }
     }
 

data-pipeline/src/trace_exporter/builder.rs

@@ -383,11 +383,11 @@ mod tests {
             .set_input_format(TraceExporterInputFormat::Proxy)
             .set_output_format(TraceExporterOutputFormat::V04)
             .set_client_computed_stats()
-            .enable_telemetry(TelemetryConfig {
+            .enable_telemetry(Some(TelemetryConfig {
                 heartbeat: 1000,
                 runtime_id: None,
                 debug_enabled: false,
-            });
+            }));
         let exporter = builder.build().unwrap();
 
         assert_eq!(

data-pipeline/src/trace_exporter/mod.rs

@@ -1078,10 +1078,10 @@ mod tests {
         };
 
         if enable_telemetry {
-            builder.enable_telemetry(TelemetryConfig {
+            builder.enable_telemetry(Some(TelemetryConfig {
                 heartbeat: 100,
                 ..Default::default()
-            });
+            }));
         }
 
         builder.build().unwrap()
@@ -1617,10 +1617,10 @@ mod tests {
             .set_language("nodejs")
             .set_language_version("1.0")
             .set_language_interpreter("v8")
-            .enable_telemetry(TelemetryConfig {
+            .enable_telemetry(Some(TelemetryConfig {
                 heartbeat: 100,
                 ..Default::default()
-            });
+            }));
         let exporter = builder.build().unwrap();
 
         let traces = vec![0x90];
@@ -1741,10 +1741,10 @@ mod tests {
             .set_language("nodejs")
             .set_language_version("1.0")
             .set_language_interpreter("v8")
-            .enable_telemetry(TelemetryConfig {
+            .enable_telemetry(Some(TelemetryConfig {
                 heartbeat: 100,
                 ..Default::default()
-            })
+            }))
             .set_input_format(TraceExporterInputFormat::V04)
             .set_output_format(TraceExporterOutputFormat::V05);
 

datadog-crashtracker/src/collector/signal_handler_manager.rs

@@ -152,7 +152,7 @@ unsafe fn create_alt_stack() -> anyhow::Result<()> {
         0,
     );
     anyhow::ensure!(
-        stackp != MAP_FAILED,
+        !std::ptr::eq(stackp, MAP_FAILED),
         "failed to allocate an alternative stack"
     );
     let guard_result = libc::mprotect(stackp, page_size, PROT_NONE);

datadog-trace-protobuf/src/remoteconfig.rs

@@ -3,15 +3,17 @@
 
 use serde::{Deserialize, Serialize};
 // This file is @generated by prost-build.
-#[derive(Deserialize, Serialize, Clone, PartialEq, ::prost::Message)]
+#[derive(Deserialize, Serialize)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct File {
     #[prost(string, tag = "1")]
     pub path: ::prost::alloc::string::String,
     #[prost(bytes = "vec", tag = "2")]
     #[serde(with = "serde_bytes")]
     pub raw: ::prost::alloc::vec::Vec<u8>,
 }
-#[derive(Deserialize, Serialize, Clone, PartialEq, ::prost::Message)]
+#[derive(Deserialize, Serialize)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Client {
     #[prost(message, optional, tag = "1")]
     pub state: ::core::option::Option<ClientState>,
@@ -33,7 +35,8 @@ pub struct Client {
     #[prost(bytes = "vec", tag = "11")]
     pub capabilities: ::prost::alloc::vec::Vec<u8>,
 }
-#[derive(Deserialize, Serialize, Clone, PartialEq, ::prost::Message)]
+#[derive(Deserialize, Serialize)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ClientTracer {
     #[prost(string, tag = "1")]
     pub runtime_id: ::prost::alloc::string::String,
@@ -52,7 +55,8 @@ pub struct ClientTracer {
     #[prost(string, repeated, tag = "7")]
     pub tags: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
-#[derive(Deserialize, Serialize, Clone, PartialEq, ::prost::Message)]
+#[derive(Deserialize, Serialize)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ClientAgent {
     #[prost(string, tag = "1")]
     pub name: ::prost::alloc::string::String,
@@ -65,7 +69,8 @@ pub struct ClientAgent {
     #[prost(string, repeated, tag = "5")]
     pub cws_workloads: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
-#[derive(Deserialize, Serialize, Clone, PartialEq, ::prost::Message)]
+#[derive(Deserialize, Serialize)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ConfigState {
     #[prost(string, tag = "1")]
     pub id: ::prost::alloc::string::String,
@@ -78,7 +83,8 @@ pub struct ConfigState {
     #[prost(string, tag = "5")]
     pub apply_error: ::prost::alloc::string::String,
 }
-#[derive(Deserialize, Serialize, Clone, PartialEq, ::prost::Message)]
+#[derive(Deserialize, Serialize)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ClientState {
     #[prost(uint64, tag = "1")]
     pub root_version: u64,
@@ -93,14 +99,16 @@ pub struct ClientState {
     #[prost(bytes = "vec", tag = "6")]
     pub backend_client_state: ::prost::alloc::vec::Vec<u8>,
 }
-#[derive(Deserialize, Serialize, Clone, PartialEq, ::prost::Message)]
+#[derive(Deserialize, Serialize)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TargetFileHash {
     #[prost(string, tag = "1")]
     pub algorithm: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
     pub hash: ::prost::alloc::string::String,
 }
-#[derive(Deserialize, Serialize, Clone, PartialEq, ::prost::Message)]
+#[derive(Deserialize, Serialize)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TargetFileMeta {
     #[prost(string, tag = "1")]
     pub path: ::prost::alloc::string::String,
@@ -109,14 +117,16 @@ pub struct TargetFileMeta {
     #[prost(message, repeated, tag = "3")]
     pub hashes: ::prost::alloc::vec::Vec<TargetFileHash>,
 }
-#[derive(Deserialize, Serialize, Clone, PartialEq, ::prost::Message)]
+#[derive(Deserialize, Serialize)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ClientGetConfigsRequest {
     #[prost(message, optional, tag = "1")]
     pub client: ::core::option::Option<Client>,
     #[prost(message, repeated, tag = "2")]
     pub cached_target_files: ::prost::alloc::vec::Vec<TargetFileMeta>,
 }
-#[derive(Deserialize, Serialize, Clone, PartialEq, ::prost::Message)]
+#[derive(Deserialize, Serialize)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ClientGetConfigsResponse {
     #[prost(bytes = "vec", repeated, tag = "1")]
     #[serde(with = "crate::serde")]

ddcommon-ffi/src/array_queue.rs

@@ -327,11 +327,11 @@ mod tests {
             assert!(matches!(result, ArrayQueuePushResult::Ok));
             let result = ddog_ArrayQueue_push(queue, item2_ptr as *mut c_void);
             assert!(
-                matches!(result, ArrayQueuePushResult::Full(ptr) if ptr == item2_ptr as *mut c_void)
+                matches!(result, ArrayQueuePushResult::Full(ptr) if std::ptr::eq(ptr, item2_ptr as *mut c_void))
             );
             let result = ddog_ArrayQueue_pop(queue);
             assert!(
-                matches!(result, ArrayQueuePopResult::Ok(ptr) if ptr == item_ptr as *mut c_void)
+                matches!(result, ArrayQueuePopResult::Ok(ptr) if std::ptr::eq(ptr, item_ptr as *mut c_void))
             );
             let item_ptr = match result {
                 ArrayQueuePopResult::Ok(ptr) => ptr,

ddcommon-ffi/src/error.rs

@@ -96,7 +96,7 @@ pub unsafe extern "C" fn ddog_Error_drop(error: Option<&mut Error>) {
 /// # Safety
 /// Only pass null or a valid reference to a `ddog_Error`.
 #[no_mangle]
-pub unsafe extern "C" fn ddog_Error_message(error: Option<&Error>) -> CharSlice {
+pub unsafe extern "C" fn ddog_Error_message(error: Option<&Error>) -> CharSlice<'_> {
     match error {
         None => CharSlice::empty(),
         Some(err) => CharSlice::from(err.as_ref()),

ddcommon-ffi/src/string.rs

@@ -65,7 +65,7 @@ pub unsafe extern "C" fn ddog_StringWrapper_drop(s: Option<&mut StringWrapper>)
 /// Only pass null or a valid reference to a `ddog_StringWrapper`.
 /// The string should not be mutated nor dropped while the CharSlice is alive.
 #[no_mangle]
-pub unsafe extern "C" fn ddog_StringWrapper_message(s: Option<&StringWrapper>) -> CharSlice {
+pub unsafe extern "C" fn ddog_StringWrapper_message(s: Option<&StringWrapper>) -> CharSlice<'_> {
     match s {
         None => CharSlice::empty(),
         Some(s) => CharSlice::from(s.as_ref()),

ddcommon-ffi/src/vec.rs

@@ -75,6 +75,7 @@ impl<T> From<alloc::vec::Vec<T>> for Vec<T> {
 impl From<anyhow::Error> for Vec<u8> {
     fn from(err: anyhow::Error) -> Self {
         let mut vec = vec![];
+        #[allow(clippy::expect_used)]
         write!(vec, "{err}").expect("write to vec to always succeed");
         Self::from(vec)
     }
@@ -105,7 +106,7 @@ impl<T> Vec<T> {
         self.replace(vec);
     }
 
-    pub fn as_slice(&self) -> Slice<T> {
+    pub fn as_slice(&self) -> Slice<'_, T> {
         unsafe { Slice::from_raw_parts(self.ptr, self.len) }
     }