move UnderlyingBytes impl for ShmHandle to ipc

DataDog · Sep 17, 2024 · 8fb3ac6 · 8fb3ac6
1 parent 02202f9
commit 8fb3ac6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ipc/Cargo.toml b/ipc/Cargo.toml
@@ -17,6 +17,7 @@ serde = { version = "1.0", default-features = false, features = ["derive"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
 tokio-util = { version = "0.6.9", features = ["codec"] }
 libc = { version = "0.2" }
+tinybytes = { path = "../tinybytes", optional = true }
 
 # tarpc needed extensions to allow 1 way communication and to export some internal structs
 tarpc = { path = "tarpc/tarpc", default-features = false, features = ["serde-transport"], package = "tarpc" }
@@ -63,3 +64,6 @@ path = "benches/ipc.rs"
 
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(polyfill_glibc_memfd)'] }
+
+[features]
+tiny-bytes = ["tinybytes"]
diff --git a/ipc/src/platform/mem_handle.rs b/ipc/src/platform/mem_handle.rs
@@ -7,6 +7,8 @@ use serde::{Deserialize, Serialize};
 #[cfg(all(unix, not(target_os = "macos")))]
 use std::os::unix::prelude::AsRawFd;
 use std::{ffi::CString, io};
+#[cfg(feature = "tiny-bytes")]
+use tinybytes::UnderlyingBytes;
 
 #[derive(Clone, Serialize, Deserialize, Debug)]
 pub struct ShmHandle {
@@ -209,6 +211,9 @@ impl AsRef<[u8]> for MappedMem<ShmHandle> {
     }
 }
 
+#[cfg(feature = "tiny-bytes")]
+impl UnderlyingBytes for MappedMem<ShmHandle> {}
+
 #[cfg(test)]
 mod tests {
     use crate::platform::{FileBackedHandle, NamedShmHandle, ShmHandle};

diff --git a/sidecar/Cargo.toml b/sidecar/Cargo.toml
@@ -26,7 +26,7 @@ datadog-trace-utils = { path = "../trace-utils" }
 datadog-trace-normalization = { path = "../trace-normalization" }
 datadog-remote-config = { path = "../remote-config" }
 datadog-crashtracker = { path = "../crashtracker" }
-tinybytes = { path = "../tinybytes", features = ["ipc"] }
+tinybytes = { path = "../tinybytes" }
 
 futures = { version = "0.3", default-features = false }
 manual_future = "0.1.1"
@@ -35,7 +35,7 @@ hyper = { version = "0.14", features = ["client"], default-features = false }
 lazy_static = "1.4"
 pin-project = "1"
 
-datadog-ipc = { path = "../ipc" }
+datadog-ipc = { path = "../ipc", features = ["tiny-bytes"] }
 datadog-ipc-macros = { path = "../ipc/macros" }
 
 rand = "0.8.3"

diff --git a/tinybytes/Cargo.toml b/tinybytes/Cargo.toml
@@ -15,13 +15,13 @@ pretty_assertions = "1.3"
 proptest = {version = "1.5", features = ["std"], default-features = false}
 test-case = "2.2"
 serde_json = "1.0.127"
-tinybytes = { path = ".", features = ["bytes_string", "serialization", "ipc"] }
+tinybytes = { path = ".", features = ["bytes_string", "serialization"] }
 
 [dependencies]
 serde = { version = "1.0.209", optional = true }
-datadog-ipc = { path = "../ipc", optional = true }
+#datadog-ipc = { path = "../ipc", optional = true }
 
 [features]
 bytes_string = []
 serialization = ["serde"]
-ipc = ["datadog-ipc"]
+#ipc = ["datadog-ipc"]
diff --git a/tinybytes/src/lib.rs b/tinybytes/src/lib.rs
@@ -1,9 +1,6 @@
 // Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
-#[cfg(feature = "ipc")]
-use datadog_ipc::platform::{MappedMem, ShmHandle};
-
 use std::{
     borrow, cmp, fmt, hash,
     ops::{self, RangeBounds},
@@ -203,9 +200,6 @@ impl UnderlyingBytes for Vec<u8> {}
 impl UnderlyingBytes for Box<[u8]> {}
 impl UnderlyingBytes for String {}
 
-#[cfg(feature = "ipc")]
-impl UnderlyingBytes for MappedMem<ShmHandle> {}
-
 // Implementations of common traits for `Bytes`.
 impl Default for Bytes {
     fn default() -> Self {