chore(common): bump MSRV to 1.56 (#866)

* chore(common): bump MSRV to 1.56 * chore(common): bump edition to 2021 * fix(jaeger): clippy issue * fix: patch_depencencies.sh -> patch_dependencies.sh
open-telemetry · Sep 1, 2022 · 9ea1ee7 · 9ea1ee7
1 parent 043e4b7
commit 9ea1ee7
Show file tree

Hide file tree

Showing 52 changed files with 87 additions and 67 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -68,10 +68,10 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.49
+        toolchain: 1.56
         override: true
-    - name: Prepare minimal package versions
-      run: cargo update -p serde --precise 1.0.142
+    - name: Patch dependencies versions # some dependencies bump MSRV without major version bump
+      run: ./scripts/patch_dependencies.sh
     - name: Run tests
       run: cargo --version &&
         cargo test --verbose --manifest-path=opentelemetry/Cargo.toml --features trace,metrics,rt-tokio,testing &&

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ analysis in order to understand your software's performance and behavior. You
 can export and analyze them using [Prometheus], [Jaeger], and other
 observability tools.
 
-*Compiler support: [requires `rustc` 1.49+][msrv]*
+*Compiler support: [requires `rustc` 1.56+][msrv]*
 
 [Prometheus]: https://prometheus.io
 [Jaeger]: https://www.jaegertracing.io
@@ -137,7 +137,7 @@ above, please let us know! We'd love to add your project to the list!
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.49. The current OpenTelemetry version is not guaranteed to build
+version is 1.56. The current OpenTelemetry version is not guaranteed to build
 on Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions

diff --git a/examples/actix-http-tracing/Cargo.toml b/examples/actix-http-tracing/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "actix-http-tracing"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/actix-http/Cargo.toml b/examples/actix-http/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "actix-http-example"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/actix-hyper/Cargo.toml b/examples/actix-hyper/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "actix-hyper-example"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/actix-udp/Cargo.toml b/examples/actix-udp/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "actix-udp-example"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/async/Cargo.toml b/examples/async/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "async"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/aws-xray/Cargo.toml b/examples/aws-xray/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "aws-xray"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/examples/basic-otlp-http/Cargo.toml b/examples/basic-otlp-http/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "basic-otlp-http"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/basic-otlp/Cargo.toml b/examples/basic-otlp/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "basic-otlp"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/basic/Cargo.toml b/examples/basic/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "basic"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/datadog/Cargo.toml b/examples/datadog/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "datadog"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/dynatrace/Cargo.toml b/examples/dynatrace/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dynatrace"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/external-otlp-grpcio-async-std/Cargo.toml b/examples/external-otlp-grpcio-async-std/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "external-otlp-grpcio-async-std"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/external-otlp-tonic-tokio/Cargo.toml b/examples/external-otlp-tonic-tokio/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "external-otlp-tonic-tokio"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/grpc/Cargo.toml b/examples/grpc/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "grpc"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [[bin]] # Bin to run the gRPC server

diff --git a/examples/http/Cargo.toml b/examples/http/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "http"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [[bin]] # Bin to run the http server

diff --git a/examples/hyper-prometheus/Cargo.toml b/examples/hyper-prometheus/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hyper-prometheus"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/examples/jaeger-remote-sampler/Cargo.toml b/examples/jaeger-remote-sampler/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "jaeger-remote-sampler"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 opentelemetry-sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio", "jaeger_remote_sampler"] }

diff --git a/examples/multiple-span-processors/Cargo.toml b/examples/multiple-span-processors/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "multiple-span-processors"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/tracing-grpc/Cargo.toml b/examples/tracing-grpc/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tracing-grpc"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [[bin]] # Bin to run the gRPC server

diff --git a/examples/zipkin/Cargo.toml b/examples/zipkin/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zipkin"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/examples/zpages/Cargo.toml b/examples/zpages/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zpages"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/opentelemetry-api/Cargo.toml b/opentelemetry-api/Cargo.toml
@@ -2,13 +2,14 @@
 name = "opentelemetry-api"
 version = "0.1.0"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [dependencies]
 fnv = { version = "1.0", optional = true }
 futures-channel = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["std", "sink"] }
-indexmap = "=1.8"
+indexmap = "1.8"
 once_cell = "1.12.0"
 pin-project-lite = { version = "0.2", optional = true }
 thiserror = "1"

diff --git a/opentelemetry-api/README.md b/opentelemetry-api/README.md
@@ -25,7 +25,7 @@ analysis in order to understand your software's performance and behavior. You
 can export and analyze them using [Prometheus], [Jaeger], and other
 observability tools.
 
-*Compiler support: [requires `rustc` 1.49+][msrv]*
+*Compiler support: [requires `rustc` 1.56+][msrv]*
 
 [Prometheus]: https://prometheus.io
 [Jaeger]: https://www.jaegertracing.io

