Skip to content

refactor: remove Surf transport #766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions sentry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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 }
Expand Down
2 changes: 0 additions & 2 deletions sentry/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` | | | | |
Expand Down Expand Up @@ -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`.

Expand Down
2 changes: 0 additions & 2 deletions sentry/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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` | | | | |
Expand Down Expand Up @@ -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`.
//!
Expand Down
24 changes: 2 additions & 22 deletions sentry/src/transports/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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")]
Expand All @@ -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")]
Expand All @@ -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;

Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -102,7 +84,6 @@ impl TransportFactory for DefaultTransportFactory {
all(target_os = "espidf", feature = "embedded-svc-http"),
feature = "reqwest",
feature = "curl",
feature = "surf",
feature = "ureq"
))]
{
Expand All @@ -112,7 +93,6 @@ impl TransportFactory for DefaultTransportFactory {
all(target_os = "espidf", feature = "embedded-svc-http"),
feature = "reqwest",
feature = "curl",
feature = "surf",
feature = "ureq"
)))]
{
Expand Down
102 changes: 0 additions & 102 deletions sentry/src/transports/surf.rs

This file was deleted.

Loading