Skip to content
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

chore(common): bump MSRV to 1.56 #866

Merged
merged 4 commits into from Sep 1, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Expand Up @@ -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 &&
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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]
Expand Down
2 changes: 1 addition & 1 deletion 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]
Expand Down
2 changes: 1 addition & 1 deletion 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]
Expand Down
2 changes: 1 addition & 1 deletion 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]
Expand Down
2 changes: 1 addition & 1 deletion examples/async/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "async"
version = "0.1.0"
edition = "2018"
edition = "2021"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion 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]
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-otlp/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "basic-otlp"
version = "0.1.0"
edition = "2018"
edition = "2021"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "basic"
version = "0.1.0"
edition = "2018"
edition = "2021"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/datadog/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "datadog"
version = "0.1.0"
edition = "2018"
edition = "2021"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/dynatrace/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "dynatrace"
version = "0.1.0"
edition = "2018"
edition = "2021"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion 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]
Expand Down
2 changes: 1 addition & 1 deletion 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]
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion 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"] }
Expand Down
2 changes: 1 addition & 1 deletion 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]
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion examples/zipkin/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "zipkin"
version = "0.1.0"
edition = "2018"
edition = "2021"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion 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

Expand Down
5 changes: 3 additions & 2 deletions opentelemetry-api/Cargo.toml
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-api/README.md
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions opentelemetry-api/src/lib.rs
Expand Up @@ -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
Expand All @@ -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.
//!
Expand Down
3 changes: 2 additions & 1 deletion opentelemetry-aws/Cargo.toml
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion opentelemetry-contrib/Cargo.toml
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions opentelemetry-datadog/Cargo.toml
Expand Up @@ -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
Expand All @@ -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" }
Expand Down
3 changes: 2 additions & 1 deletion opentelemetry-dynatrace/Cargo.toml
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion opentelemetry-http/Cargo.toml
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions opentelemetry-http/README.md
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions opentelemetry-jaeger/Cargo.toml
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-jaeger/README.md
Expand Up @@ -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
Expand Down
Expand Up @@ -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()
Expand Down