fix: Bump MSRV to 1.85 due to dependency conflict at 1.80/1.81

bryantbiggs · bryantbiggs · commit 3c6d251bad48 · 2026-03-20T20:24:31.000-05:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-rust-version = "1.80.0"
+rust-version = "1.85.0"
 # Avoid applying patch to force use of workspace members for this
 # not actively maintained crate
 exclude = ["opentelemetry-prometheus"]
diff --git a/deny.toml b/deny.toml
@@ -7,10 +7,13 @@ allow = [
     "Apache-2.0",
     "ISC",
     "BSD-3-Clause",
+    "Zlib",
 ]
 
 exceptions = [
     { allow = ["CDLA-Permissive-2.0"], crate = "webpki-roots" }, # This crate is a dependency of `reqwest`.
+    { allow = ["CDLA-Permissive-2.0"], crate = "webpki-root-certs" }, # This crate is a dependency of `reqwest`.
+    { allow = ["OpenSSL"], crate = "aws-lc-sys" }, # This crate is a dependency of `reqwest`.
     { allow = ["Unicode-3.0"], crate = "icu_collections" }, # This crate gets used transitively by `reqwest`.
     { allow = ["Unicode-3.0"], crate = "icu_locid" }, # This crate gets used transitively by `reqwest`.
     { allow = ["Unicode-3.0"], crate = "icu_locid_transform" }, # This crate gets used transitively by `reqwest`.
diff --git a/opentelemetry-appender-log/CHANGELOG.md b/opentelemetry-appender-log/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## vNext
 
-- Bump MSRV to 1.80.0
+- Bump MSRV to 1.85.0
 - "spec_unstable_logs_enabled" feature flag is removed. The capability (and the
   backing specification) is now stable and is enabled by default.
   [3278](https://github.com/open-telemetry/opentelemetry-rust/pull/3278)
diff --git a/opentelemetry-appender-tracing/CHANGELOG.md b/opentelemetry-appender-tracing/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## vNext
 
-- Bump MSRV to 1.80.0
+- Bump MSRV to 1.85.0
 - New *experimental* feature to enrich log records with attributes from active
   tracing spans (`experimental_span_attributes`). Use
   `OpenTelemetryTracingBridge::builder()` with `with_span_attribute_allowlist`
diff --git a/opentelemetry-http/CHANGELOG.md b/opentelemetry-http/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## vNext
 
-- Bump MSRV to 1.80.0
+- Bump MSRV to 1.85.0
 - `reqwest`'s crypto backend has changed from `ring` to `aws-lc-sys`.
 
 ## 0.31.0
diff --git a/opentelemetry-jaeger-propagator/CHANGELOG.md b/opentelemetry-jaeger-propagator/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## vNext
 
-- Bump MSRV to 1.80.0
+- Bump MSRV to 1.85.0
 
 ## 0.31.0
 
diff --git a/opentelemetry-otlp/CHANGELOG.md b/opentelemetry-otlp/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## vNext
 
 - Add `tls-provider-agnostic` feature flag for environments that require a custom crypto backend (e.g., OpenSSL for FIPS compliance). Enables TLS code paths without bundling `ring` or `aws-lc-rs`.
-- Bump MSRV to 1.80.0
+- Bump MSRV to 1.85.0
 - Add `build()` directly on `SpanExporterBuilder`, `MetricExporterBuilder`, and `LogExporterBuilder`
   (before selecting a transport), which auto-selects the transport based on the
   `OTEL_EXPORTER_OTLP_PROTOCOL` environment variable or enabled features.
diff --git a/opentelemetry-prometheus/CHANGELOG.md b/opentelemetry-prometheus/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## vNext
 
+- Bump MSRV to 1.85.0
+
 ## v0.31.1
 
 - Remove `protobuf` dependency from `prometheus`
diff --git 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.80.0"
+rust-version = "1.85.0"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-proto/CHANGELOG.md b/opentelemetry-proto/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## vNext
 
-- Bump MSRV to 1.80.0
+- Bump MSRV to 1.85.0
 - Updated `schemars` dependency to version 1.0.0.
 
 ## 0.31.0
diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md
@@ -5,7 +5,7 @@
 - **Breaking** The SDK `testing` feature is now runtime agnostic. [#3407][3407]
   - `TokioSpanExporter` and `new_tokio_test_exporter` have been renamed to `TestSpanExporter` and `new_test_exporter`.
   - The following transitive dependencies and features have been removed: `tokio/rt`, `tokio/time`, `tokio/macros`, `tokio/rt-multi-thread`, `tokio-stream`, `experimental_async_runtime`
-- Bump MSRV to 1.80.0
+- Bump MSRV to 1.85.0
 - Add 32-bit platform support by using `portable-atomic` for `AtomicI64` and `AtomicU64` in the metrics module. This enables compilation on 32-bit ARM targets (e.g., `armv5te-unknown-linux-gnueabi`, `armv7-unknown-linux-gnueabihf`).
 - `Aggregation` enum and `StreamBuilder::with_aggregation()` are now stable and no longer require the `spec_unstable_metrics_views` feature flag.
 - Fix `service.name` Resource attribute fallback to follow OpenTelemetry
diff --git a/opentelemetry-sdk/src/metrics/internal/exponential_histogram.rs b/opentelemetry-sdk/src/metrics/internal/exponential_histogram.rs
@@ -270,9 +270,10 @@ impl ExpoBuckets {
                 return;
             }
 
-            self.counts.extend(
-                std::iter::repeat(0).take((bin - self.start_bin) as usize - self.counts.len() + 1),
-            );
+            self.counts.extend(std::iter::repeat_n(
+                0,
+                (bin - self.start_bin) as usize - self.counts.len() + 1,
+            ));
             self.counts[(bin - self.start_bin) as usize] = 1
         }
     }
diff --git a/opentelemetry-semantic-conventions/CHANGELOG.md b/opentelemetry-semantic-conventions/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## vNext
 
-- Bump MSRV to 1.80.0
+- Bump MSRV to 1.85.0
 
 ## 0.31.0
 
diff --git a/opentelemetry/CHANGELOG.md b/opentelemetry/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## vNext
 
-- Bump MSRV to 1.80.0
+- Bump MSRV to 1.85.0
 - Add `reserve` method to `opentelemetry::propagation::Injector` to hint at the number of elements that will be added to avoid multiple resize operations of the underlying data structure. Has an empty default implementation.
 - **Breaking** Removed the following public fields and methods from the `SpanBuilder` [#3227][3227]:
   - `trace_id`, `span_id`, `end_time`, `status`, `sampling_result`
