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

fix ci #1960

Merged
merged 3 commits into from
Jul 23, 2024
Merged

fix ci #1960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09d9418
fix ci
lalitb Jul 23, 2024
9cd042a
update version
lalitb Jul 23, 2024
b201384
Merge branch 'main' into fix-ci-2
lalitb Jul 23, 2024
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ temp-env = "0.3.6"
thiserror = { version = "1", default-features = false }
tonic = { version = "0.12", default-features = false }
tonic-build = "0.12"
tokio = { version = "1", default-features = false }
tokio = { version = "~1.38.0", default-features = false } #1.39 needs msrv bump to rustc 1.70
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trying to avoid being aggressive in msrv bump from 1.65 to 1.70, so pinning tokio version < 1.39. tracing is still on 1.63 so good to be close to it. Unless there are other thoughts :)

tokio-stream = "0.1.1"
tracing = { version = "0.1", default-features = false }
tracing-core = { version = "0.1", default-features = false }
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-sdk/src/trace/sampler/jaeger_remote/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
mod rate_limit;
#[allow(dead_code)]
Copy link
Member Author

@lalitb lalitb Jul 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like new beta rust toolchain (1.81.x) is more strict towards unused code. Also since failing file remote.rs is generated from proto file so not modifying it. Instead making whole generated file to allow dead-code.

mod remote;
mod sampler;
mod sampling_strategy;
Expand Down
Loading