Update some dependencies (open-telemetry#969)

* Update some dependencies * chore(otlp, stackdriver): add msrv in stackdriver. Update OTLP dependencies. * chore(jaeger): update jaeger's dependencies * chore: bump MSRV to 1.60. (#2) Tonic 0.8 requires MSRV > 1.60 --------- Co-authored-by: Zhongyang Wu <[email protected]>
TommyCpp · Mar 9, 2023 · af21bea · af21bea
1 parent 6500d04
commit af21bea
Show file tree

Hide file tree

Showing 33 changed files with 195 additions and 120 deletions.
diff --git 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.57
+        toolchain: 1.60.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
@@ -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.57+][msrv]*
+*Compiler support: [requires `rustc` 1.60+][msrv]*
 
 [Prometheus]: https://prometheus.io
 [Jaeger]: https://www.jaegertracing.io
@@ -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.57. The current OpenTelemetry version is not guaranteed to build
+version is 1.60. 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
@@ -7,7 +7,7 @@ repository = "https://github.com/open-telemetry/opentelemetry-rust"
 readme = "README.md"
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.57"
+rust-version = "1.60"
 
 [dependencies]
 fnv = { version = "1.0", optional = true }
@@ -24,9 +24,6 @@ urlencoding = "2.1.2"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-js-sys = "0.3"
-
 [features]
 default = ["trace"]
 trace = ["pin-project-lite"]

diff --git a/opentelemetry-api/README.md b/opentelemetry-api/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.57+][msrv]*
+*Compiler support: [requires `rustc` 1.60+][msrv]*
 
 [Prometheus]: https://prometheus.io
 [Jaeger]: https://www.jaegertracing.io

diff --git 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.57+][msrv]*
+//! *Compiler support: [requires `rustc` 1.60+][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.57. The current OpenTelemetry version is not
+//! supported version is 1.60. The current OpenTelemetry version is not
 //! guaranteed to build on Rust versions earlier than the minimum supported
 //! version.
 //!

diff --git 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.57"
+rust-version = "1.60"
 
 [package.metadata.docs.rs]
 all-features = true

diff --git 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.57"
+rust-version = "1.60"
 
 [package.metadata.docs.rs]
 all-features = true

diff --git 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.57"
+rust-version = "1.60"
 
 [package.metadata.docs.rs]
 all-features = true

diff --git 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.57"
+rust-version = "1.60"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -50,7 +50,7 @@ wasm = [
 
 [dependencies]
 async-std = { version = "= 1.10.0", features = ["unstable"], optional = true }
-base64 = { version = "0.13", optional = true }
+base64 = { version = "0.21", optional = true }
 futures = "0.3"
 futures-util = { version = "0.3", optional = true }
 getrandom = { version = "0.2", optional = true }

diff --git 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.57"
+rust-version = "1.60"
 
 [dependencies]
 async-trait = "0.1"

diff --git a/opentelemetry-http/README.md b/opentelemetry-http/README.md
@@ -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.57+][msrv]*
+*Compiler support: [requires `rustc` 1.60+][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.57. The current OpenTelemetry version is not guaranteed to build
+version is 1.60. 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
@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "jaeger", "tracing", "async"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.57"
+rust-version = "1.60"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -22,7 +22,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 async-std = { version = "1.10.0", optional = true }
 async-trait = "0.1"
-base64 = { version = "0.13", optional = true }
+base64 = { version = "0.21.0", optional = true }
 futures = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["std"], optional = true }
 futures-executor = "0.3"
@@ -40,14 +40,14 @@ pin-project-lite = { version = "0.2", optional = true }
 reqwest = { version = "0.11", default-features = false, optional = true }
 surf = { version = "2.0", optional = true }
 thiserror = "1.0"
-thrift = "0.16"
+thrift = "0.17.0"
 tokio = { version = "1.0", features = ["net", "sync"], optional = true }
 wasm-bindgen = { version = "0.2", optional = true }
 wasm-bindgen-futures = { version = "0.4.18", optional = true }
 
-tonic = { version = "0.6.2", optional = true }
-prost = { version = "0.9.0", optional = true }
-prost-types = { version = "0.9.0", optional = true }
+tonic = { version = "0.8.3", optional = true }
+prost = { version = "0.11.6", optional = true }
+prost-types = { version = "0.11.6", optional = true }
 
 [dev-dependencies]
 tokio = { version = "1.0", features = ["net", "sync"] }

diff --git a/opentelemetry-jaeger/README.md b/opentelemetry-jaeger/README.md
@@ -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.57+][msrv]*
+*Compiler support: [requires `rustc` 1.60+][msrv]*
 
 [`Jaeger`]: https://www.jaegertracing.io/
 [`OpenTelemetry`]: https://crates.io/crates/opentelemetry

diff --git a/opentelemetry-jaeger/src/exporter/collector.rs b/opentelemetry-jaeger/src/exporter/collector.rs
@@ -74,6 +74,8 @@ mod collector_client {
 #[cfg(feature = "wasm_collector_client")]
 mod wasm_collector_client {
     use crate::exporter::thrift::jaeger;
+    use base64::engine::general_purpose;
+    use base64::Engine;
     use futures_util::future;
     use http::Uri;
     use js_sys::Uint8Array;
@@ -109,9 +111,9 @@ mod wasm_collector_client {
         ) -> thrift::Result<Self> {
             let auth = if let (Some(username), Some(password)) = (username, password) {
                 let mut auth = String::from("Basic ");
-                base64::encode_config_buf(username, base64::STANDARD, &mut auth);
+                general_purpose::STANDARD.encode_string(username, &mut auth);
                 auth.push(':');
-                base64::encode_config_buf(password, base64::STANDARD, &mut auth);
+                general_purpose::STANDARD.encode_string(password, &mut auth);
                 Some(auth)
             } else {
                 None

diff --git a/opentelemetry-jaeger/src/lib.rs b/opentelemetry-jaeger/src/lib.rs
@@ -3,7 +3,7 @@
 //!
 //! See the [Jaeger Docs] for details about Jaeger and deployment information.
 //!
-//! *Compiler support: [requires `rustc` 1.57+][msrv]*
+//! *Compiler support: [requires `rustc` 1.60+][msrv]*
 //!
 //! [Jaeger Docs]: https://www.jaegertracing.io/docs/
 //! [msrv]: #supported-rust-versions
@@ -279,13 +279,13 @@
 //! # Supported Rust Versions
 //!
 //! OpenTelemetry is built against the latest stable release. The minimum
-//! supported version is 1.57. The current OpenTelemetry version is not
+//! supported version is 1.60. 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.57, the minimum supported version will not be
+//! compiler version is 1.60, 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.