Skip to content

Commit 9ea1ee7

Browse files
TommyCppTommyCpp
authored
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
1 parent 043e4b7 commit 9ea1ee7

File tree

52 files changed

+87
-67
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+87
-67
lines changed

‎.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ jobs:
6868
- uses: actions-rs/toolchain@v1
6969
with:
7070
profile: minimal
71-
toolchain: 1.49
71+
toolchain: 1.56
7272
override: true
73-
- name: Prepare minimal package versions
74-
run: cargo update -p serde --precise 1.0.142
73+
- name: Patch dependencies versions # some dependencies bump MSRV without major version bump
74+
run: ./scripts/patch_dependencies.sh
7575
- name: Run tests
7676
run: cargo --version &&
7777
cargo test --verbose --manifest-path=opentelemetry/Cargo.toml --features trace,metrics,rt-tokio,testing &&

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ analysis in order to understand your software's performance and behavior. You
2525
can export and analyze them using [Prometheus], [Jaeger], and other
2626
observability tools.
2727

28-
*Compiler support: [requires `rustc` 1.49+][msrv]*
28+
*Compiler support: [requires `rustc` 1.56+][msrv]*
2929

3030
[Prometheus]: https://prometheus.io
3131
[Jaeger]: https://www.jaegertracing.io
@@ -137,7 +137,7 @@ above, please let us know! We'd love to add your project to the list!
137137
## Supported Rust Versions
138138

139139
OpenTelemetry is built against the latest stable release. The minimum supported
140-
version is 1.49. The current OpenTelemetry version is not guaranteed to build
140+
version is 1.56. The current OpenTelemetry version is not guaranteed to build
141141
on Rust versions earlier than the minimum supported version.
142142

143143
The current stable Rust compiler and the three most recent minor versions

‎examples/actix-http-tracing/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "actix-http-tracing"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/actix-http/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "actix-http-example"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/actix-hyper/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "actix-hyper-example"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/actix-udp/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "actix-udp-example"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/async/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "async"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/aws-xray/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "aws-xray"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

‎examples/basic-otlp-http/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "basic-otlp-http"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/basic-otlp/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "basic-otlp"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/basic/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "basic"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/datadog/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "datadog"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/dynatrace/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "dynatrace"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/external-otlp-grpcio-async-std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "external-otlp-grpcio-async-std"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/external-otlp-tonic-tokio/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "external-otlp-tonic-tokio"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/grpc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "grpc"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[[bin]] # Bin to run the gRPC server

‎examples/http/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "http"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[[bin]] # Bin to run the http server

‎examples/hyper-prometheus/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "hyper-prometheus"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

‎examples/jaeger-remote-sampler/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "jaeger-remote-sampler"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55

66
[dependencies]
77
opentelemetry-sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio", "jaeger_remote_sampler"] }

‎examples/multiple-span-processors/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "multiple-span-processors"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/tracing-grpc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "tracing-grpc"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[[bin]] # Bin to run the gRPC server

‎examples/zipkin/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "zipkin"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
publish = false
66

77
[dependencies]

‎examples/zpages/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "zpages"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

‎opentelemetry-api/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
name = "opentelemetry-api"
33
version = "0.1.0"
44
license = "Apache-2.0"
5-
edition = "2018"
5+
edition = "2021"
6+
rust-version = "1.56"
67

78
[dependencies]
89
fnv = { version = "1.0", optional = true }
910
futures-channel = "0.3"
1011
futures-util = { version = "0.3", default-features = false, features = ["std", "sink"] }
11-
indexmap = "=1.8"
12+
indexmap = "1.8"
1213
once_cell = "1.12.0"
1314
pin-project-lite = { version = "0.2", optional = true }
1415
thiserror = "1"

‎opentelemetry-api/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ analysis in order to understand your software's performance and behavior. You
2525
can export and analyze them using [Prometheus], [Jaeger], and other
2626
observability tools.
2727

28-
*Compiler support: [requires `rustc` 1.49+][msrv]*
28+
*Compiler support: [requires `rustc` 1.56+][msrv]*
2929

3030
[Prometheus]: https://prometheus.io
3131
[Jaeger]: https://www.jaegertracing.io

‎opentelemetry-api/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! services to capture distributed traces and metrics from your application. You
33
//! can analyze them using [Prometheus], [Jaeger], and other observability tools.
44
//!
5-
//! *Compiler support: [requires `rustc` 1.49+][msrv]*
5+
//! *Compiler support: [requires `rustc` 1.56+][msrv]*
66
//!
77
//! [Prometheus]: https://prometheus.io
88
//! [Jaeger]: https://www.jaegertracing.io
@@ -11,7 +11,7 @@
1111
//! ## Supported Rust Versions
1212
//!
1313
//! OpenTelemetry is built against the latest stable release. The minimum
14-
//! supported version is 1.49. The current OpenTelemetry version is not
14+
//! supported version is 1.56. The current OpenTelemetry version is not
1515
//! guaranteed to build on Rust versions earlier than the minimum supported
1616
//! version.
1717
//!

