Skip to content

Commit 6046f8d

Browse files
author
Sander van de Geijn
authored
Merge branch 'vectordotdev:master' into mkfrey
2 parents 762a726 + 995a5b5 commit 6046f8d

10 files changed

Lines changed: 35 additions & 45 deletions

File tree

‎Cargo.lock‎

Lines changed: 19 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ toml = { version = "0.9.4", default-features = false, features = ["serde", "disp
188188
tonic = { version = "0.11", default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] }
189189
tonic-build = { version = "0.11", default-features = false, features = ["transport", "prost"] }
190190
tracing = { version = "0.1.34", default-features = false }
191+
tracing-subscriber = { version = "0.3.20", default-features = false, features = ["fmt"] }
191192
uuid = { version = "1.17.0", features = ["v4", "v7", "serde"] }
192193
vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl"] }
193194
vector-config = { path = "lib/vector-config" }
@@ -236,7 +237,7 @@ console-subscriber = { version = "0.4.1", default-features = false, optional = t
236237
tracing.workspace = true
237238
tracing-core = { version = "0.1.26", default-features = false }
238239
tracing-futures = { version = "0.2.5", default-features = false, features = ["futures-03"] }
239-
tracing-subscriber = { version = "0.3.19", default-features = false, features = ["ansi", "env-filter", "fmt", "json", "registry", "tracing-log"] }
240+
tracing-subscriber = { workspace = true, features = ["ansi", "env-filter", "fmt", "json", "registry", "tracing-log"] }
240241
tracing-tower = { git = "https://github.com/tokio-rs/tracing", default-features = false, rev = "e0642d949891546a3bb7e47080365ee7274f05cd" }
241242

242243
# Metrics

‎LICENSE-3rdparty.csv‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,6 @@ openssl-probe,https://github.com/alexcrichton/openssl-probe,MIT OR Apache-2.0,Al
458458
openssl-sys,https://github.com/sfackler/rust-openssl,MIT,"Alex Crichton <alex@alexcrichton.com>, Steven Fackler <sfackler@gmail.com>"
459459
ordered-float,https://github.com/reem/rust-ordered-float,MIT,"Jonathan Reem <jonathan.reem@gmail.com>, Matt Brubeck <mbrubeck@limpet.net>"
460460
outref,https://github.com/Nugine/outref,MIT,The outref Authors
461-
overload,https://github.com/danaugrs/overload,MIT,Daniel Salvadori <danaugrs@gmail.com>
462461
owo-colors,https://github.com/owo-colors/owo-colors,MIT,jam1garner <8260240+jam1garner@users.noreply.github.com>
463462
p256,https://github.com/RustCrypto/elliptic-curves/tree/master/p256,Apache-2.0 OR MIT,RustCrypto Developers
464463
p384,https://github.com/RustCrypto/elliptic-curves/tree/master/p384,Apache-2.0 OR MIT,"RustCrypto Developers, Frank Denis <github@pureftpd.org>"
@@ -536,11 +535,9 @@ redox_syscall,https://gitlab.redox-os.org/redox-os/syscall,MIT,Jeremy Soller <ja
536535
redox_users,https://gitlab.redox-os.org/redox-os/users,MIT,"Jose Narvaez <goyox86@gmail.com>, Wesley Hershberger <mggmugginsmc@gmail.com>"
537536
ref-cast,https://github.com/dtolnay/ref-cast,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
538537
regex,https://github.com/rust-lang/regex,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
539-
regex-automata,https://github.com/BurntSushi/regex-automata,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
540538
regex-automata,https://github.com/rust-lang/regex/tree/master/regex-automata,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
541539
regex-filtered,https://github.com/ua-parser/uap-rust,BSD-3-Clause,The regex-filtered Authors
542540
regex-lite,https://github.com/rust-lang/regex/tree/master/regex-lite,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
543-
regex-syntax,https://github.com/rust-lang/regex,MIT OR Apache-2.0,The Rust Project Developers
544541
regex-syntax,https://github.com/rust-lang/regex/tree/master/regex-syntax,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
545542
rend,https://github.com/djkoloski/rend,MIT,David Koloski <djkoloski@gmail.com>
546543
reqwest,https://github.com/seanmonstar/reqwest,MIT OR Apache-2.0,Sean McArthur <sean@seanmonstar.com>

‎lib/tracing-limit/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ license = "MPL-2.0"
88

99
[dependencies]
1010
tracing-core = { version = "0.1", default-features = false }
11-
tracing-subscriber = { version = "0.3", default-features = false, features = ["registry", "std"] }
11+
tracing-subscriber = { workspace = true, features = ["registry", "std"] }
1212
dashmap = { version = "6.1.0", default-features = false }
1313

1414
[dev-dependencies]
1515
criterion = "0.7"
1616
tracing = "0.1.34"
1717
mock_instant = { version = "0.6" }
18-
tracing-subscriber = { version = "0.3.19", default-features = false, features = ["env-filter", "fmt"] }
18+
tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
1919

2020
[[bench]]
2121
name = "limit"

‎lib/vector-buffers/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ serde_yaml.workspace = true
4949
temp-dir = "0.1.16"
5050
tokio-test = "0.4.4"
5151
tracing-fluent-assertions = { version = "0.3" }
52-
tracing-subscriber = { version = "0.3.19", default-features = false, features = ["env-filter", "fmt", "registry", "std", "ansi"] }
52+
tracing-subscriber = { workspace = true, features = ["env-filter", "fmt", "registry", "std", "ansi"] }
5353

5454
[[bench]]
5555
name = "sized_records"

‎lib/vector-core/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ noisy_float = "0.2.0"
9292
rand.workspace = true
9393
rand_distr.workspace = true
9494
serde_yaml = { version = "0.9.34", default-features = false }
95-
tracing-subscriber = { version = "0.3.19", default-features = false, features = ["env-filter", "fmt", "ansi", "registry"] }
95+
tracing-subscriber = { workspace = true, features = ["env-filter", "fmt", "ansi", "registry"] }
9696
vector-common = { path = "../vector-common", default-features = false, features = ["test"] }
9797

9898
[features]

‎lib/vector-vrl/tests/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ clap.workspace = true
1616
glob.workspace = true
1717
serde.workspace = true
1818
serde_json.workspace = true
19-
tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] }
19+
tracing-subscriber = { workspace = true, features = ["fmt"] }
2020

