From 4e5b95ff4102b17d1534ffa4a89ef448d94defe0 Mon Sep 17 00:00:00 2001 From: Julian Tescher Date: Sun, 9 May 2021 11:58:36 -0700 Subject: [PATCH 1/3] Remove default surf features Remove default serf features, allowing users to select which features they want to use. --- opentelemetry-datadog/Cargo.toml | 2 +- opentelemetry-jaeger/Cargo.toml | 2 +- opentelemetry-otlp/Cargo.toml | 2 +- opentelemetry-zipkin/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opentelemetry-datadog/Cargo.toml b/opentelemetry-datadog/Cargo.toml index 801ca03f50..29faff2ae7 100644 --- 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 index 43af240808..7dcca91562 100644 --- 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 index 62db5a354e..f0f6dc23ac 100644 --- 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 index 1dbc71165f..2f88b48d00 100644 --- 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] From 68c49138df68d9ee1cfb5ed01511a3e534b67191 Mon Sep 17 00:00:00 2001 From: Julian Tescher Date: Sun, 9 May 2021 12:55:04 -0700 Subject: [PATCH 2/3] Fix otlp surf client clippy config --- scripts/lint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lint.sh b/scripts/lint.sh index e0e9c86e36..f783234c54 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -26,7 +26,7 @@ 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 "isahc_collector_client" From 6758f41f7e7f5ad2879df37d9c1dc6c16d66cf36 Mon Sep 17 00:00:00 2001 From: Julian Tescher Date: Sun, 9 May 2021 13:28:00 -0700 Subject: [PATCH 3/3] Fix jaeger surf client clippy config --- scripts/lint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lint.sh b/scripts/lint.sh index f783234c54..648fcde876 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -28,7 +28,7 @@ if rustup component add clippy; then cargo_feature opentelemetry-otlp "http-proto, reqwest-rustls" 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"