‎opentelemetry-aws/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ categories = [
1111
]
1212
keywords = ["opentelemetry", "tracing"]
1313
license = "Apache-2.0"
14-
edition = "2018"
14+
edition = "2021"
15+
rust-version = "1.56"
1516

1617
[package.metadata.docs.rs]
1718
all-features = true

‎opentelemetry-contrib/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ categories = [
1111
]
1212
keywords = ["opentelemetry", "tracing"]
1313
license = "Apache-2.0"
14-
edition = "2018"
14+
edition = "2021"
15+
rust-version = "1.56"
1516

1617
[package.metadata.docs.rs]
1718
all-features = true

‎opentelemetry-datadog/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ categories = [
1111
]
1212
keywords = ["opentelemetry", "tracing"]
1313
license = "Apache-2.0"
14-
edition = "2018"
14+
edition = "2021"
15+
rust-version = "1.56"
1516

1617
[package.metadata.docs.rs]
1718
all-features = true
@@ -24,7 +25,7 @@ surf-client = ["surf", "opentelemetry-http/surf"]
2425

2526
[dependencies]
2627
async-trait = "0.1"
27-
indexmap = "=1.8"
28+
indexmap = "1.8"
2829
once_cell = "1.12"
2930
opentelemetry = { version = "0.17", path = "../opentelemetry", features = ["trace"] }
3031
opentelemetry-http = { version = "0.6", path = "../opentelemetry-http" }

‎opentelemetry-dynatrace/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ categories = [
1212
]
1313
keywords = ["opentelemetry", "metrics", "dynatrace"]
1414
license = "Apache-2.0"
15-
edition = "2018"
15+
edition = "2021"
16+
rust-version = "1.56"
1617

1718
[package.metadata.docs.rs]
1819
all-features = true

‎opentelemetry-http/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ homepage = "https://github.com/open-telemetry/opentelemetry-rust"
66
repository = "https://github.com/open-telemetry/opentelemetry-rust"
77
keywords = ["opentelemetry", "tracing", "metrics"]
88
license = "Apache-2.0"
9-
edition = "2018"
9+
edition = "2021"
10+
rust-version = "1.56"
1011

1112
[dependencies]
1213
async-trait = "0.1"

‎opentelemetry-http/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ analysis in order to understand your software's performance and behavior. This
2121
crate provides a HTTP client interface for use by trace exporters, as well as
2222
helper types to inject and extract key value pairs into/from HTTP headers.
2323

24-
*Compiler support: [requires `rustc` 1.49+][msrv]*
24+
*Compiler support: [requires `rustc` 1.56+][msrv]*
2525

2626
[`OpenTelemetry`]: https://crates.io/crates/opentelemetry
2727
[msrv]: #supported-rust-versions
2828

2929
## Supported Rust Versions
3030

3131
OpenTelemetry is built against the latest stable release. The minimum supported
32-
version is 1.49. The current OpenTelemetry version is not guaranteed to build
32+
version is 1.56. The current OpenTelemetry version is not guaranteed to build
3333
on Rust versions earlier than the minimum supported version.
3434

3535
The current stable Rust compiler and the three most recent minor versions

‎opentelemetry-jaeger/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ categories = [
1212
]
1313
keywords = ["opentelemetry", "jaeger", "tracing", "async"]
1414
license = "Apache-2.0"
15-
edition = "2018"
15+
edition = "2021"
16+
rust-version = "1.56"
1617

1718
[package.metadata.docs.rs]
1819
all-features = true
1920
rustdoc-args = ["--cfg", "docsrs"]
2021

2122
[dependencies]
22-
async-std = { version = "= 1.10.0", optional = true }
23+
async-std = { version = "1.10.0", optional = true }
2324
async-trait = "0.1"
2425
base64 = { version = "0.13", optional = true }
2526
futures = "0.3"

‎opentelemetry-jaeger/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ analysis in order to understand your software's performance and behavior. This
2323
crate provides a trace pipeline and exporter for sending span information to a
2424
Jaeger `agent` or `collector` endpoint for processing and visualization.
2525

26-
*Compiler support: [requires `rustc` 1.49+][msrv]*
26+
*Compiler support: [requires `rustc` 1.56+][msrv]*
2727

2828
[`Jaeger`]: https://www.jaegertracing.io/
2929
[`OpenTelemetry`]: https://crates.io/crates/opentelemetry

‎opentelemetry-jaeger/src/exporter/config/collector/http_client.rs

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ impl CollectorHttpClient {
5959
}
6060
#[cfg(feature = "surf_collector_client")]
6161
CollectorHttpClient::Surf => {
62-
use std::convert::TryInto;
6362
use opentelemetry_http::surf::BasicAuthMiddleware;
6463

6564
let client: surf::Client = surf::Config::new()

0 commit comments

Comments
 (0)