Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(jaeger, otlp, stackdriver): update dependencies #1

Merged
merged 2 commits into from
Feb 21, 2023
Merged

chore(jaeger, otlp, stackdriver): update dependencies #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94d8d38
chore(otlp, stackdriver): add msrv in stackdriver. Update OTLP depend…
TommyCpp Feb 21, 2023
36bf54d
chore(jaeger): update jaeger's dependencies
TommyCpp Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions opentelemetry-jaeger/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"] }
Expand Down
6 changes: 4 additions & 2 deletions opentelemetry-jaeger/src/exporter/collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
Loading