Remove default surf features (#546)

Remove default surf features, allowing users to select which features they want to use.
open-telemetry · May 9, 2021 · b84f993 · b84f993
1 parent f74705c
commit b84f993
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/opentelemetry-datadog/Cargo.toml b/opentelemetry-datadog/Cargo.toml
@@ -30,7 +30,7 @@ opentelemetry = { version = "0.13", path = "../opentelemetry", features = ["trac
 opentelemetry-http = { version = "0.2", path = "../opentelemetry-http" }
 rmp = "0.8"
 reqwest = { version = "0.11", default-features = false, optional = true }
-surf = { version = "2.0", optional = true }
+surf = { version = "2.0", default-features = false, optional = true }
 thiserror = "1.0"
 itertools = "0.10"
 http = "0.2"

diff --git a/opentelemetry-jaeger/Cargo.toml b/opentelemetry-jaeger/Cargo.toml
@@ -38,7 +38,7 @@ thiserror = "1.0"
 lazy_static = "1.4"
 reqwest = { version = "0.11", default-features = false, optional = true }
 headers = { version = "0.3.2", optional = true }
-surf = { version = "2.0", optional = true }
+surf = { version = "2.0", default-features = false, optional = true }
 
 [dev-dependencies]
 bytes = "1"

diff --git a/opentelemetry-otlp/Cargo.toml b/opentelemetry-otlp/Cargo.toml
@@ -46,7 +46,7 @@ tonic = { version = "0.4", optional = true }
 tokio = { version = "1.0", features = ["full"], optional = true }
 opentelemetry-http = { version = "0.2", path = "../opentelemetry-http", optional = true }
 reqwest = { version = "0.11", optional = true, default-features = false }
-surf = { version = "2.0", optional = true }
+surf = { version = "2.0", optional = true, default-features = false }
 http = "0.2"
 
 [dev-dependencies]

diff --git a/opentelemetry-zipkin/Cargo.toml b/opentelemetry-zipkin/Cargo.toml
@@ -36,7 +36,7 @@ typed-builder = "0.7"
 lazy_static = "1.4"
 http = "0.2"
 reqwest = { version = "0.11", optional = true, default-features = false }
-surf = { version = "2.0", optional = true }
+surf = { version = "2.0", optional = true, default-features = false }
 thiserror = { version = "1.0"}
 
 [dev-dependencies]

diff --git a/scripts/lint.sh b/scripts/lint.sh
@@ -26,9 +26,9 @@ if rustup component add clippy; then
   cargo_feature opentelemetry-otlp "http-proto, reqwest-blocking-client"
   cargo_feature opentelemetry-otlp "http-proto, reqwest-client"
   cargo_feature opentelemetry-otlp "http-proto, reqwest-rustls"
-  cargo_feature opentelemetry-otlp "http-proto, surf-client"
+  cargo_feature opentelemetry-otlp "http-proto, surf-client, surf/curl-client"
 
-  cargo_feature opentelemetry-jaeger "surf_collector_client"
+  cargo_feature opentelemetry-jaeger "surf_collector_client, surf/curl-client"
   cargo_feature opentelemetry-jaeger "isahc_collector_client"
   cargo_feature opentelemetry-jaeger "reqwest_blocking_collector_client"
   cargo_feature opentelemetry-jaeger "reqwest_collector_client"