From b9c418471411664e49b433201169d565bba085cf Mon Sep 17 00:00:00 2001
From: Shaun Cox <shaunco@microsoft.com>
Date: Fri, 11 Aug 2023 11:54:15 -0500
Subject: [PATCH 1/2] bump MSRV to 1.64 and indexmap to 2.0

---
 .github/workflows/ci.yml                                 | 2 +-
 README.md                                                | 4 ++--
 opentelemetry-api/Cargo.toml                             | 4 ++--
 opentelemetry-api/README.md                              | 2 +-
 opentelemetry-api/src/lib.rs                             | 4 ++--
 opentelemetry-api/src/order_map.rs                       | 2 +-
 opentelemetry-api/src/trace/span.rs                      | 9 ++-------
 opentelemetry-appender-log/Cargo.toml                    | 2 +-
 opentelemetry-appender-tracing/Cargo.toml                | 2 +-
 opentelemetry-aws/Cargo.toml                             | 2 +-
 opentelemetry-contrib/Cargo.toml                         | 2 +-
 opentelemetry-datadog/Cargo.toml                         | 4 ++--
 opentelemetry-dynatrace/Cargo.toml                       | 2 +-
 opentelemetry-http/Cargo.toml                            | 2 +-
 opentelemetry-http/README.md                             | 4 ++--
 opentelemetry-jaeger/Cargo.toml                          | 2 +-
 opentelemetry-jaeger/README.md                           | 4 ++--
 .../src/exporter/config/collector/mod.rs                 | 1 +
 opentelemetry-jaeger/src/lib.rs                          | 6 +++---
 opentelemetry-otlp/Cargo.toml                            | 2 +-
 opentelemetry-prometheus/Cargo.toml                      | 2 +-
 opentelemetry-proto/Cargo.toml                           | 2 +-
 opentelemetry-sdk/Cargo.toml                             | 4 ++--
 opentelemetry-sdk/README.md                              | 2 +-
 opentelemetry-semantic-conventions/Cargo.toml            | 2 +-
 opentelemetry-stackdriver/Cargo.toml                     | 2 +-
 opentelemetry-stdout/Cargo.toml                          | 2 +-
 opentelemetry-stdout/README.md                           | 4 ++--
 opentelemetry-user-events-metrics/Cargo.toml             | 2 +-
 opentelemetry-zipkin/Cargo.toml                          | 2 +-
 opentelemetry-zipkin/README.md                           | 6 +++---
 opentelemetry-zipkin/src/lib.rs                          | 4 ++--
 opentelemetry-zpages/Cargo.toml                          | 2 +-
 opentelemetry/Cargo.toml                                 | 2 +-
 opentelemetry/README.md                                  | 4 ++--
 opentelemetry/src/lib.rs                                 | 4 ++--
 36 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3f527d1c7c..02aea1f9a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -70,7 +70,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.60.0
+        toolchain: 1.64.0
         override: true
     - name: Patch dependencies versions # some dependencies bump MSRV without major version bump
       run: ./scripts/patch_dependencies.sh
diff --git a/README.md b/README.md
index 1407ae1357..b279015607 100644
--- a/README.md
+++ b/README.md
@@ -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.60+][msrv]*
+*Compiler support: [requires `rustc` 1.64+][msrv]*
 
 [Prometheus]: https://prometheus.io
 [Jaeger]: https://www.jaegertracing.io
@@ -168,7 +168,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.60. The current OpenTelemetry version is not guaranteed to build
+version is 1.64. 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-api/Cargo.toml b/opentelemetry-api/Cargo.toml
index c49d3fd9f3..c24ac7aecc 100644
--- a/opentelemetry-api/Cargo.toml
+++ b/opentelemetry-api/Cargo.toml
@@ -7,12 +7,12 @@ repository = "https://github.com/open-telemetry/opentelemetry-rust"
 readme = "README.md"
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 
 [dependencies]
 futures-channel = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["std", "sink"] }
-indexmap = "1.8"
+indexmap = "2.0"
 once_cell = "1.12.0"
 pin-project-lite = { version = "0.2", optional = true }
 thiserror = "1"