diff --git a/opentelemetry-api/src/lib.rs b/opentelemetry-api/src/lib.rs
@@ -2,7 +2,7 @@
 //! services to capture distributed traces and metrics from your application. You
 //! can analyze them using [Prometheus], [Jaeger], and other observability tools.
 //!
-//! *Compiler support: [requires `rustc` 1.49+][msrv]*
+//! *Compiler support: [requires `rustc` 1.56+][msrv]*
 //!
 //! [Prometheus]: https://prometheus.io
 //! [Jaeger]: https://www.jaegertracing.io
@@ -11,7 +11,7 @@
 //! ## Supported Rust Versions
 //!
 //! OpenTelemetry is built against the latest stable release. The minimum
-//! supported version is 1.49. The current OpenTelemetry version is not
+//! supported version is 1.56. The current OpenTelemetry version is not
 //! guaranteed to build on Rust versions earlier than the minimum supported
 //! version.
 //!

diff --git a/opentelemetry-aws/Cargo.toml b/opentelemetry-aws/Cargo.toml
@@ -11,7 +11,8 @@ categories = [
 ]
 keywords = ["opentelemetry", "tracing"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/opentelemetry-contrib/Cargo.toml b/opentelemetry-contrib/Cargo.toml
@@ -11,7 +11,8 @@ categories = [
 ]
 keywords = ["opentelemetry", "tracing"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/opentelemetry-datadog/Cargo.toml b/opentelemetry-datadog/Cargo.toml
@@ -11,7 +11,8 @@ categories = [
 ]
 keywords = ["opentelemetry", "tracing"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -24,7 +25,7 @@ surf-client = ["surf", "opentelemetry-http/surf"]
 
 [dependencies]
 async-trait = "0.1"
-indexmap = "=1.8"
+indexmap = "1.8"
 once_cell = "1.12"
 opentelemetry = { version = "0.17", path = "../opentelemetry", features = ["trace"] }
 opentelemetry-http = { version = "0.6", path = "../opentelemetry-http" }

diff --git a/opentelemetry-dynatrace/Cargo.toml b/opentelemetry-dynatrace/Cargo.toml
@@ -12,7 +12,8 @@ categories = [
 ]
 keywords = ["opentelemetry", "metrics", "dynatrace"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/opentelemetry-http/Cargo.toml b/opentelemetry-http/Cargo.toml
@@ -6,7 +6,8 @@ homepage = "https://github.com/open-telemetry/opentelemetry-rust"
 repository = "https://github.com/open-telemetry/opentelemetry-rust"
 keywords = ["opentelemetry", "tracing", "metrics"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [dependencies]
 async-trait = "0.1"

diff --git a/opentelemetry-http/README.md b/opentelemetry-http/README.md
@@ -21,15 +21,15 @@ analysis in order to understand your software's performance and behavior. This
 crate provides a HTTP client interface for use by trace exporters, as well as
 helper types to inject and extract key value pairs into/from HTTP headers.
 
-*Compiler support: [requires `rustc` 1.49+][msrv]*
+*Compiler support: [requires `rustc` 1.56+][msrv]*
 
 [`OpenTelemetry`]: https://crates.io/crates/opentelemetry
 [msrv]: #supported-rust-versions
 
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.49. The current OpenTelemetry version is not guaranteed to build
+version is 1.56. The current OpenTelemetry version is not guaranteed to build
 on Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions

diff --git a/opentelemetry-jaeger/Cargo.toml b/opentelemetry-jaeger/Cargo.toml
@@ -12,14 +12,15 @@ categories = [
 ]
 keywords = ["opentelemetry", "jaeger", "tracing", "async"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-async-std = { version = "= 1.10.0", optional = true }
+async-std = { version = "1.10.0", optional = true }
 async-trait = "0.1"
 base64 = { version = "0.13", optional = true }
 futures = "0.3"

diff --git a/opentelemetry-jaeger/README.md b/opentelemetry-jaeger/README.md
@@ -23,7 +23,7 @@ analysis in order to understand your software's performance and behavior. This
 crate provides a trace pipeline and exporter for sending span information to a
 Jaeger `agent` or `collector` endpoint for processing and visualization.
 
-*Compiler support: [requires `rustc` 1.49+][msrv]*
+*Compiler support: [requires `rustc` 1.56+][msrv]*
 
 [`Jaeger`]: https://www.jaegertracing.io/
 [`OpenTelemetry`]: https://crates.io/crates/opentelemetry

diff --git a/opentelemetry-jaeger/src/exporter/config/collector/http_client.rs b/opentelemetry-jaeger/src/exporter/config/collector/http_client.rs
@@ -59,7 +59,6 @@ impl CollectorHttpClient {
             }
             #[cfg(feature = "surf_collector_client")]
             CollectorHttpClient::Surf => {
-                use std::convert::TryInto;
                 use opentelemetry_http::surf::BasicAuthMiddleware;
 
                 let client: surf::Client = surf::Config::new()