2121
[target.'cfg(not(target_env = "msvc"))'.dependencies]
2222
tikv-jemallocator = { version = "0.6.0" }

‎scripts/check-one-feature‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ then
5555
else
5656
exit=$?
5757
cat $log
58+
echo "Error: Failed to run $0 $feature"
5859
fi
5960

6061
exit $exit

‎src/sources/util/http_client.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
//! - Call call() supplying the generic inputs for calling and the source-specific
99
//! context.
1010
11+
// Okta source only imports defaults but doesn't use the rest of the client
12+
#![cfg_attr(feature = "sources-okta", allow(dead_code))]
13+
1114
use bytes::Bytes;
1215
use futures_util::{FutureExt, StreamExt, TryFutureExt, stream};
1316
use http::{Uri, response::Parts};

‎src/sources/util/mod.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ pub mod grpc;
1414
feature = "sources-utils-http-query"
1515
))]
1616
pub mod http;
17-
#[cfg(any(feature = "sources-http_client", feature = "sources-prometheus-scrape",))]
17+
#[cfg(any(
18+
feature = "sources-http_client",
19+
feature = "sources-prometheus-scrape",
20+
feature = "sources-okta"
21+
))]
1822
pub mod http_client;
1923
#[cfg(any(
2024
feature = "sources-aws_sqs",

0 commit comments

Comments
 (0)