fixup! feat: add embedded-svc based http transport

Disabling the esp-idf-svc transport if not compiling for espidf is not too elegant. I would have preferred to add a sample esp32 project and make it work that way, but that would have created a lot of esp32 related files in the root of the workspace and also would have required running the checks with a *-esp-espidf rust target.
getsentry · Apr 16, 2024 · 38286a7 · 38286a7
1 parent 40f0c3a
commit 38286a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/sentry/Cargo.toml b/sentry/Cargo.toml
@@ -84,6 +84,7 @@ rustls = { version = "0.21.2", optional = true, features = [
 ] }
 webpki-roots = { version = "0.25.1", optional = true }
 embedded-svc = { version = "0.27.1", optional = true }
+[target.'cfg(target_os = "espidf")'.dependencies]
 esp-idf-svc = { version = "0.48.1", optional = true }
 
 [dev-dependencies]

diff --git a/sentry/src/transports/mod.rs b/sentry/src/transports/mod.rs
@@ -18,9 +18,9 @@ mod reqwest;
 #[cfg(feature = "reqwest")]
 pub use self::reqwest::ReqwestHttpTransport;
 
-#[cfg(feature = "embedded-svc-http")]
+#[cfg(all(target_os = "espidf", feature = "embedded-svc-http"))]
 mod embedded_svc_http;
-#[cfg(feature = "embedded-svc-http")]
+#[cfg(all(target_os = "espidf", feature = "embedded-svc-http"))]
 pub use self::embedded_svc_http::EmbeddedSVCHttpTransport;
 
 #[cfg(feature = "curl")]
@@ -43,7 +43,7 @@ type DefaultTransport = ReqwestHttpTransport;
 
 #[cfg(all(
     feature = "curl",
-    not(feature = "embedded-svc-http"),
+    not(all(target_os = "espidf", feature = "embedded-svc-http")),
     not(feature = "reqwest"),
     not(feature = "surf"),
     not(feature = "ureq")
@@ -52,7 +52,7 @@ type DefaultTransport = CurlHttpTransport;
 
 #[cfg(all(
     feature = "surf",
-    not(feature = "embedded-svc-http"),
+    not(all(target_os = "espidf", feature = "embedded-svc-http")),
     not(feature = "reqwest"),
     not(feature = "curl"),
     not(feature = "ureq")
@@ -61,14 +61,15 @@ type DefaultTransport = SurfHttpTransport;
 
 #[cfg(all(
     feature = "ureq",
-    not(feature = "embedded-svc-http"),
+    not(all(target_os = "espidf", feature = "embedded-svc-http")),
     not(feature = "reqwest"),
     not(feature = "curl"),
     not(feature = "surf")
 ))]
 type DefaultTransport = UreqHttpTransport;
 
 #[cfg(all(
+    target_os = "espidf",
     feature = "embedded-svc-http",
     not(feature = "reqwest"),
     not(feature = "curl"),
@@ -79,7 +80,7 @@ type DefaultTransport = EmbeddedSVCHttpTransport;
 
 /// The default http transport.
 #[cfg(any(
-    feature = "embedded-svc-http",
+    all(target_os = "espidf", feature = "embedded-svc-http"),
     feature = "reqwest",
     feature = "curl",
     feature = "surf",
@@ -98,7 +99,7 @@ pub struct DefaultTransportFactory;
 impl TransportFactory for DefaultTransportFactory {
     fn create_transport(&self, options: &ClientOptions) -> Arc<dyn Transport> {
         #[cfg(any(
-            feature = "embedded-svc-http",
+            all(target_os = "espidf", feature = "embedded-svc-http"),
             feature = "reqwest",
             feature = "curl",
             feature = "surf",
@@ -108,7 +109,7 @@ impl TransportFactory for DefaultTransportFactory {
             Arc::new(HttpTransport::new(options))
         }
         #[cfg(not(any(
-            feature = "embedded-svc-http",
+            all(target_os = "espidf", feature = "embedded-svc-http"),
             feature = "reqwest",
             feature = "curl",
             feature = "surf",