refactor: remove Surf transport (#766)

* refactor: remove Surf transport

* improve

Author: lcian

sentry/Cargo.toml

@@ -51,8 +51,6 @@ release-health = ["sentry-core/release-health"]
 transport = ["reqwest", "native-tls"]
 reqwest = ["dep:reqwest", "httpdate", "tokio"]
 curl = ["dep:curl", "httpdate"]
-surf-h1 = ["surf/h1-client", "httpdate"]
-surf = ["surf/curl-client", "http-client", "httpdate", "isahc", "tokio"]
 ureq = ["dep:ureq", "httpdate"]
 # transport settings
 native-tls = ["dep:native-tls", "reqwest?/default-tls", "ureq?/native-tls"]
@@ -79,9 +77,6 @@ reqwest = { version = "0.12", optional = true, features = [
 ], default-features = false }
 curl = { version = "0.4.25", optional = true }
 httpdate = { version = "1.0.0", optional = true }
-surf = { version = "2.0.0", optional = true, default-features = false }
-http-client = { version = "6.5.3", optional = true }
-isahc = { version = "0.9.14", optional = true }
 serde_json = { version = "1.0.48", optional = true }
 tokio = { version = "1.44", features = ["rt"], optional = true }
 ureq = { version = "2.10.1", optional = true, default-features = false }

sentry/README.md

@@ -81,7 +81,6 @@ extra setup to function properly.
 | `native-tls`      | ✅      |                |            | `reqwest` must be enabled.                                                               |
 | `rustls`          |         |                |            | `reqwest` must be enabled. `native-tls` must be disabled via `default-features = false`. |
 | `curl`            |         |                |            |                                                                                          |
-| `surf`            |         |                |            |                                                                                          |
 | `tower`           |         | 🔌             |            | Requires extra setup; See [`sentry-tower`]'s documentation.                              |
 | `ureq`            |         |                |            | `ureq` transport support using `rustls` by default                                       |
 | `ureq-native-tls` |         |                |            |                                                                                          |
@@ -113,7 +112,6 @@ extra setup to function properly.
   feature, and `default-features = false` must be set to completely disable building `native-tls`
   dependencies.
 - `curl`: Enables the `curl` transport.
-- `surf`: Enables the `surf` transport.
 - `ureq`: Enables the `ureq` transport using `rustls`.
 - `ureq-native-tls`: Enables the `ureq` transport using `native-tls`.
 

sentry/src/lib.rs

@@ -73,7 +73,6 @@
 //! | `native-tls`      | ✅      |                |            | `reqwest` must be enabled.                                                               |
 //! | `rustls`          |         |                |            | `reqwest` must be enabled. `native-tls` must be disabled via `default-features = false`. |
 //! | `curl`            |         |                |            |                                                                                          |
-//! | `surf`            |         |                |            |                                                                                          |
 //! | `tower`           |         | 🔌             |            | Requires extra setup; See [`sentry-tower`]'s documentation.                              |
 //! | `ureq`            |         |                |            | `ureq` transport support using `rustls` by default                                       |
 //! | `ureq-native-tls` |         |                |            |                                                                                          |
@@ -105,7 +104,6 @@
 //!   feature, and `default-features = false` must be set to completely disable building `native-tls`
 //!   dependencies.
 //! - `curl`: Enables the `curl` transport.
-//! - `surf`: Enables the `surf` transport.
 //! - `ureq`: Enables the `ureq` transport using `rustls`.
 //! - `ureq-native-tls`: Enables the `ureq` transport using `native-tls`.
 //!

sentry/src/transports/mod.rs

@@ -1,7 +1,7 @@
 //! The provided transports.
 //!
 //! This module exposes all transports that are compiled into the sentry
-//! library.  The `reqwest`, `curl`, `surf` and `ureq` features turn on these transports.
+//! library.  The `reqwest`, `curl`, and `ureq` features turn on these transports.
 
 use crate::{ClientOptions, Transport, TransportFactory};
 use std::sync::Arc;
@@ -10,7 +10,7 @@ use std::sync::Arc;
 mod ratelimit;
 #[cfg(any(feature = "curl", feature = "ureq"))]
 mod thread;
-#[cfg(any(feature = "reqwest", feature = "surf",))]
+#[cfg(feature = "reqwest")]
 mod tokio_thread;
 
 #[cfg(feature = "reqwest")]
@@ -28,11 +28,6 @@ mod curl;
 #[cfg(feature = "curl")]
 pub use self::curl::CurlHttpTransport;
 
-#[cfg(feature = "surf")]
-mod surf;
-#[cfg(feature = "surf")]
-pub use self::surf::SurfHttpTransport;
-
 #[cfg(feature = "ureq")]
 mod ureq;
 #[cfg(feature = "ureq")]
@@ -45,26 +40,15 @@ type DefaultTransport = ReqwestHttpTransport;
     feature = "curl",
     not(all(target_os = "espidf", feature = "embedded-svc-http")),
     not(feature = "reqwest"),
-    not(feature = "surf"),
     not(feature = "ureq")
 ))]
 type DefaultTransport = CurlHttpTransport;
 
-#[cfg(all(
-    feature = "surf",
-    not(all(target_os = "espidf", feature = "embedded-svc-http")),
-    not(feature = "reqwest"),
-    not(feature = "curl"),
-    not(feature = "ureq")
-))]
-type DefaultTransport = SurfHttpTransport;
-
 #[cfg(all(
     feature = "ureq",
     not(all(target_os = "espidf", feature = "embedded-svc-http")),
     not(feature = "reqwest"),
     not(feature = "curl"),
-    not(feature = "surf")
 ))]
 type DefaultTransport = UreqHttpTransport;
 
@@ -73,7 +57,6 @@ type DefaultTransport = UreqHttpTransport;
     feature = "embedded-svc-http",
     not(feature = "reqwest"),
     not(feature = "curl"),
-    not(feature = "surf"),
     not(feature = "ureq")
 ))]
 type DefaultTransport = EmbeddedSVCHttpTransport;
@@ -83,7 +66,6 @@ type DefaultTransport = EmbeddedSVCHttpTransport;
     all(target_os = "espidf", feature = "embedded-svc-http"),
     feature = "reqwest",
     feature = "curl",
-    feature = "surf",
     feature = "ureq"
 ))]
 pub type HttpTransport = DefaultTransport;
@@ -102,7 +84,6 @@ impl TransportFactory for DefaultTransportFactory {
             all(target_os = "espidf", feature = "embedded-svc-http"),
             feature = "reqwest",
             feature = "curl",
-            feature = "surf",
             feature = "ureq"
         ))]
         {
@@ -112,7 +93,6 @@ impl TransportFactory for DefaultTransportFactory {
             all(target_os = "espidf", feature = "embedded-svc-http"),
             feature = "reqwest",
             feature = "curl",
-            feature = "surf",
             feature = "ureq"
         )))]
         {