diff --git a/opentelemetry-api/README.md b/opentelemetry-api/README.md
index b761326529..c379973de3 100644
--- a/opentelemetry-api/README.md
+++ b/opentelemetry-api/README.md
@@ -21,7 +21,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.60+][msrv]*
+*Compiler support: [requires `rustc` 1.64+][msrv]*
 
 [Prometheus]: https://prometheus.io
 [Jaeger]: https://www.jaegertracing.io
diff --git a/opentelemetry-api/src/lib.rs b/opentelemetry-api/src/lib.rs
index 0976ba41c7..43c3e1290c 100644
--- a/opentelemetry-api/src/lib.rs
+++ b/opentelemetry-api/src/lib.rs
@@ -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.60+][msrv]*
+//! *Compiler support: [requires `rustc` 1.64+][msrv]*
 //!
 //! [Prometheus]: https://prometheus.io
 //! [Jaeger]: https://www.jaegertracing.io
@@ -11,7 +11,7 @@
 //! ## Supported Rust Versions
 //!
 //! OpenTelemetry is built against the latest stable release. The minimum
-//! supported version is 1.60. The current OpenTelemetry version is not
+//! supported version is 1.64. The current OpenTelemetry version is not
 //! guaranteed to build on Rust versions earlier than the minimum supported
 //! version.
 //!
