diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be78936cff..f7002f0c0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest] - rust: [1.65.0, 1.71.1] + rust: [1.65.0, 1.70.0] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/opentelemetry-otlp/CHANGELOG.md b/opentelemetry-otlp/CHANGELOG.md index fa56e16469..584d80ed7f 100644 --- a/opentelemetry-otlp/CHANGELOG.md +++ b/opentelemetry-otlp/CHANGELOG.md @@ -1,7 +1,6 @@ # Changelog ## vNext -- Bump MSRV to 1.71.1 [2140](https://github.com/open-telemetry/opentelemetry-rust/pull/2140) ## v0.25.0 diff --git a/opentelemetry-otlp/Cargo.toml b/opentelemetry-otlp/Cargo.toml index 58882b30e2..b2027b41c2 100644 --- a/opentelemetry-otlp/Cargo.toml +++ b/opentelemetry-otlp/Cargo.toml @@ -13,7 +13,7 @@ categories = [ keywords = ["opentelemetry", "otlp", "logging", "tracing", "metrics"] license = "Apache-2.0" edition = "2021" -rust-version = "1.71.1" +rust-version = "1.70.0" autotests = false [[test]] diff --git a/opentelemetry-otlp/README.md b/opentelemetry-otlp/README.md index ae157c6562..c9fb019de2 100644 --- a/opentelemetry-otlp/README.md +++ b/opentelemetry-otlp/README.md @@ -30,7 +30,7 @@ can easily instrument your applications or systems, no matter their language, infrastructure, or runtime environment. Crucially, the storage and visualization of telemetry is intentionally left to other tools. -*Compiler support: [requires `rustc` 1.71.1+][msrv]* +*Compiler support: [requires `rustc` 1.70+][msrv]* [Prometheus]: https://prometheus.io [Jaeger]: https://www.jaegertracing.io @@ -43,7 +43,7 @@ See [docs](https://docs.rs/opentelemetry-otlp). ## Supported Rust Versions OpenTelemetry is built against the latest stable release. The minimum supported -version is 1.71.1. The current OpenTelemetry version is not guaranteed to build +version is 1.70. 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-proto/CHANGELOG.md b/opentelemetry-proto/CHANGELOG.md index 35a1564fb0..cbc72a39cd 100644 --- a/opentelemetry-proto/CHANGELOG.md +++ b/opentelemetry-proto/CHANGELOG.md @@ -3,7 +3,6 @@ ## vNext - Fix JSON serialization of `metrics::Exemplar` and `trace::span::Link` [#2069](https://github.com/open-telemetry/opentelemetry-rust/pull/2069) -- Bump MSRV to 1.71.1 [2140](https://github.com/open-telemetry/opentelemetry-rust/pull/2140) ## v0.25.0 - Update `opentelemetry` dependency version to 0.25 diff --git a/opentelemetry-proto/Cargo.toml b/opentelemetry-proto/Cargo.toml index 66593f2a22..7c4a5f7a19 100644 --- a/opentelemetry-proto/Cargo.toml +++ b/opentelemetry-proto/Cargo.toml @@ -13,7 +13,7 @@ categories = [ keywords = ["opentelemetry", "otlp", "logging", "tracing", "metrics"] license = "Apache-2.0" edition = "2021" -rust-version = "1.71.1" +rust-version = "1.70" autotests = false [lib] diff --git a/opentelemetry-proto/README.md b/opentelemetry-proto/README.md index 6e0a920048..aa1c0d65fa 100644 --- a/opentelemetry-proto/README.md +++ b/opentelemetry-proto/README.md @@ -7,4 +7,4 @@ This crate contains generated files from [opentelemetry-proto](https://github.co repository and transformation between types from generated files and types defined in [opentelemetry](https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry). -*Compiler support: [requires `rustc` 1.71.1+] \ No newline at end of file +*Compiler support: [requires `rustc` 1.70] \ No newline at end of file diff --git a/scripts/msrv_config.json b/scripts/msrv_config.json index f7ee84b23c..862a653b0a 100644 --- a/scripts/msrv_config.json +++ b/scripts/msrv_config.json @@ -9,7 +9,7 @@ "opentelemetry-appender-log/Cargo.toml", "opentelemetry-appender-tracing/Cargo.toml" ], - "1.71.1": [ + "1.70.0": [ "opentelemetry-otlp/Cargo.toml", "opentelemetry-proto/Cargo.toml" ] diff --git a/scripts/patch_dependencies.sh b/scripts/patch_dependencies.sh index ead57c189f..655809d620 100755 --- a/scripts/patch_dependencies.sh +++ b/scripts/patch_dependencies.sh @@ -11,4 +11,5 @@ patch_version url 2.5.0 patch_version hyper-rustls 0.27.2 # 0.27.3 needs rustc v1.70.0 patch_version tokio-util 0.7.11 # 0.7.12 needs rustc v1.70.0 patch_version tokio-stream 0.1.15 # 0.1.16 needs rustc v1.70.0 -patch_version tokio 1.38.0 # 1.39 needs msrv bump to rustc 1.70 +patch_version tokio 1.38.0 # 1.39 needs rustc 1.70 +patch_version prost 0.13.2 # 0.13.3 needs rustc 1.71.1