diff --git a/Cargo.lock b/Cargo.lock index 4f99786f77..dff803ce08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1675,7 +1675,7 @@ dependencies = [ "object-store", "partition", "paste", - "prometheus", + "prometheus 0.13.4", "promql-parser", "rand 0.9.1", "serde", @@ -2061,7 +2061,7 @@ dependencies = [ "lazy_static", "moka", "parking_lot 0.12.4", - "prometheus", + "prometheus 0.13.4", "prost 0.14.1", "query", "rand 0.9.1", @@ -2161,7 +2161,7 @@ dependencies = [ "parquet", "plugins", "pprof", - "prometheus", + "prometheus 0.13.4", "prost 0.14.1", "query", "rand 0.9.1", @@ -2221,7 +2221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -2620,7 +2620,7 @@ dependencies = [ "lazy_static", "moka", "object-store", - "prometheus", + "prometheus 0.13.4", "prost 0.14.1", "prost-types 0.14.1", "rand 0.9.1", @@ -2776,7 +2776,7 @@ dependencies = [ "parking_lot 0.12.4", "paste", "pin-project", - "prometheus", + "prometheus 0.13.4", "ratelimit", "serde", "serde_json", @@ -2827,7 +2827,7 @@ dependencies = [ "lazy_static", "nix 0.30.1", "num_cpus", - "prometheus", + "prometheus 0.13.4", "sysinfo", "tokio", ] @@ -2850,7 +2850,7 @@ dependencies = [ "opentelemetry-semantic-conventions", "opentelemetry_sdk 0.30.0", "parking_lot 0.12.4", - "prometheus", + "prometheus 0.13.4", "serde", "serde_json", "tokio", @@ -4319,7 +4319,7 @@ dependencies = [ "num_cpus", "object-store", "partition", - "prometheus", + "prometheus 0.13.4", "prost 0.14.1", "query", "reqwest", @@ -5204,7 +5204,7 @@ dependencies = [ "operator", "partition", "pretty_assertions", - "prometheus", + "prometheus 0.13.4", "prost 0.14.1", "query", "rand 0.9.1", @@ -5332,7 +5332,7 @@ dependencies = [ "otel-arrow-rust", "partition", "pipeline", - "prometheus", + "prometheus 0.13.4", "promql-parser", "prost 0.14.1", "query", @@ -6326,7 +6326,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.61.2", + "windows-core 0.57.0", ] [[package]] @@ -7323,7 +7323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -7479,8 +7479,8 @@ dependencies = [ "lazy_static", "object-store", "pin-project", - "prometheus", - "protobuf", + "prometheus 0.13.4", + "protobuf 2.28.0", "protobuf-build", "raft-engine", "rand 0.9.1", @@ -7836,7 +7836,7 @@ dependencies = [ "ordered-float 4.6.0", "parking_lot 0.12.4", "partition", - "prometheus", + "prometheus 0.13.4", "prost 0.14.1", "rand 0.9.1", "regex", @@ -7918,7 +7918,7 @@ dependencies = [ "moka", "mur3", "object-store", - "prometheus", + "prometheus 0.13.4", "serde", "serde_json", "smallvec", @@ -8060,7 +8060,7 @@ dependencies = [ "partition", "paste", "pin-project", - "prometheus", + "prometheus 0.13.4", "prost 0.14.1", "puffin", "rand 0.9.1", @@ -8764,7 +8764,7 @@ dependencies = [ "lazy_static", "moka", "opendal", - "prometheus", + "prometheus 0.13.4", "reqwest", "serde", "snafu 0.8.6", @@ -8885,9 +8885,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "opendal" -version = "0.54.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb9838d0575c6dbaf3fcec7255af8d5771996d4af900bbb6fa9a314dec00a1a" +checksum = "42afda58fa2cf50914402d132cc1caacff116a85d10c72ab2082bb7c50021754" dependencies = [ "anyhow", "backon", @@ -8902,8 +8902,8 @@ dependencies = [ "log", "md-5", "percent-encoding", - "prometheus", - "quick-xml 0.37.5", + "prometheus 0.14.0", + "quick-xml 0.38.4", "reqsign", "reqwest", "serde", @@ -9126,7 +9126,7 @@ dependencies = [ "object_store_opendal", "partition", "path-slash", - "prometheus", + "prometheus 0.13.4", "prost 0.14.1", "prost-types 0.14.1", "query", @@ -9821,7 +9821,7 @@ dependencies = [ "operator", "ordered-float 4.6.0", "paste", - "prometheus", + "prometheus 0.13.4", "query", "rayon", "regex", @@ -10039,7 +10039,7 @@ dependencies = [ "prost 0.12.6", "prost-build 0.12.6", "prost-derive 0.12.6", - "protobuf", + "protobuf 2.28.0", "sha2", "smallvec", "symbolic-demangle", @@ -10192,7 +10192,19 @@ dependencies = [ "bitflags 2.9.1", "hex", "lazy_static", - "procfs-core", + "procfs-core 0.16.0", + "rustix 0.38.44", +] + +[[package]] +name = "procfs" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f" +dependencies = [ + "bitflags 2.9.1", + "hex", + "procfs-core 0.17.0", "rustix 0.38.44", ] @@ -10206,6 +10218,16 @@ dependencies = [ "hex", ] +[[package]] +name = "procfs-core" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec" +dependencies = [ + "bitflags 2.9.1", + "hex", +] + [[package]] name = "prometheus" version = "0.13.4" @@ -10218,11 +10240,28 @@ dependencies = [ "libc", "memchr", "parking_lot 0.12.4", - "procfs", - "protobuf", + "procfs 0.16.0", + "protobuf 2.28.0", "thiserror 1.0.69", ] +[[package]] +name = "prometheus" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a" +dependencies = [ + "cfg-if", + "fnv", + "lazy_static", + "libc", + "memchr", + "parking_lot 0.12.4", + "procfs 0.17.0", + "protobuf 3.7.2", + "thiserror 2.0.17", +] + [[package]] name = "prometheus-static-metric" version = "0.5.1" @@ -10253,7 +10292,7 @@ dependencies = [ "futures", "greptime-proto", "lazy_static", - "prometheus", + "prometheus 0.13.4", "prost 0.14.1", "snafu 0.8.6", "tokio", @@ -10499,6 +10538,17 @@ dependencies = [ "bytes", ] +[[package]] +name = "protobuf" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4" +dependencies = [ + "once_cell", + "protobuf-support", + "thiserror 1.0.69", +] + [[package]] name = "protobuf-build" version = "0.15.1" @@ -10506,7 +10556,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c852d9625b912c3e50480cdc701f60f49890b5d7ad46198dd583600f15e7c6ec" dependencies = [ "bitflags 1.3.2", - "protobuf", + "protobuf 2.28.0", "protobuf-codegen", "protobuf-src", "regex", @@ -10518,7 +10568,7 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6" dependencies = [ - "protobuf", + "protobuf 2.28.0", ] [[package]] @@ -10530,6 +10580,15 @@ dependencies = [ "autotools", ] +[[package]] +name = "protobuf-support" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6" +dependencies = [ + "thiserror 1.0.69", +] + [[package]] name = "psl" version = "2.1.123" @@ -10606,7 +10665,7 @@ dependencies = [ "lz4_flex", "moka", "pin-project", - "prometheus", + "prometheus 0.13.4", "serde", "serde_json", "sha2", @@ -10702,7 +10761,7 @@ dependencies = [ "partition", "paste", "pretty_assertions", - "prometheus", + "prometheus 0.13.4", "promql", "promql-parser", "prost 0.14.1", @@ -10742,6 +10801,16 @@ dependencies = [ "serde", ] +[[package]] +name = "quick-xml" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "quinn" version = "0.11.8" @@ -10852,9 +10921,9 @@ dependencies = [ "num-derive", "num-traits", "parking_lot 0.12.4", - "prometheus", + "prometheus 0.13.4", "prometheus-static-metric", - "protobuf", + "protobuf 2.28.0", "rayon", "scopeguard", "serde", @@ -11177,9 +11246,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.21" +version = "0.12.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8cea6b35bcceb099f30173754403d2eba0a5dc18cea3630fccd88251909288" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" dependencies = [ "base64 0.22.1", "bytes", @@ -12190,7 +12259,7 @@ dependencies = [ "pipeline", "postgres-types", "pprof", - "prometheus", + "prometheus 0.13.4", "promql-parser", "prost 0.14.1", "query", @@ -12985,7 +13054,7 @@ dependencies = [ "itertools 0.14.0", "lazy_static", "num_enum 0.7.4", - "prometheus", + "prometheus 0.13.4", "prost 0.14.1", "serde", "serde_json", @@ -13944,7 +14013,7 @@ checksum = "a8092b7a97ed5dac2f44892db190eca8f476ede0fa585bc87664de4151cd0b64" dependencies = [ "lazy_static", "parking_lot 0.12.4", - "prometheus", + "prometheus 0.13.4", "tokio", "tokio-metrics", ] @@ -15210,7 +15279,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] diff --git a/src/cli/src/data/export.rs b/src/cli/src/data/export.rs index d274c3e0df..a5e6ee82eb 100644 --- a/src/cli/src/data/export.rs +++ b/src/cli/src/data/export.rs @@ -641,6 +641,8 @@ mod tests { use super::*; + const MOCK_AZBLOB_ACCOUNT_KEY_B64: &str = "dGVzdC1rZXk="; + // ==================== Basic Success Cases ==================== #[tokio::test] @@ -770,7 +772,7 @@ mod tests { "--azblob-account-name", "test-account", "--azblob-account-key", - "test-key", + MOCK_AZBLOB_ACCOUNT_KEY_B64, "--azblob-endpoint", "https://account.blob.core.windows.net", ]); @@ -794,7 +796,7 @@ mod tests { "--azblob-account-name", "test-account", "--azblob-account-key", - "test-key", + MOCK_AZBLOB_ACCOUNT_KEY_B64, "--azblob-endpoint", "https://account.blob.core.windows.net", "--azblob-sas-token", @@ -1093,7 +1095,7 @@ mod tests { "--azblob-account-name", "", // Empty account name "--azblob-account-key", - "test-key", + MOCK_AZBLOB_ACCOUNT_KEY_B64, "--azblob-endpoint", "https://account.blob.core.windows.net", ]); @@ -1239,7 +1241,7 @@ mod tests { "--azblob-account-name", "test-account", "--azblob-account-key", - "test-key", + MOCK_AZBLOB_ACCOUNT_KEY_B64, "--azblob-endpoint", "https://account.blob.core.windows.net", // No sas_token