From e83b5974ccbdd740b0f7af2866752f5e7c20a696 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 7 Oct 2024 11:46:45 +0200 Subject: [PATCH] Bump MSRV to 1.70 --- .github/workflows/ci.yml | 2 +- README.md | 4 ++-- opentelemetry-appender-log/CHANGELOG.md | 2 ++ opentelemetry-appender-log/Cargo.toml | 2 +- opentelemetry-appender-tracing/CHANGELOG.md | 2 ++ opentelemetry-appender-tracing/Cargo.toml | 2 +- opentelemetry-http/CHANGELOG.md | 2 ++ opentelemetry-http/Cargo.toml | 2 +- opentelemetry-jaeger-propagator/CHANGELOG.md | 2 ++ opentelemetry-jaeger-propagator/Cargo.toml | 2 +- opentelemetry-otlp/CHANGELOG.md | 2 ++ opentelemetry-prometheus/CHANGELOG.md | 2 ++ opentelemetry-prometheus/Cargo.toml | 2 +- opentelemetry-proto/CHANGELOG.md | 2 ++ opentelemetry-sdk/CHANGELOG.md | 3 ++- opentelemetry-sdk/Cargo.toml | 2 +- opentelemetry-sdk/README.md | 2 +- opentelemetry-sdk/src/lib.rs | 2 +- opentelemetry-semantic-conventions/CHANGELOG.md | 2 ++ opentelemetry-semantic-conventions/Cargo.toml | 2 +- opentelemetry-stdout/CHANGELOG.md | 2 ++ opentelemetry-stdout/Cargo.toml | 2 +- opentelemetry-stdout/README.md | 2 +- opentelemetry-zipkin/CHANGELOG.md | 2 ++ opentelemetry-zipkin/Cargo.toml | 2 +- opentelemetry/CHANGELOG.md | 1 + opentelemetry/Cargo.toml | 2 +- opentelemetry/README.md | 2 +- scripts/msrv_config.json | 2 +- 29 files changed, 41 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be78936cff..11e3d00867 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.70.0, 1.71.1] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/README.md b/README.md index b43da29e61..f6d27bc4d9 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,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.65+][msrv]* +*Compiler support: [requires `rustc` 1.70+][msrv]* [Prometheus]: https://prometheus.io [Jaeger]: https://www.jaegertracing.io @@ -159,7 +159,7 @@ Registry](https://opentelemetry.io/ecosystem/registry/?language=rust). ## Supported Rust Versions OpenTelemetry is built against the latest stable release. The minimum supported -version is 1.65. 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-appender-log/CHANGELOG.md b/opentelemetry-appender-log/CHANGELOG.md index 447059d397..4c13090f9f 100644 --- a/opentelemetry-appender-log/CHANGELOG.md +++ b/opentelemetry-appender-log/CHANGELOG.md @@ -2,6 +2,8 @@ ## vNext +- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179) + ## v0.26.0 Released 2024-Sep-30 - Update `opentelemetry` dependency version to 0.26 diff --git a/opentelemetry-appender-log/Cargo.toml b/opentelemetry-appender-log/Cargo.toml index 94a13f24d9..ae41e18046 100644 --- a/opentelemetry-appender-log/Cargo.toml +++ b/opentelemetry-appender-log/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/ope readme = "README.md" keywords = ["opentelemetry", "log", "logs"] license = "Apache-2.0" -rust-version = "1.65" +rust-version = "1.70" edition = "2021" [dependencies] diff --git a/opentelemetry-appender-tracing/CHANGELOG.md b/opentelemetry-appender-tracing/CHANGELOG.md index 1d45b4cc38..8684d8b69a 100644 --- a/opentelemetry-appender-tracing/CHANGELOG.md +++ b/opentelemetry-appender-tracing/CHANGELOG.md @@ -2,6 +2,8 @@ ## vNext +- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179) + ## v0.26.0 Released 2024-Sep-30 diff --git a/opentelemetry-appender-tracing/Cargo.toml b/opentelemetry-appender-tracing/Cargo.toml index 5fffd11900..e443b91fba 100644 --- a/opentelemetry-appender-tracing/Cargo.toml +++ b/opentelemetry-appender-tracing/Cargo.toml @@ -8,7 +8,7 @@ repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/ope readme = "README.md" keywords = ["opentelemetry", "log", "logs", "tracing"] license = "Apache-2.0" -rust-version = "1.65" +rust-version = "1.70" [dependencies] log = { workspace = true, optional = true } diff --git a/opentelemetry-http/CHANGELOG.md b/opentelemetry-http/CHANGELOG.md index 991911fc07..822f980a75 100644 --- a/opentelemetry-http/CHANGELOG.md +++ b/opentelemetry-http/CHANGELOG.md @@ -2,6 +2,8 @@ ## vNext +- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179) + ## v0.26.0 Released 2024-Sep-30 diff --git a/opentelemetry-http/Cargo.toml b/opentelemetry-http/Cargo.toml index fd3b3e92ac..ff1d5f0a72 100644 --- a/opentelemetry-http/Cargo.toml +++ b/opentelemetry-http/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/open-telemetry/opentelemetry-rust" keywords = ["opentelemetry", "tracing", "context", "propagation"] license = "Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [features] hyper = ["dep:http-body-util", "dep:hyper", "dep:hyper-util", "dep:tokio"] diff --git a/opentelemetry-jaeger-propagator/CHANGELOG.md b/opentelemetry-jaeger-propagator/CHANGELOG.md index e9a5a36c12..f37da0b1fc 100644 --- a/opentelemetry-jaeger-propagator/CHANGELOG.md +++ b/opentelemetry-jaeger-propagator/CHANGELOG.md @@ -2,6 +2,8 @@ ## vNext +- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179) + ## v0.26.0 Released 2024-Sep-30 diff --git a/opentelemetry-jaeger-propagator/Cargo.toml b/opentelemetry-jaeger-propagator/Cargo.toml index ea88370d00..57537fef77 100644 --- a/opentelemetry-jaeger-propagator/Cargo.toml +++ b/opentelemetry-jaeger-propagator/Cargo.toml @@ -13,7 +13,7 @@ categories = [ keywords = ["opentelemetry", "jaeger", "propagator"] license = "Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [package.metadata.docs.rs] all-features = true diff --git a/opentelemetry-otlp/CHANGELOG.md b/opentelemetry-otlp/CHANGELOG.md index 099ca871fb..03470ada20 100644 --- a/opentelemetry-otlp/CHANGELOG.md +++ b/opentelemetry-otlp/CHANGELOG.md @@ -2,6 +2,8 @@ ## vNext +- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179) + ## v0.26.0 Released 2024-Sep-30 diff --git a/opentelemetry-prometheus/CHANGELOG.md b/opentelemetry-prometheus/CHANGELOG.md index 6486650baa..da42c5d26e 100644 --- a/opentelemetry-prometheus/CHANGELOG.md +++ b/opentelemetry-prometheus/CHANGELOG.md @@ -2,6 +2,8 @@ ## vNext +- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179) + ## v0.17.0 ### Changed diff --git a/opentelemetry-prometheus/Cargo.toml b/opentelemetry-prometheus/Cargo.toml index 3bbe65e35a..5c22b49124 100644 --- a/opentelemetry-prometheus/Cargo.toml +++ b/opentelemetry-prometheus/Cargo.toml @@ -13,7 +13,7 @@ categories = [ keywords = ["opentelemetry", "prometheus", "metrics", "async"] license = "Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [package.metadata.docs.rs] all-features = true diff --git a/opentelemetry-proto/CHANGELOG.md b/opentelemetry-proto/CHANGELOG.md index 3212534425..6b1d8fc11d 100644 --- a/opentelemetry-proto/CHANGELOG.md +++ b/opentelemetry-proto/CHANGELOG.md @@ -2,6 +2,8 @@ ## vNext +- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179) + ## v0.26.0 Released 2024-Sep-30 diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md index c232d21e2e..ae8a3c7ca1 100644 --- a/opentelemetry-sdk/CHANGELOG.md +++ b/opentelemetry-sdk/CHANGELOG.md @@ -2,7 +2,8 @@ ## vNext -- Implement `LogRecord::set_trace_context` for `LogRecord`. Respect any trace context set on a `LogRecord` when emitting through a `Logger`. +- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179) +- Implement `LogRecord::set_trace_context` for `LogRecord`. Respect any trace context set on a `LogRecord` when emitting through a `Logger`. ## v0.26.0 Released 2024-Sep-30 diff --git a/opentelemetry-sdk/Cargo.toml b/opentelemetry-sdk/Cargo.toml index 5fc542a943..1be4142432 100644 --- a/opentelemetry-sdk/Cargo.toml +++ b/opentelemetry-sdk/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/open-telemetry/opentelemetry-rust" readme = "README.md" license = "Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [dependencies] opentelemetry = { version = "0.26", path = "../opentelemetry/" } diff --git a/opentelemetry-sdk/README.md b/opentelemetry-sdk/README.md index f190e9dd9f..f3c0e98c8e 100644 --- a/opentelemetry-sdk/README.md +++ b/opentelemetry-sdk/README.md @@ -29,7 +29,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.65+][msrv]* +*Compiler support: [requires `rustc` 1.70+][msrv]* [Prometheus]: https://prometheus.io [Jaeger]: https://www.jaegertracing.io diff --git a/opentelemetry-sdk/src/lib.rs b/opentelemetry-sdk/src/lib.rs index 5ce2be9474..66b279e6b7 100644 --- a/opentelemetry-sdk/src/lib.rs +++ b/opentelemetry-sdk/src/lib.rs @@ -1,6 +1,6 @@ //! Implements the [`SDK`] component of [OpenTelemetry]. //! -//! *Compiler support: [requires `rustc` 1.65+][msrv]* +//! *Compiler support: [requires `rustc` 1.70+][msrv]* //! //! [`SDK`]: https://opentelemetry.io/docs/specs/otel/overview/#sdk //! [OpenTelemetry]: https://opentelemetry.io/docs/what-is-opentelemetry/ diff --git a/opentelemetry-semantic-conventions/CHANGELOG.md b/opentelemetry-semantic-conventions/CHANGELOG.md index ff362510ad..761b244993 100644 --- a/opentelemetry-semantic-conventions/CHANGELOG.md +++ b/opentelemetry-semantic-conventions/CHANGELOG.md @@ -2,6 +2,8 @@ ## vNext +- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179) + ## v0.26.0 Released 2024-Sep-30 diff --git a/opentelemetry-semantic-conventions/Cargo.toml b/opentelemetry-semantic-conventions/Cargo.toml index 0717a21851..b1f91555e7 100644 --- a/opentelemetry-semantic-conventions/Cargo.toml +++ b/opentelemetry-semantic-conventions/Cargo.toml @@ -13,7 +13,7 @@ categories = [ keywords = ["opentelemetry", "tracing", "async"] license = "Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [package.metadata.docs.rs] all-features = true diff --git a/opentelemetry-stdout/CHANGELOG.md b/opentelemetry-stdout/CHANGELOG.md index 3224c87261..bec333e4f6 100644 --- a/opentelemetry-stdout/CHANGELOG.md +++ b/opentelemetry-stdout/CHANGELOG.md @@ -2,6 +2,8 @@ ## vNext +- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179) + ## v0.26.0 Released 2024-Sep-30 diff --git a/opentelemetry-stdout/Cargo.toml b/opentelemetry-stdout/Cargo.toml index ce070f3d39..fd155da0f5 100644 --- a/opentelemetry-stdout/Cargo.toml +++ b/opentelemetry-stdout/Cargo.toml @@ -13,7 +13,7 @@ categories = [ keywords = ["opentelemetry", "tracing", "metrics", "logs"] license = "Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [package.metadata.docs.rs] all-features = true diff --git a/opentelemetry-stdout/README.md b/opentelemetry-stdout/README.md index fe5957c7b1..519bda2bd4 100644 --- a/opentelemetry-stdout/README.md +++ b/opentelemetry-stdout/README.md @@ -29,7 +29,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.65+][msrv]* +*Compiler support: [requires `rustc` 1.70+][msrv]* [Prometheus]: https://prometheus.io [Jaeger]: https://www.jaegertracing.io diff --git a/opentelemetry-zipkin/CHANGELOG.md b/opentelemetry-zipkin/CHANGELOG.md index dac9dc0315..54e8bfd052 100644 --- a/opentelemetry-zipkin/CHANGELOG.md +++ b/opentelemetry-zipkin/CHANGELOG.md @@ -2,6 +2,8 @@ ## vNext +- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179) + ## v0.26.0 Released 2024-Sep-30 diff --git a/opentelemetry-zipkin/Cargo.toml b/opentelemetry-zipkin/Cargo.toml index ee658ca494..603978a2f3 100644 --- a/opentelemetry-zipkin/Cargo.toml +++ b/opentelemetry-zipkin/Cargo.toml @@ -13,7 +13,7 @@ categories = [ keywords = ["opentelemetry", "zipkin", "tracing", "async"] license = "Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [package.metadata.docs.rs] all-features = true diff --git a/opentelemetry/CHANGELOG.md b/opentelemetry/CHANGELOG.md index 9ca361503e..f0903cba52 100644 --- a/opentelemetry/CHANGELOG.md +++ b/opentelemetry/CHANGELOG.md @@ -2,6 +2,7 @@ ## vNext +- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179) - Add `LogRecord::set_trace_context`; an optional method conditional on the `trace` feature for setting trace context on a log record. ## v0.26.0 diff --git a/opentelemetry/Cargo.toml b/opentelemetry/Cargo.toml index c553731715..75b6597a57 100644 --- a/opentelemetry/Cargo.toml +++ b/opentelemetry/Cargo.toml @@ -14,7 +14,7 @@ categories = [ keywords = ["opentelemetry", "logging", "tracing", "metrics"] license = "Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [package.metadata.docs.rs] all-features = true diff --git a/opentelemetry/README.md b/opentelemetry/README.md index 6aacb4925a..102e8431d4 100644 --- a/opentelemetry/README.md +++ b/opentelemetry/README.md @@ -28,7 +28,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.65+][msrv]* +*Compiler support: [requires `rustc` 1.70+][msrv]* [Prometheus]: https://prometheus.io [Jaeger]: https://www.jaegertracing.io diff --git a/scripts/msrv_config.json b/scripts/msrv_config.json index f7ee84b23c..e86cda1f8b 100644 --- a/scripts/msrv_config.json +++ b/scripts/msrv_config.json @@ -1,5 +1,5 @@ { - "1.65.0": [ + "1.70.0": [ "opentelemetry/Cargo.toml", "opentelemetry-sdk/Cargo.toml", "opentelemetry-stdout/Cargo.toml",