Skip to content

Bump pprof to 0.14 #287

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

Open
hareshkh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump pprof to 0.14 #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 35 additions & 22 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ cfg-if = "1.0"
smallvec = "1.7"

inferno = { version = "0.11", default-features = false, features = ["nameattr"], optional = true }
prost = { version = "0.12", optional = true }
prost-derive = { version = "0.12", optional = true }
prost = { version = "0.14.1", optional = true }
prost-derive = { version = "0.14.1", optional = true }
protobuf = { version = ">=3.7.2", optional = true }
criterion = {version = "0.5", optional = true}
aligned-vec = "0.6"
Expand All @@ -61,7 +61,7 @@ criterion = "0.5"
rand = "0.8.0"

[build-dependencies]
prost-build = { version = "0.12", optional = true }
prost-build = { version = "0.14.1", optional = true }
sha2 = { version = "0.10", optional = true }
protobuf-codegen = { version = "3.7.2", optional = true }

Expand Down
19 changes: 6 additions & 13 deletions proto/perftools.profiles.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// f9f855b960d01b292a3c2642e263e6156d52631e78e0177fe51416ed5bbecc81 proto/profile.proto

#[allow(clippy::derive_partial_eq_without_eq)]
// This file is @generated by prost-build.
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Profile {
/// A description of the samples associated with each Sample.value.
Expand Down Expand Up @@ -66,8 +66,7 @@ pub struct Profile {
pub default_sample_type: i64,
}
/// ValueType describes the semantics and measurement units of a value.
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
pub struct ValueType {
/// Rename it from type to ty to avoid using keyword in Rust.
///
Expand All @@ -82,7 +81,6 @@ pub struct ValueType {
/// context. The program context is typically a stack trace, perhaps
/// augmented with auxiliary information like the thread-id, some
/// indicator of a higher level request being handled etc.
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Sample {
/// The ids recorded here correspond to a Profile.location.id.
Expand All @@ -102,8 +100,7 @@ pub struct Sample {
#[prost(message, repeated, tag = "3")]
pub label: ::prost::alloc::vec::Vec<Label>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
pub struct Label {
/// Index into string table
#[prost(int64, tag = "1")]
Expand All @@ -127,8 +124,7 @@ pub struct Label {
#[prost(int64, tag = "4")]
pub num_unit: i64,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
pub struct Mapping {
/// Unique nonzero id for the mapping.
#[prost(uint64, tag = "1")]
Expand Down Expand Up @@ -167,7 +163,6 @@ pub struct Mapping {
pub has_inline_frames: bool,
}
/// Describes function and line table debug information.
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Location {
/// Unique nonzero id for the location. A profile could use
Expand Down Expand Up @@ -203,8 +198,7 @@ pub struct Location {
#[prost(bool, tag = "5")]
pub is_folded: bool,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
pub struct Line {
/// The id of the corresponding profile.Function for this line.
#[prost(uint64, tag = "1")]
Expand All @@ -213,8 +207,7 @@ pub struct Line {
#[prost(int64, tag = "2")]
pub line: i64,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
pub struct Function {
/// Unique nonzero id for the function.
#[prost(uint64, tag = "1")]
Expand Down
2 changes: 1 addition & 1 deletion src/report.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ mod protobuf {
..Default::default()
};
let profile = protos::Profile {
sample_type: vec![samples_value, time_value.clone()].into(),
sample_type: vec![samples_value, time_value].into(),
sample: samples.into(),
string_table: str_tbl.into(),
function: fn_tbl.into(),
Expand Down