diff --git a/opentelemetry-api/src/order_map.rs b/opentelemetry-api/src/order_map.rs
index b69cc7090d..46eb704a99 100644
--- a/opentelemetry-api/src/order_map.rs
+++ b/opentelemetry-api/src/order_map.rs
@@ -377,7 +377,7 @@ impl<K, V, S> OrderMap<K, V, S> {
     /// Valid indices are *0 <= index < self.len()*
     ///
     /// Computes in **O(1)** time.
-    pub fn get_index_mut(&mut self, index: usize) -> Option<(&mut K, &mut V)> {
+    pub fn get_index_mut(&mut self, index: usize) -> Option<(&K, &mut V)> {
         self.0.get_index_mut(index)
     }
 
diff --git a/opentelemetry-api/src/trace/span.rs b/opentelemetry-api/src/trace/span.rs
index ff2e8b5f89..ac2532f766 100644
--- a/opentelemetry-api/src/trace/span.rs
+++ b/opentelemetry-api/src/trace/span.rs
@@ -260,9 +260,10 @@ pub enum SpanKind {
 ///
 /// Only the value of the last call will be recorded, and implementations are
 /// free to ignore previous calls.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd)]
+#[derive(Default, Debug, Clone, PartialEq, Eq, PartialOrd)]
 pub enum Status {
     /// The default status.
+    #[default]
     Unset,
 
     /// The operation contains an error.
@@ -298,12 +299,6 @@ impl Status {
     }
 }
 
-impl Default for Status {
-    fn default() -> Self {
-        Status::Unset
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/opentelemetry-appender-log/Cargo.toml b/opentelemetry-appender-log/Cargo.toml
index 443c09af98..076a11d883 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.60"
+rust-version = "1.64"
 edition = "2021"
 
 [dependencies]
diff --git a/opentelemetry-appender-tracing/Cargo.toml b/opentelemetry-appender-tracing/Cargo.toml
index 54a0522cad..fe2923369c 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.60"
+rust-version = "1.64"
 
 [dependencies]
 opentelemetry_api = { version = "0.20", path = "../opentelemetry-api", features = ["logs"] }
diff --git a/opentelemetry-aws/Cargo.toml b/opentelemetry-aws/Cargo.toml
index d3f419dac4..1d17b0c276 100644
--- a/opentelemetry-aws/Cargo.toml
+++ b/opentelemetry-aws/Cargo.toml
@@ -12,7 +12,7 @@ categories = [
 keywords = ["opentelemetry", "tracing"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-contrib/Cargo.toml b/opentelemetry-contrib/Cargo.toml
index ad90085330..cfb6684f95 100644
--- a/opentelemetry-contrib/Cargo.toml
+++ b/opentelemetry-contrib/Cargo.toml
@@ -12,7 +12,7 @@ categories = [
 keywords = ["opentelemetry", "tracing"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-datadog/Cargo.toml b/opentelemetry-datadog/Cargo.toml
index 6ebaa5c765..dd7466fb92 100644
--- a/opentelemetry-datadog/Cargo.toml
+++ b/opentelemetry-datadog/Cargo.toml
@@ -12,7 +12,7 @@ categories = [
 keywords = ["opentelemetry", "tracing"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -24,7 +24,7 @@ reqwest-client = ["reqwest", "opentelemetry-http/reqwest"]
 surf-client = ["surf", "opentelemetry-http/surf"]
 
 [dependencies]
-indexmap = "1.8"
+indexmap = "2.0"
 once_cell = "1.12"
 opentelemetry = { version = "0.20", path = "../opentelemetry", features = ["trace"] }
 opentelemetry-http = { version = "0.9", path = "../opentelemetry-http" }
diff --git a/opentelemetry-dynatrace/Cargo.toml b/opentelemetry-dynatrace/Cargo.toml
index 68df05c544..734e716168 100644
--- a/opentelemetry-dynatrace/Cargo.toml
+++ b/opentelemetry-dynatrace/Cargo.toml
@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "metrics", "dynatrace"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-http/Cargo.toml b/opentelemetry-http/Cargo.toml
index 1d0a52d0e2..8d222c80ba 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", "metrics"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 
 [dependencies]
 async-trait = "0.1"
diff --git a/opentelemetry-http/README.md b/opentelemetry-http/README.md
index cfcb188f74..991c59df15 100644
--- a/opentelemetry-http/README.md
+++ b/opentelemetry-http/README.md
@@ -18,7 +18,7 @@ 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.60+][msrv]*
+*Compiler support: [requires `rustc` 1.64+][msrv]*
 
 [`OpenTelemetry`]: https://crates.io/crates/opentelemetry
 [msrv]: #supported-rust-versions
@@ -26,7 +26,7 @@ helper types to inject and extract key value pairs into/from HTTP headers.
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.60. The current OpenTelemetry version is not guaranteed to build
+version is 1.64. 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-jaeger/Cargo.toml b/opentelemetry-jaeger/Cargo.toml
index 13b8cb738b..8efc7a47e6 100644
--- a/opentelemetry-jaeger/Cargo.toml
+++ b/opentelemetry-jaeger/Cargo.toml
@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "jaeger", "tracing", "async"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-jaeger/README.md b/opentelemetry-jaeger/README.md
index 55ad2a8916..a22877d2af 100644
--- a/opentelemetry-jaeger/README.md
+++ b/opentelemetry-jaeger/README.md
@@ -20,7 +20,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.60+][msrv]*
+*Compiler support: [requires `rustc` 1.64+][msrv]*
 
 [`Jaeger`]: https://www.jaegertracing.io/
 [`OpenTelemetry`]: https://crates.io/crates/opentelemetry
@@ -146,7 +146,7 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.60. The current OpenTelemetry version is not guaranteed to build
+version is 1.64. 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-jaeger/src/exporter/config/collector/mod.rs b/opentelemetry-jaeger/src/exporter/config/collector/mod.rs
index aa649f58b6..22a7d180ab 100644
--- a/opentelemetry-jaeger/src/exporter/config/collector/mod.rs
+++ b/opentelemetry-jaeger/src/exporter/config/collector/mod.rs
@@ -172,6 +172,7 @@ enum ClientConfig {
     Wasm, // no config is available for wasm for now. But we can add in the future
 }
 
+#[allow(clippy::derivable_impls)]
 impl Default for ClientConfig {
     fn default() -> Self {
         // as long as collector is enabled, we will in favor of it
diff --git a/opentelemetry-jaeger/src/lib.rs b/opentelemetry-jaeger/src/lib.rs
index be60a11b0c..460d06817d 100644
--- a/opentelemetry-jaeger/src/lib.rs
+++ b/opentelemetry-jaeger/src/lib.rs
@@ -6,7 +6,7 @@
 //! supports accepting data in the OTLP protocol.
 //! See the [Jaeger Docs] for details about Jaeger and deployment information.
 //!
-//! *Compiler support: [requires `rustc` 1.60+][msrv]*
+//! *Compiler support: [requires `rustc` 1.64+][msrv]*
 //!
 //! [Jaeger Docs]: https://www.jaegertracing.io/docs/
 //! [jaeger-deprecation]: https://github.com/open-telemetry/opentelemetry-specification/pull/2858/files
@@ -285,13 +285,13 @@
 //! # Supported Rust Versions
 //!
 //! OpenTelemetry is built against the latest stable release. The minimum
-//! supported version is 1.60. The current OpenTelemetry version is not
+//! supported version is 1.64. 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
 //! before it will always be supported. For example, if the current stable
-//! compiler version is 1.60, the minimum supported version will not be
+//! compiler version is 1.64, the minimum supported version will not be
 //! increased past 1.46, three minor versions prior. Increasing the minimum
 //! supported compiler version is not considered a semver breaking change as
 //! long as doing so complies with this policy.
diff --git a/opentelemetry-otlp/Cargo.toml b/opentelemetry-otlp/Cargo.toml
index 6e63ed2546..7d2f78238f 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.60"
+rust-version = "1.64"
 autotests = false
 
 [[test]]
diff --git a/opentelemetry-prometheus/Cargo.toml b/opentelemetry-prometheus/Cargo.toml
index e37d6ee88a..7f76fa41b5 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.60"
+rust-version = "1.64"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-proto/Cargo.toml b/opentelemetry-proto/Cargo.toml
index 3e91479b72..b7ff496228 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.60"
+rust-version = "1.64"
 autotests = false
 
 [lib]
diff --git a/opentelemetry-sdk/Cargo.toml b/opentelemetry-sdk/Cargo.toml
index dd9a96434f..8147578589 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.60"
+rust-version = "1.64"
 
 [dependencies]
 opentelemetry_api = { version = "0.20", path = "../opentelemetry-api/" }
@@ -36,7 +36,7 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dev-dependencies]
-indexmap = "1.8"
+indexmap = "2.0"
 criterion = { version = "0.5", features = ["html_reports"] }
 pprof = { version = "0.12", features = ["flamegraph", "criterion"] }
 
diff --git a/opentelemetry-sdk/README.md b/opentelemetry-sdk/README.md
index 147d33485c..067392dfef 100644
--- a/opentelemetry-sdk/README.md
+++ b/opentelemetry-sdk/README.md
@@ -21,7 +21,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.60+][msrv]*
+*Compiler support: [requires `rustc` 1.64+][msrv]*
 
 [Prometheus]: https://prometheus.io
 [Jaeger]: https://www.jaegertracing.io
diff --git a/opentelemetry-semantic-conventions/Cargo.toml b/opentelemetry-semantic-conventions/Cargo.toml
index b3b6c3f84e..50eca5ed84 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.60"
+rust-version = "1.64"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-stackdriver/Cargo.toml b/opentelemetry-stackdriver/Cargo.toml
index 9f4ac9e786..052e0695dd 100644
--- a/opentelemetry-stackdriver/Cargo.toml
+++ b/opentelemetry-stackdriver/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/open-telemetry/opentelemetry-rust"
 license = "Apache-2.0"
 edition = "2021"
 exclude = ["/proto"]
-rust-version = "1.60"
+rust-version = "1.64"
 
 [dependencies]
 async-trait = "0.1.48"
diff --git a/opentelemetry-stdout/Cargo.toml b/opentelemetry-stdout/Cargo.toml
index f1024c5ccf..9398d4456e 100644
--- a/opentelemetry-stdout/Cargo.toml
+++ b/opentelemetry-stdout/Cargo.toml
@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "tracing", "metrics"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 
 [features]
 trace = ["opentelemetry_api/trace", "opentelemetry_sdk/trace", "futures-util"]
diff --git a/opentelemetry-stdout/README.md b/opentelemetry-stdout/README.md
index b97f966242..57c25835ba 100644
--- a/opentelemetry-stdout/README.md
+++ b/opentelemetry-stdout/README.md
@@ -20,7 +20,7 @@ analysis in order to understand your software's performance and behavior. This
 crate provides exporters that export to stdout or any implementation of
 [`std::io::Write`].
 
-*Compiler support: [requires `rustc` 1.60+][msrv]*
+*Compiler support: [requires `rustc` 1.64+][msrv]*
 
 [`std::io::Write`]: https://doc.rust-lang.org/std/io/trait.Write.html
 [`OpenTelemetry`]: https://crates.io/crates/opentelemetry
@@ -70,7 +70,7 @@ Recorded traces and metrics will now be sent to stdout:
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.60. The current OpenTelemetry version is not guaranteed to build
+version is 1.64. 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-user-events-metrics/Cargo.toml b/opentelemetry-user-events-metrics/Cargo.toml
index 9e8ecda324..42202087ba 100644
--- a/opentelemetry-user-events-metrics/Cargo.toml
+++ b/opentelemetry-user-events-metrics/Cargo.toml
@@ -8,7 +8,7 @@ readme = "README.md"
 keywords = ["opentelemetry", "metrics", "user-events"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 
 [dependencies]
 opentelemetry_api = { version = "0.20", path = "../opentelemetry-api", features = ["metrics"] }
diff --git a/opentelemetry-zipkin/Cargo.toml b/opentelemetry-zipkin/Cargo.toml
index 20b1e3d644..d2b674ac89 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.60"
+rust-version = "1.64"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-zipkin/README.md b/opentelemetry-zipkin/README.md
index 736ab31d83..c321fcd060 100644
--- a/opentelemetry-zipkin/README.md
+++ b/opentelemetry-zipkin/README.md
@@ -21,7 +21,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
 Zipkin collector for processing and visualization.
 
-*Compiler support: [requires `rustc` 1.60+][msrv]*
+*Compiler support: [requires `rustc` 1.64+][msrv]*
 
 [`Zipkin`]: https://zipkin.io/
 [`OpenTelemetry`]: https://crates.io/crates/opentelemetry
@@ -105,12 +105,12 @@ available so be sure to match them appropriately.
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.60. The current OpenTelemetry version is not guaranteed to build on
+version is 1.64. 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 before
 it will always be supported. For example, if the current stable compiler version
-is 1.60, the minimum supported version will not be increased past 1.46, three
+is 1.64, the minimum supported version will not be increased past 1.46, three
 minor versions prior. Increasing the minimum supported compiler version is not
 considered a semver breaking change as long as doing so complies with this
 policy.
diff --git a/opentelemetry-zipkin/src/lib.rs b/opentelemetry-zipkin/src/lib.rs
index cf034fc1e9..767f56d98f 100644
--- a/opentelemetry-zipkin/src/lib.rs
+++ b/opentelemetry-zipkin/src/lib.rs
@@ -3,7 +3,7 @@
 //! Collects OpenTelemetry spans and reports them to a given Zipkin collector
 //! endpoint. See the [Zipkin Docs] for details and deployment information.
 //!
-//! *Compiler support: [requires `rustc` 1.60+][msrv]*
+//! *Compiler support: [requires `rustc` 1.64+][msrv]*
 //!
 //! [Zipkin Docs]: https://zipkin.io/
 //! [msrv]: #supported-rust-versions
@@ -167,7 +167,7 @@
 //! ## Supported Rust Versions
 //!
 //! OpenTelemetry is built against the latest stable release. The minimum
-//! supported version is 1.60. The current OpenTelemetry version is not
+//! supported version is 1.64. The current OpenTelemetry version is not
 //! guaranteed to build on Rust versions earlier than the minimum supported
 //! version.
 //!
diff --git a/opentelemetry-zpages/Cargo.toml b/opentelemetry-zpages/Cargo.toml
index 410799cf0f..0abf3a1af4 100644
--- a/opentelemetry-zpages/Cargo.toml
+++ b/opentelemetry-zpages/Cargo.toml
@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "zipkin", "tracing", "async"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry/Cargo.toml b/opentelemetry/Cargo.toml
index a24e66852f..6cbef342c9 100644
--- a/opentelemetry/Cargo.toml
+++ b/opentelemetry/Cargo.toml
@@ -14,7 +14,7 @@ categories = [
 keywords = ["opentelemetry", "logging", "tracing", "metrics", "async"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry/README.md b/opentelemetry/README.md
index 3e919d594b..21b8b6a128 100644
--- a/opentelemetry/README.md
+++ b/opentelemetry/README.md
@@ -21,7 +21,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.60+][msrv]*
+*Compiler support: [requires `rustc` 1.64+][msrv]*
 
 [Prometheus]: https://prometheus.io
 [Jaeger]: https://www.jaegertracing.io
@@ -133,7 +133,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.60. The current OpenTelemetry version is not guaranteed to build
+version is 1.64. 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/src/lib.rs b/opentelemetry/src/lib.rs
index a5f0dd902a..b845c817a4 100644
--- a/opentelemetry/src/lib.rs
+++ b/opentelemetry/src/lib.rs
@@ -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.60+][msrv]*
+//! *Compiler support: [requires `rustc` 1.64+][msrv]*
 //!
 //! [Prometheus]: https://prometheus.io
 //! [Jaeger]: https://www.jaegertracing.io
@@ -197,7 +197,7 @@
 //! ## Supported Rust Versions
 //!
 //! OpenTelemetry is built against the latest stable release. The minimum
-//! supported version is 1.60. The current OpenTelemetry version is not
+//! supported version is 1.64. The current OpenTelemetry version is not
 //! guaranteed to build on Rust versions earlier than the minimum supported
 //! version.
 //!

From b8b816c36e191cb0ba30d889bc882956a88612fa Mon Sep 17 00:00:00 2001
From: Shaun Cox <shaunco@microsoft.com>
Date: Fri, 11 Aug 2023 14:16:10 -0500
Subject: [PATCH 2/2] Update CHANGELOGs for MSRV bump

---
 opentelemetry-api/CHANGELOG.md                  | 6 ++++++
 opentelemetry-aws/CHANGELOG.md                  | 6 ++++++
 opentelemetry-contrib/CHANGELOG.md              | 7 +++++++
 opentelemetry-datadog/CHANGELOG.md              | 5 +++++
 opentelemetry-dynatrace/CHANGELOG.md            | 3 ++-
 opentelemetry-http/CHANGELOG.md                 | 7 +++++++
 opentelemetry-jaeger/CHANGELOG.md               | 6 ++++++
 opentelemetry-otlp/CHANGELOG.md                 | 9 +++++++--
 opentelemetry-prometheus/CHANGELOG.md           | 5 ++++-
 opentelemetry-proto/CHANGELOG.md                | 4 ++++
 opentelemetry-sdk/CHANGELOG.md                  | 3 +++
 opentelemetry-semantic-conventions/CHANGELOG.md | 7 +++++++
 opentelemetry-stackdriver/CHANGELOG.md          | 9 ++++++++-
 opentelemetry-zipkin/CHANGELOG.md               | 8 +++++++-
 opentelemetry-zpages/CHANGELOG.md               | 8 ++++++++
 opentelemetry/CHANGELOG.md                      | 6 ++++++
 16 files changed, 93 insertions(+), 6 deletions(-)

diff --git a/opentelemetry-api/CHANGELOG.md b/opentelemetry-api/CHANGELOG.md
index 32b0786d1a..a41824447c 100644
--- a/opentelemetry-api/CHANGELOG.md
+++ b/opentelemetry-api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## vNext
+
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
 ## v0.20.0
 
 ### Added
diff --git a/opentelemetry-aws/CHANGELOG.md b/opentelemetry-aws/CHANGELOG.md
index fcb8d3c53c..3413895e0f 100644
--- a/opentelemetry-aws/CHANGELOG.md
+++ b/opentelemetry-aws/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## vNext
+
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
 ## v0.8.0
 
 ### Changed
diff --git a/opentelemetry-contrib/CHANGELOG.md b/opentelemetry-contrib/CHANGELOG.md
index 0d773b9726..99afe6c908 100644
--- a/opentelemetry-contrib/CHANGELOG.md
+++ b/opentelemetry-contrib/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## vNext
+
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
 ## v0.12.0
 
 ### Added
@@ -11,6 +17,7 @@
 - update to opentelemetry-api v0.20.0
 
 ## v0.11.0
+
 ### Changed
 - Handle `parent_span_id` in jaeger JSON exporter [#907](https://github.com/open-telemetry/opentelemetry-rust/pull/907).
 - Bump MSRV to 1.57 [#953](https://github.com/open-telemetry/opentelemetry-rust/pull/953).
diff --git a/opentelemetry-datadog/CHANGELOG.md b/opentelemetry-datadog/CHANGELOG.md
index 5495344937..ac8f7a7b02 100644
--- a/opentelemetry-datadog/CHANGELOG.md
+++ b/opentelemetry-datadog/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## vNext
 
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
 ### Fixed
 
 - Do not set an empty span as the active span when the propagator does not find a remote span.
@@ -17,6 +21,7 @@
 - Fix the array encoding length of datadog version 05 exporter #1002
 
 ## v0.7.0
+  
 ### Added
 - [Breaking] Add support for unified tagging [#931](https://github.com/open-telemetry/opentelemetry-rust/pull/931).
 
diff --git a/opentelemetry-dynatrace/CHANGELOG.md b/opentelemetry-dynatrace/CHANGELOG.md
index 3fc93b71ac..12f2ce3977 100644
--- a/opentelemetry-dynatrace/CHANGELOG.md
+++ b/opentelemetry-dynatrace/CHANGELOG.md
@@ -1,10 +1,11 @@
 # Changelog
 
-## Unreleased
+## vNext
 
 ### Changed
 
 - Add deprecation note to Dynatrace exporter
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
 
 ## v0.3.0
 
diff --git a/opentelemetry-http/CHANGELOG.md b/opentelemetry-http/CHANGELOG.md
index 98999e46f8..11b9f4cbf9 100644
--- a/opentelemetry-http/CHANGELOG.md
+++ b/opentelemetry-http/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## vNext
+
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
 ## v0.9.0
 
 ### Changed
@@ -7,6 +13,7 @@
 - Update to opentelemetry-api v0.20.0
 
 ## v0.8.0
+
 ### Changed
 - Add response headers in response for `HttpClient` implementations [#918](https://github.com/open-telemetry/opentelemetry-rust/pull/918).
 - Bump MSRV to 1.57 [#953](https://github.com/open-telemetry/opentelemetry-rust/pull/953).
diff --git a/opentelemetry-jaeger/CHANGELOG.md b/opentelemetry-jaeger/CHANGELOG.md
index ff2d721ea2..62641a17a0 100644
--- a/opentelemetry-jaeger/CHANGELOG.md
+++ b/opentelemetry-jaeger/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## vNext
+
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
 ## v0.19.0
 
 ### Changed
diff --git a/opentelemetry-otlp/CHANGELOG.md b/opentelemetry-otlp/CHANGELOG.md
index 6441b2805e..1893baea14 100644
--- a/opentelemetry-otlp/CHANGELOG.md
+++ b/opentelemetry-otlp/CHANGELOG.md
@@ -2,13 +2,18 @@
 
 ## vNext
 
-## Added
+### Added
 
 - Add `build_{signal}_exporter` methods to client builders (#1187)
 
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
 ## v0.13.0
 
 ### Added
+
 - Add OTLP HTTP Metrics Exporter [#1020](https://github.com/open-telemetry/opentelemetry-rust/pull/1020).
 - Add tonic compression support [#1165](https://github.com/open-telemetry/opentelemetry-rust/pull/1165).
 
@@ -24,6 +29,7 @@
 ## v0.12.0
 
 ### Added
+
 - Add batch config for otlp pipeline [#979](https://github.com/open-telemetry/opentelemetry-rust/pull/979).
 - Add tonic interceptor [#901](https://github.com/open-telemetry/opentelemetry-rust/pull/901).
 
@@ -38,7 +44,6 @@
 - Fix the issue where tonic exporter builder ignored provided metadata [#937](https://github.com/open-telemetry/opentelemetry-rust/pull/937).
 - Export `MetricsExporterBuilder` [#943](https://github.com/open-telemetry/opentelemetry-rust/pull/943).
 - Report OTLP http export errors [#945](https://github.com/open-telemetry/opentelemetry-rust/pull/945).
-- Bump MSRV to 1.57 [#953](https://github.com/open-telemetry/opentelemetry-rust/pull/953).
 - Change to export using v0.19.0 protobuf definitions. [#989](https://github.com/open-telemetry/opentelemetry-rust/pull/989).
 - Update dependencies and bump MSRV to 1.60 [#969](https://github.com/open-telemetry/opentelemetry-rust/pull/969).
 
diff --git a/opentelemetry-prometheus/CHANGELOG.md b/opentelemetry-prometheus/CHANGELOG.md
index 30e6331eb4..c0f720138d 100644
--- a/opentelemetry-prometheus/CHANGELOG.md
+++ b/opentelemetry-prometheus/CHANGELOG.md
@@ -1,8 +1,11 @@
 # Changelog
 
-## Unreleased
+## vNext
+
 ### Changed
+
 - allow custom units in prometheus suffix [#1188](https://github.com/open-telemetry/opentelemetry-rust/pull/1188)
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
 
 ## v0.13.0
 
diff --git a/opentelemetry-proto/CHANGELOG.md b/opentelemetry-proto/CHANGELOG.md
index edfface37f..8dce815c5e 100644
--- a/opentelemetry-proto/CHANGELOG.md
+++ b/opentelemetry-proto/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - Implement tonic metrics proto transformations (#1184)
 
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
 ### Fixed
 
 - Rename `traces` feature to the more standard `trace` (#1183)
diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md
index 7bfb0a3e54..cd6d914d64 100644
--- a/opentelemetry-sdk/CHANGELOG.md
+++ b/opentelemetry-sdk/CHANGELOG.md
@@ -2,9 +2,12 @@
 
 ## vNext
 
+### Changed
+
 - Default Resource (the one used when no other Resource is explicitly provided) now includes `TelemetryResourceDetector`,
   populating "telemetry.sdk.*" attributes.
   [#1066](https://github.com/open-telemetry/opentelemetry-rust/pull/1193).
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
 
 ## v0.20.0
 
diff --git a/opentelemetry-semantic-conventions/CHANGELOG.md b/opentelemetry-semantic-conventions/CHANGELOG.md
index c718f935ad..50b1ff69cf 100644
--- a/opentelemetry-semantic-conventions/CHANGELOG.md
+++ b/opentelemetry-semantic-conventions/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## vNext
+
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
 ## v0.12.0
 
 ### Changed
@@ -8,6 +14,7 @@
 - Update to opentelemetry-api v0.20.0
 
 ## v0.11.0
+
 ### Changed
 - Update to `opentelemetry` v0.19.
 - Update to `opentelemetry_http` v0.8.
diff --git a/opentelemetry-stackdriver/CHANGELOG.md b/opentelemetry-stackdriver/CHANGELOG.md
index ca11bfc5d4..81f542a448 100644
--- a/opentelemetry-stackdriver/CHANGELOG.md
+++ b/opentelemetry-stackdriver/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
-## V0.17.0
+## vNext
+
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
+## v0.17.0
 
 ### Added
 
@@ -14,6 +20,7 @@
 - Update to opentelemetry v0.20.0
 
 ## v0.16.0
+
 ### Changed
 - Update to `opentelemetry` v0.19.
 - Update to `opentelemetry-semantic-conventions` v0.11.
diff --git a/opentelemetry-zipkin/CHANGELOG.md b/opentelemetry-zipkin/CHANGELOG.md
index 5fad98c725..7cdb3522a0 100644
--- a/opentelemetry-zipkin/CHANGELOG.md
+++ b/opentelemetry-zipkin/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## vNext
+
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
 ## v0.17.0
 
 ### Changed
@@ -7,6 +13,7 @@
 - Update to opentelemetry v0.20.0
 
 ## v0.17.0
+
 ## Changed
 - Update to `opentelemetry` v0.19.
 - Update to `opentelemetry-http` v0.8.
@@ -144,4 +151,3 @@
 ### Added
 
 - Exporter to Zipkin collector through HTTP API
-
diff --git a/opentelemetry-zpages/CHANGELOG.md b/opentelemetry-zpages/CHANGELOG.md
index 81f99b51e7..61b1b0df82 100644
--- a/opentelemetry-zpages/CHANGELOG.md
+++ b/opentelemetry-zpages/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## vNext
+
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
 ## v0.5.0
 
 ### Updates
@@ -7,6 +13,7 @@
 - Update to opentelemetry-api v0.20.0
 
 ## v0.4.0
+
 - Update to opentelemetry v0.19.0
 - Update to opentelemetry-proto v0.2.0
 - Bump MSRV to 1.57 [#953](https://github.com/open-telemetry/opentelemetry-rust/pull/953).
@@ -27,4 +34,5 @@
 ## v0.1.0
 
 ### Added
+
 - Add Tracez http endpoint.
diff --git a/opentelemetry/CHANGELOG.md b/opentelemetry/CHANGELOG.md
index 035ca52c2c..548f99df16 100644
--- a/opentelemetry/CHANGELOG.md
+++ b/opentelemetry/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## vNext
+
+### Changed
+
+- Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
+
 ## [v0.20.0](https://github.com/open-telemetry/opentelemetry-rust/compare/v0.19.0...v0.20.0)
 This release should been seen as 1.0-rc3 following 1.0-rc2 in v0.19.0. Refer to CHANGELOG.md in individual creates for details on changes made in different creates.