Skip to content

Commit 9a723e3

Browse files
chore(deps): bump metrics, metrics-tracing-context, metrics-util (#17336)
Co-authored-by: Spencer Gilbert <[email protected]>
1 parent bf8376c commit 9a723e3

File tree

9 files changed

+39
-56
lines changed

9 files changed

+39
-56
lines changed

Cargo.lock

+22-40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features =
154154
tracing-tower = { git = "https://github.com/tokio-rs/tracing", default-features = false, rev = "e0642d949891546a3bb7e47080365ee7274f05cd" }
155155

156156
# Metrics
157-
metrics = "0.20.1"
158-
metrics-tracing-context = { version = "0.12.0", default-features = false }
157+
metrics = "0.21.0"
158+
metrics-tracing-context = { version = "0.14.0", default-features = false }
159159

160160
# AWS - Official SDK
161161
aws-sdk-s3 = { version = "0.21.0", default-features = false, features = ["native-tls"], optional = true }

lib/vector-buffers/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ crossbeam-utils = { version = "0.8.15", default-features = false }
1717
fslock = { version = "0.2.1", default-features = false, features = ["std"] }
1818
futures = { version = "0.3.28", default-features = false, features = ["std"] }
1919
memmap2 = { version = "0.5.10", default-features = false }
20-
metrics = "0.20.1"
20+
metrics = "0.21.0"
2121
num-traits = { version = "0.2.15", default-features = false }
2222
pin-project = { version = "1.0.12", default-features = false }
2323
rkyv = { version = "0.7.40", default-features = false, features = ["size_32", "std", "strict", "validation"] }
@@ -36,8 +36,8 @@ clap = "4.1.14"
3636
criterion = { version = "0.4", features = ["html_reports", "async_tokio"] }
3737
crossbeam-queue = "0.3.8"
3838
hdrhistogram = "7.5.2"
39-
metrics-tracing-context = { version = "0.12.0", default-features = false }
40-
metrics-util = { version = "0.14.0", default-features = false, features = ["debugging"] }
39+
metrics-tracing-context = { version = "0.14.0", default-features = false }
40+
metrics-util = { version = "0.15.0", default-features = false, features = ["debugging"] }
4141
once_cell = "1.17"
4242
proptest = "1.1"
4343
quickcheck = "1.0"

lib/vector-buffers/benches/common.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ use std::{error, fmt, path::PathBuf};
22

33
use bytes::{Buf, BufMut};
44
use metrics_tracing_context::{MetricsLayer, TracingContextLayer};
5-
use metrics_util::{debugging::DebuggingRecorder, layers::Layer};
5+
use metrics_util::debugging::DebuggingRecorder;
6+
use metrics_util::layers::Layer;
67
use tracing::Span;
78
use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt;
89
use vector_buffers::{

lib/vector-common/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ crossbeam-utils = { version = "0.8.15", default-features = false }
4949
derivative = "2.1.3"
5050
futures = { version = "0.3.28", default-features = false, features = ["std"] }
5151
indexmap = { version = "~1.9.3", default-features = false }
52-
metrics = "0.20.1"
52+
metrics = "0.21.0"
5353
nom = { version = "7", optional = true }
5454
ordered-float = { version = "3.7.0", default-features = false }
5555
paste = "1.0.12"

lib/vector-core/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ http = { version = "0.2.9", default-features = false }
2424
hyper-proxy = { version = "0.9.1", default-features = false, features = ["openssl-tls"] }
2525
indexmap = { version = "~1.9.3", default-features = false, features = ["serde"] }
2626
lookup = { package = "vector-lookup", path = "../vector-lookup" }
27-
metrics = "0.20.1"
28-
metrics-tracing-context = { version = "0.12.0", default-features = false }
29-
metrics-util = { version = "0.14.0", default-features = false, features = ["registry"] }
27+
metrics = "0.21.0"
28+
metrics-tracing-context = { version = "0.14.0", default-features = false }
29+
metrics-util = { version = "0.15.0", default-features = false, features = ["registry"] }
3030
mlua = { version = "0.8.8", default-features = false, features = ["lua54", "send", "vendored"], optional = true }
3131
no-proxy = { version = "0.3.2", default-features = false, features = ["serialize"] }
3232
once_cell = { version = "1.17", default-features = false }

lib/vector-core/src/metrics/label_filter.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
use metrics::Label;
1+
use metrics::{KeyName, Label};
22
use metrics_tracing_context::LabelFilter;
33

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

77
impl LabelFilter for VectorLabelFilter {
8-
fn should_include_label(&self, label: &Label) -> bool {
8+
fn should_include_label(&self, _key: &KeyName, label: &Label) -> bool {
99
let key = label.key();
1010
key == "component_id"
1111
|| key == "component_type"

lib/vector-core/src/metrics/recency.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@
4848
//! not, and thus whether it should actually be deleted.
4949
5050
use std::collections::HashMap;
51-
use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
51+
use std::sync::atomic::{AtomicUsize, Ordering};
5252
use std::sync::Arc;
5353
use std::time::Duration;
5454

55-
use metrics::{Counter, CounterFn, Gauge, GaugeFn, HistogramFn};
55+
use metrics::{atomics::AtomicU64, Counter, CounterFn, Gauge, GaugeFn, HistogramFn};
5656
use metrics_util::{
5757
registry::{Registry, Storage},
5858
Hashable, MetricKind, MetricKindMask,

lib/vector-core/src/metrics/storage.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use std::sync::{
2-
atomic::{AtomicU32, AtomicU64, Ordering},
2+
atomic::{AtomicU32, Ordering},
33
Arc,
44
};
55

6-
use metrics::{GaugeFn, HistogramFn};
6+
use metrics::{atomics::AtomicU64, GaugeFn, HistogramFn};
77
use metrics_util::registry::Storage;
88

99
use crate::event::{metric::Bucket, MetricValue};

0 commit comments

Comments
 (0)