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

chore(deps): bump metrics, metrics-tracing-context, metrics-util #17336

Merged
merged 3 commits into from
May 8, 2023
Merged

chore(deps): bump metrics, metrics-tracing-context, metrics-util #17336

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad20fea
chore(deps): bump metrics-util from 0.14.0 to 0.15.0
dependabot[bot] May 8, 2023
0dda4d9
+upgrade metrics and all the subcrates
spencergilbert May 8, 2023
6f42344
+use metrics::atomics
spencergilbert May 8, 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
62 changes: 22 additions & 40 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.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features =
tracing-tower = { git = "https://github.com/tokio-rs/tracing", default-features = false, rev = "e0642d949891546a3bb7e47080365ee7274f05cd" }

# Metrics
metrics = "0.20.1"
metrics-tracing-context = { version = "0.12.0", default-features = false }
metrics = "0.21.0"
metrics-tracing-context = { version = "0.14.0", default-features = false }

# AWS - Official SDK
aws-sdk-s3 = { version = "0.21.0", default-features = false, features = ["native-tls"], optional = true }
Expand Down
6 changes: 3 additions & 3 deletions lib/vector-buffers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ crossbeam-utils = { version = "0.8.15", default-features = false }
fslock = { version = "0.2.1", default-features = false, features = ["std"] }
futures = { version = "0.3.28", default-features = false, features = ["std"] }
memmap2 = { version = "0.5.10", default-features = false }
metrics = "0.20.1"
metrics = "0.21.0"
num-traits = { version = "0.2.15", default-features = false }
pin-project = { version = "1.0.12", default-features = false }
rkyv = { version = "0.7.40", default-features = false, features = ["size_32", "std", "strict", "validation"] }
Expand All @@ -36,8 +36,8 @@ clap = "4.1.14"
criterion = { version = "0.4", features = ["html_reports", "async_tokio"] }
crossbeam-queue = "0.3.8"
hdrhistogram = "7.5.2"
metrics-tracing-context = { version = "0.12.0", default-features = false }
metrics-util = { version = "0.14.0", default-features = false, features = ["debugging"] }
metrics-tracing-context = { version = "0.14.0", default-features = false }
metrics-util = { version = "0.15.0", default-features = false, features = ["debugging"] }
once_cell = "1.17"
proptest = "1.1"
quickcheck = "1.0"
Expand Down
3 changes: 2 additions & 1 deletion lib/vector-buffers/benches/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ use std::{error, fmt, path::PathBuf};

use bytes::{Buf, BufMut};
use metrics_tracing_context::{MetricsLayer, TracingContextLayer};
use metrics_util::{debugging::DebuggingRecorder, layers::Layer};
use metrics_util::debugging::DebuggingRecorder;
use metrics_util::layers::Layer;
use tracing::Span;
use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt;
use vector_buffers::{
Expand Down
2 changes: 1 addition & 1 deletion lib/vector-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ crossbeam-utils = { version = "0.8.15", default-features = false }
derivative = "2.1.3"
futures = { version = "0.3.28", default-features = false, features = ["std"] }
indexmap = { version = "~1.9.3", default-features = false }
metrics = "0.20.1"
metrics = "0.21.0"
nom = { version = "7", optional = true }
ordered-float = { version = "3.7.0", default-features = false }
paste = "1.0.12"
Expand Down
6 changes: 3 additions & 3 deletions lib/vector-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ http = { version = "0.2.9", default-features = false }
hyper-proxy = { version = "0.9.1", default-features = false, features = ["openssl-tls"] }
indexmap = { version = "~1.9.3", default-features = false, features = ["serde"] }
lookup = { package = "vector-lookup", path = "../vector-lookup" }
metrics = "0.20.1"
metrics-tracing-context = { version = "0.12.0", default-features = false }
metrics-util = { version = "0.14.0", default-features = false, features = ["registry"] }
metrics = "0.21.0"
metrics-tracing-context = { version = "0.14.0", default-features = false }
metrics-util = { version = "0.15.0", default-features = false, features = ["registry"] }
mlua = { version = "0.8.8", default-features = false, features = ["lua54", "send", "vendored"], optional = true }
no-proxy = { version = "0.3.2", default-features = false, features = ["serialize"] }
once_cell = { version = "1.17", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions lib/vector-core/src/metrics/label_filter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use metrics::Label;
use metrics::{KeyName, Label};
use metrics_tracing_context::LabelFilter;

#[derive(Debug, Clone)]
pub(crate) struct VectorLabelFilter;

impl LabelFilter for VectorLabelFilter {
fn should_include_label(&self, label: &Label) -> bool {
fn should_include_label(&self, _key: &KeyName, label: &Label) -> bool {
let key = label.key();
Copy link
Member

Choose a reason for hiding this comment

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

Should this be using the key that is passed in now? If it is available on Label it does seem odd that they added it to the signature here 🤔

Copy link
Contributor

@spencergilbert spencergilbert May 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

I opted to follow what the existing impls in the crate updated to: https://github.com/metrics-rs/metrics/blob/main/metrics-tracing-context/src/label_filter.rs#L43-L47

PR introducing change: metrics-rs/metrics#342 (comment)

Copy link
Member

Choose a reason for hiding this comment

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

Ah, nvm, the KeyName here appears to be the metric name. Maybe we could call it _metric_name to make that clearer?

key == "component_id"
|| key == "component_type"
Expand Down