Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
393 changes: 133 additions & 260 deletions Cargo.lock

Large diffs are not rendered by default.

20 changes: 6 additions & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ prost-types = { version = "0.12", default-features = false }
rand = { version = "0.9.2", default-features = false, features = ["small_rng", "thread_rng"] }
rand_distr = { version = "0.5.1", default-features = false }
regex = { version = "1.11.2", default-features = false, features = ["std", "perf"] }
reqwest = { version = "0.11.26", features = ["json"] }
reqwest = { version = "0.11", features = ["json"] }
rust_decimal = { version = "1.37.0", default-features = false, features = ["std"] }
semver = { version = "1.0.26", default-features = false, features = ["serde", "std"] }
serde = { version = "1.0.219", default-features = false, features = ["alloc", "derive", "rc"] }
Expand Down Expand Up @@ -211,6 +211,8 @@ serial_test = { version = "3.2" }

[dependencies]
cfg-if.workspace = true
reqwest.workspace = true
reqwest_12 = { package = "reqwest", version = "0.12", features = ["json"] }
clap.workspace = true
clap_complete.workspace = true
dashmap.workspace = true
Expand Down Expand Up @@ -291,16 +293,10 @@ aws-smithy-runtime-api = { version = "1.7.3", default-features = false, optional
aws-smithy-types = { version = "1.2.11", default-features = false, features = ["rt-tokio"], optional = true }

# Azure
azure_core = { version = "0.25", default-features = false, features = ["reqwest", "hmac_openssl"], optional = true }
azure_identity = { version = "0.25", default-features = false, features = ["reqwest"], optional = true }
azure_core = { version = "0.30", features = ["reqwest", "hmac_openssl"], optional = true }

# Azure Storage
azure_storage = { version = "0.21", default-features = false, optional = true }
azure_storage_blobs = { version = "0.21", default-features = false, optional = true }

# Needed to bridge with outdated version of azure_core used in azure_storage*
azure_core_for_storage = { package = "azure_core", version = "0.21.0", default-features = false, features = ["enable_reqwest", "hmac_openssl"] }

azure_storage_blob = { version = "0.7", optional = true }

# OpenDAL
opendal = { version = "0.54", default-features = false, features = ["services-webhdfs"], optional = true }
Expand Down Expand Up @@ -468,10 +464,6 @@ openssl-src = { version = "300", default-features = false, features = ["force-en
approx = "0.5.1"
assert_cmd = { version = "2.0.17", default-features = false }
aws-smithy-runtime = { version = "1.8.3", default-features = false, features = ["tls-rustls"] }
azure_core = { version = "0.25", default-features = false, features = ["reqwest", "hmac_openssl", "azurite_workaround"] }
azure_identity = { version = "0.25", default-features = false, features = ["reqwest"] }
azure_storage = { version = "0.21", default-features = false, features = ["enable_reqwest", "hmac_openssl"] }
azure_storage_blobs = { version = "0.21", default-features = false, features = ["enable_reqwest", "hmac_openssl", "azurite_workaround"] }
base64 = "0.22.1"
criterion = { version = "0.7.0", features = ["html_reports", "async_tokio"] }
itertools.workspace = true
Expand Down Expand Up @@ -857,7 +849,7 @@ sinks-aws_s3 = ["dep:base64", "dep:md-5", "aws-core", "dep:aws-sdk-s3"]
sinks-aws_sqs = ["aws-core", "dep:aws-sdk-sqs"]
sinks-aws_sns = ["aws-core", "dep:aws-sdk-sns"]
sinks-axiom = ["sinks-http"]
sinks-azure_blob = ["dep:azure_core", "dep:azure_identity", "dep:azure_storage", "dep:azure_storage_blobs"]
sinks-azure_blob = ["dep:azure_core", "dep:azure_storage_blob"]
sinks-azure_monitor_logs = []
sinks-blackhole = []
sinks-chronicle = []
Expand Down
14 changes: 4 additions & 10 deletions LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Component,Origin,License,Copyright
Inflector,https://github.com/whatisinternet/inflector,BSD-2-Clause,Josh Teeter<[email protected]>
RustyXML,https://github.com/Florob/RustyXML,MIT OR Apache-2.0,Florian Zeitz <[email protected]>
addr2line,https://github.com/gimli-rs/addr2line,Apache-2.0 OR MIT,The addr2line Authors
adler2,https://github.com/oyvindln/adler2,0BSD OR MIT OR Apache-2.0,"Jonas Schievink <[email protected]>, oyvindln <[email protected]>"
adler32,https://github.com/remram44/adler32-rs,Zlib,Remi Rampin <[email protected]>
Expand Down Expand Up @@ -104,11 +103,8 @@ aws-types,https://github.com/smithy-lang/smithy-rs,Apache-2.0,"AWS Rust SDK Team
axum,https://github.com/tokio-rs/axum,MIT,The axum Authors
axum-core,https://github.com/tokio-rs/axum,MIT,The axum-core Authors
azure_core,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft
azure_core,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft Corp.
azure_identity,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft
azure_storage,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft Corp.
azure_storage_blobs,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft Corp.
azure_svc_blobstorage,https://github.com/azure/azure-sdk-for-rust,MIT,The azure_svc_blobstorage Authors
azure_core_macros,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft
azure_storage_blob,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft
backoff,https://github.com/ihrwein/backoff,MIT OR Apache-2.0,Tibor Benke <[email protected]>
backon,https://github.com/Xuanwo/backon,Apache-2.0,The backon Authors
backtrace,https://github.com/rust-lang/backtrace-rs,MIT OR Apache-2.0,The Rust Project Developers
Expand Down Expand Up @@ -358,7 +354,6 @@ http-body,https://github.com/hyperium/http-body,MIT,"Carl Lerche <me@carllerche.
http-body-util,https://github.com/hyperium/http-body,MIT,"Carl Lerche <[email protected]>, Lucio Franco <[email protected]>, Sean McArthur <[email protected]>"
http-range-header,https://github.com/MarcusGrass/parse-range-headers,MIT,The http-range-header Authors
http-serde,https://gitlab.com/kornelski/http-serde,Apache-2.0 OR MIT,Kornel <[email protected]>
http-types,https://github.com/http-rs/http-types,MIT OR Apache-2.0,Yoshua Wuyts <[email protected]>
httparse,https://github.com/seanmonstar/httparse,MIT OR Apache-2.0,Sean McArthur <[email protected]>
httpdate,https://github.com/pyfisch/httpdate,MIT OR Apache-2.0,Pyfisch <[email protected]>
humantime,https://github.com/chronotope/humantime,MIT OR Apache-2.0,The humantime Authors
Expand Down Expand Up @@ -389,7 +384,6 @@ idna_adapter,https://github.com/hsivonen/idna_adapter,Apache-2.0 OR MIT,The rust
indexmap,https://github.com/bluss/indexmap,Apache-2.0 OR MIT,The indexmap Authors
indexmap,https://github.com/indexmap-rs/indexmap,Apache-2.0 OR MIT,The indexmap Authors
indoc,https://github.com/dtolnay/indoc,MIT OR Apache-2.0,David Tolnay <[email protected]>
infer,https://github.com/bojand/infer,MIT,Bojan <[email protected]>
influxdb-line-protocol,https://github.com/influxdata/influxdb_iox/tree/main/influxdb_line_protocol,MIT OR Apache-2.0,InfluxDB IOx Project Developers
inotify,https://github.com/hannobraun/inotify,ISC,"Hanno Braun <[email protected]>, Félix Saparelli <[email protected]>, Cristian Kubis <[email protected]>, Frank Denis <[email protected]>"
inotify-sys,https://github.com/hannobraun/inotify-sys,ISC,Hanno Braun <[email protected]>
Expand All @@ -404,6 +398,7 @@ ipconfig,https://github.com/liranringel/ipconfig,MIT OR Apache-2.0,Liran Ringel
ipcrypt-rs,https://github.com/jedisct1/rust-ipcrypt2,ISC,Frank Denis <[email protected]>
ipnet,https://github.com/krisprice/ipnet,MIT OR Apache-2.0,Kris Price <[email protected]>
ipnetwork,https://github.com/achanda/ipnetwork,MIT OR Apache-2.0,"Abhishek Chanda <[email protected]>, Linus Färnstrand <[email protected]>"
iri-string,https://github.com/lo48576/iri-string,MIT OR Apache-2.0,YOSHIOKA Takuma <[email protected]>
is-terminal,https://github.com/sunfishcode/is-terminal,MIT,"softprops <[email protected]>, Dan Gohman <[email protected]>"
is_ci,https://github.com/zkat/is_ci,ISC,Kat Marchán <[email protected]>
itertools,https://github.com/rust-itertools/itertools,MIT OR Apache-2.0,bluss
Expand Down Expand Up @@ -623,7 +618,6 @@ rand,https://github.com/rust-random/rand,MIT OR Apache-2.0,"The Rand Project Dev
rand_chacha,https://github.com/rust-random/rand,MIT OR Apache-2.0,"The Rand Project Developers, The Rust Project Developers, The CryptoCorrosion Contributors"
rand_core,https://github.com/rust-random/rand,MIT OR Apache-2.0,"The Rand Project Developers, The Rust Project Developers"
rand_distr,https://github.com/rust-random/rand_distr,MIT OR Apache-2.0,The Rand Project Developers
rand_hc,https://github.com/rust-random/rand,MIT OR Apache-2.0,The Rand Project Developers
rand_xorshift,https://github.com/rust-random/rngs,MIT OR Apache-2.0,"The Rand Project Developers, The Rust Project Developers"
ratatui,https://github.com/ratatui/ratatui,MIT,"Florian Dehau <[email protected]>, The Ratatui Developers"
ratatui-core,https://github.com/ratatui/ratatui,MIT,"Florian Dehau <[email protected]>, The Ratatui Developers"
Expand Down Expand Up @@ -705,7 +699,6 @@ serde_json,https://github.com/serde-rs/json,MIT OR Apache-2.0,"Erick Tryzelaar <
serde_nanos,https://github.com/caspervonb/serde_nanos,MIT OR Apache-2.0,Casper Beyer <[email protected]>
serde_path_to_error,https://github.com/dtolnay/path-to-error,MIT OR Apache-2.0,David Tolnay <[email protected]>
serde_plain,https://github.com/mitsuhiko/serde-plain,MIT OR Apache-2.0,Armin Ronacher <[email protected]>
serde_qs,https://github.com/samscott89/serde_qs,MIT OR Apache-2.0,Sam Scott <[email protected]>
serde_repr,https://github.com/dtolnay/serde-repr,MIT OR Apache-2.0,David Tolnay <[email protected]>
serde_spanned,https://github.com/toml-rs/toml,MIT OR Apache-2.0,The serde_spanned Authors
serde_urlencoded,https://github.com/nox/serde_urlencoded,MIT OR Apache-2.0,Anthony Ramine <[email protected]>
Expand Down Expand Up @@ -881,6 +874,7 @@ wasm-timer,https://github.com/tomaka/wasm-timer,MIT,Pierre Krieger <pierre.krieg
web-sys,https://github.com/rustwasm/wasm-bindgen/tree/master/crates/web-sys,MIT OR Apache-2.0,The wasm-bindgen Developers
web-time,https://github.com/daxpedda/web-time,MIT OR Apache-2.0,The web-time Authors
webbrowser,https://github.com/amodm/webbrowser-rs,MIT OR Apache-2.0,Amod Malviya @amodm
webpki-roots,https://github.com/rustls/webpki-roots,CDLA-Permissive-2.0,The webpki-roots Authors
webpki-roots,https://github.com/rustls/webpki-roots,MPL-2.0,The webpki-roots Authors
whoami,https://github.com/ardaku/whoami,Apache-2.0 OR BSL-1.0 OR MIT,The whoami Authors
widestring,https://github.com/starkat99/widestring-rs,MIT OR Apache-2.0,Kathryn Long <[email protected]>
Expand Down
1 change: 1 addition & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ allow = [
"BSD-3-Clause",
"BSL-1.0",
"CC0-1.0",
"CDLA-Permissive-2.0",
"ISC",
"MIT",
"MIT-0",
Expand Down
35 changes: 35 additions & 0 deletions licenses/CDLA-Permissive-2.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
Community Data License Agreement - Permissive - Version 2.0

This is the Community Data License Agreement - Permissive, Version 2.0 (the "agreement"). Data Provider(s) and Data Recipient(s) agree as follows:

1. Provision of the Data

1.1. A Data Recipient may use, modify, and share the Data made available by Data Provider(s) under this agreement if that Data Recipient follows the terms of this agreement.

1.2. This agreement does not impose any restriction on a Data Recipient's use, modification, or sharing of any portions of the Data that are in the public domain or that may be used, modified, or shared under any other legal exception or limitation.

2. Conditions for Sharing Data

2.1. A Data Recipient may share Data, with or without modifications, so long as the Data Recipient makes available the text of this agreement with the shared Data.

3. No Restrictions on Results

3.1. This agreement does not impose any restriction or obligations with respect to the use, modification, or sharing of Results.

4. No Warranty; Limitation of Liability

4.1. All Data Recipients receive the Data subject to the following terms:

THE DATA IS PROVIDED ON AN "AS IS" BASIS, WITHOUT REPRESENTATIONS, WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.

NO DATA PROVIDER SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE DATA OR RESULTS, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

5. Definitions

5.1. "Data" means the material received by a Data Recipient under this agreement.

5.2. "Data Provider" means any person who is the source of Data provided under this agreement and in reliance on a Data Recipient's agreement to its terms.

5.3. "Data Recipient" means any person who receives Data directly or indirectly from a Data Provider and agrees to the terms of this agreement.

5.4. "Results" means any outcome obtained by computational analysis of Data, including for example machine learning models and models' insights.
4 changes: 2 additions & 2 deletions src/sinks/azure_blob/config.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::sync::Arc;

use azure_storage_blobs::prelude::*;
use azure_storage_blob::BlobContainerClient;
use tower::ServiceBuilder;
use vector_lib::{
codecs::{JsonSerializerConfig, NewlineDelimitedEncoderConfig, encoding::Framer},
Expand Down Expand Up @@ -193,7 +193,7 @@ const DEFAULT_FILENAME_TIME_FORMAT: &str = "%s";
const DEFAULT_FILENAME_APPEND_UUID: bool = true;

impl AzureBlobSinkConfig {
pub fn build_processor(&self, client: Arc<ContainerClient>) -> crate::Result<VectorSink> {
pub fn build_processor(&self, client: Arc<BlobContainerClient>) -> crate::Result<VectorSink> {
let request_limits = self.request.into_settings();
let service = ServiceBuilder::new()
.settings(request_limits, AzureBlobRetryLogic)
Expand Down
Loading
Loading