diff --git a/Cargo.lock b/Cargo.lock index 6f9e7ad005..ef51476208 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1820,8 +1820,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -3474,19 +3476,20 @@ dependencies = [ [[package]] name = "object_store" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce10a205d9f610ae3532943039c34c145930065ce0c4284134c897fe6073b1" +checksum = "0014545954c5023b5fb8260415e54467cde434db6c824c9028a4b329f1b28e48" dependencies = [ "async-trait", "base64", "bytes", "chrono", "futures", + "getrandom", "itertools", "parking_lot 0.12.1", "percent-encoding", - "quick-xml 0.25.0", + "quick-xml 0.26.0", "rand", "reqwest", "ring", @@ -4307,9 +4310,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e21a144a0ffb5fad7b464babcdab934a325ad69b7c0373bcfef5cbd9799ca9" +checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" dependencies = [ "memchr", "serde", diff --git a/clap_blocks/Cargo.toml b/clap_blocks/Cargo.toml index 7397a66235..0f97e01cdb 100644 --- a/clap_blocks/Cargo.toml +++ b/clap_blocks/Cargo.toml @@ -13,7 +13,7 @@ humantime = "2.1.0" iox_catalog = { path = "../iox_catalog" } iox_time = { path = "../iox_time" } metric = { path = "../metric" } -object_store = "0.5.1" +object_store = "0.5.2" observability_deps = { path = "../observability_deps" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.89" diff --git a/compactor/Cargo.toml b/compactor/Cargo.toml index 9dc96c07d2..bcf73c7cb8 100644 --- a/compactor/Cargo.toml +++ b/compactor/Cargo.toml @@ -18,7 +18,7 @@ iox_catalog = { path = "../iox_catalog" } iox_query = { path = "../iox_query" } iox_time = { path = "../iox_time" } metric = { path = "../metric" } -object_store = "0.5.1" +object_store = "0.5.2" observability_deps = { path = "../observability_deps" } parquet_file = { path = "../parquet_file" } predicate = { path = "../predicate" } diff --git a/garbage_collector/Cargo.toml b/garbage_collector/Cargo.toml index 83dea7d9be..b48450d740 100644 --- a/garbage_collector/Cargo.toml +++ b/garbage_collector/Cargo.toml @@ -13,7 +13,7 @@ data_types = { path = "../data_types" } futures = "0.3" humantime = "2.1.0" iox_catalog = { path = "../iox_catalog" } -object_store = { version = "0.5.1" } +object_store = { version = "0.5.2" } observability_deps = { path = "../observability_deps" } snafu = "0.7" tokio = { version = "1", features = ["macros", "rt", "sync"] } diff --git a/import/Cargo.toml b/import/Cargo.toml index cb46c89231..35788dd60a 100644 --- a/import/Cargo.toml +++ b/import/Cargo.toml @@ -13,7 +13,7 @@ futures = "0.3" generated_types = { path = "../generated_types" } influxdb_iox_client = { path = "../influxdb_iox_client" } iox_catalog = { path = "../iox_catalog" } -object_store = { version = "0.5.1", features = ["aws"] } +object_store = { version = "0.5.2", features = ["aws"] } observability_deps = { path = "../observability_deps" } schema = { path = "../schema" } serde = { version = "1.0", features = ["derive"] } diff --git a/influxdb_iox/Cargo.toml b/influxdb_iox/Cargo.toml index 0297067da6..ece35afb6e 100644 --- a/influxdb_iox/Cargo.toml +++ b/influxdb_iox/Cargo.toml @@ -27,7 +27,7 @@ ioxd_querier = { path = "../ioxd_querier"} ioxd_router = { path = "../ioxd_router"} ioxd_test = { path = "../ioxd_test"} metric = { path = "../metric" } -object_store = "0.5.1" +object_store = "0.5.2" object_store_metrics = { path = "../object_store_metrics" } observability_deps = { path = "../observability_deps" } panic_logging = { path = "../panic_logging" } diff --git a/ingester/Cargo.toml b/ingester/Cargo.toml index 93ac380322..855b0e424d 100644 --- a/ingester/Cargo.toml +++ b/ingester/Cargo.toml @@ -28,7 +28,7 @@ iox_time = { path = "../iox_time" } metric = { path = "../metric" } mutable_batch = { path = "../mutable_batch"} mutable_batch_lp = { path = "../mutable_batch_lp" } -object_store = "0.5.1" +object_store = "0.5.2" observability_deps = { path = "../observability_deps" } once_cell = "1" parking_lot = "0.12" diff --git a/ingester2/Cargo.toml b/ingester2/Cargo.toml index a9a7bc5a84..75abc46558 100644 --- a/ingester2/Cargo.toml +++ b/ingester2/Cargo.toml @@ -27,7 +27,7 @@ iox_time = { path = "../iox_time" } metric = { version = "0.1.0", path = "../metric" } mutable_batch = { version = "0.1.0", path = "../mutable_batch" } mutable_batch_pb = { version = "0.1.0", path = "../mutable_batch_pb" } -object_store = "0.5.1" +object_store = "0.5.2" observability_deps = { version = "0.1.0", path = "../observability_deps" } once_cell = "1.16.0" parking_lot = "0.12.1" diff --git a/iox_query/Cargo.toml b/iox_query/Cargo.toml index e1d33d3c7c..02890d55b8 100644 --- a/iox_query/Cargo.toml +++ b/iox_query/Cargo.toml @@ -27,7 +27,7 @@ futures = "0.3" hashbrown = { workspace = true } influxdb_influxql_parser = { path = "../influxdb_influxql_parser" } itertools = "0.10.5" -object_store = "0.5.1" +object_store = "0.5.2" observability_deps = { path = "../observability_deps" } parking_lot = "0.12" parquet_file = { path = "../parquet_file" } diff --git a/iox_tests/Cargo.toml b/iox_tests/Cargo.toml index dc6c8be4de..60f756e75f 100644 --- a/iox_tests/Cargo.toml +++ b/iox_tests/Cargo.toml @@ -16,7 +16,7 @@ iox_catalog = { path = "../iox_catalog" } iox_time = { path = "../iox_time" } metric = { path = "../metric" } mutable_batch_lp = { path = "../mutable_batch_lp" } -object_store = "0.5.1" +object_store = "0.5.2" observability_deps = { path = "../observability_deps" } once_cell = { version = "1.16.0", features = ["parking_lot"] } parquet_file = { path = "../parquet_file" } diff --git a/ioxd_compactor/Cargo.toml b/ioxd_compactor/Cargo.toml index 4560e79cf9..f2abd62257 100644 --- a/ioxd_compactor/Cargo.toml +++ b/ioxd_compactor/Cargo.toml @@ -15,7 +15,7 @@ iox_catalog = { path = "../iox_catalog" } ioxd_common = { path = "../ioxd_common" } metric = { path = "../metric" } iox_query = { path = "../iox_query" } -object_store = "0.5.1" +object_store = "0.5.2" iox_time = { path = "../iox_time" } trace = { path = "../trace" } diff --git a/ioxd_ingester/Cargo.toml b/ioxd_ingester/Cargo.toml index 7c614e369e..f8c8e595f4 100644 --- a/ioxd_ingester/Cargo.toml +++ b/ioxd_ingester/Cargo.toml @@ -13,7 +13,7 @@ ingester = { path = "../ingester" } iox_catalog = { path = "../iox_catalog" } ioxd_common = { path = "../ioxd_common" } metric = { path = "../metric" } -object_store = "0.5.1" +object_store = "0.5.2" iox_query = { path = "../iox_query" } trace = { path = "../trace" } write_buffer = { path = "../write_buffer" } diff --git a/ioxd_querier/Cargo.toml b/ioxd_querier/Cargo.toml index 24d424df17..17c60fff2a 100644 --- a/ioxd_querier/Cargo.toml +++ b/ioxd_querier/Cargo.toml @@ -13,7 +13,7 @@ generated_types = { path = "../generated_types" } iox_catalog = { path = "../iox_catalog" } ioxd_common = { path = "../ioxd_common" } metric = { path = "../metric" } -object_store = "0.5.1" +object_store = "0.5.2" querier = { path = "../querier" } iox_query = { path = "../iox_query" } router = { path = "../router" } diff --git a/ioxd_router/Cargo.toml b/ioxd_router/Cargo.toml index f0d2e3ade7..caafb5a15f 100644 --- a/ioxd_router/Cargo.toml +++ b/ioxd_router/Cargo.toml @@ -13,7 +13,7 @@ iox_catalog = { path = "../iox_catalog" } ioxd_common = { path = "../ioxd_common" } metric = { path = "../metric" } mutable_batch = { path = "../mutable_batch" } -object_store = "0.5.1" +object_store = "0.5.2" observability_deps = { path = "../observability_deps" } router = { path = "../router" } sharder = { path = "../sharder" } diff --git a/object_store_metrics/Cargo.toml b/object_store_metrics/Cargo.toml index 9f80e84f8a..1c195d7d71 100644 --- a/object_store_metrics/Cargo.toml +++ b/object_store_metrics/Cargo.toml @@ -11,7 +11,7 @@ bytes = "1.3" futures = "0.3" iox_time = { version = "0.1.0", path = "../iox_time" } metric = { version = "0.1.0", path = "../metric" } -object_store = "0.5.1" +object_store = "0.5.2" pin-project = "1.0.12" tokio = { version = "1.22", features = ["io-util"] } workspace-hack = { path = "../workspace-hack" } diff --git a/parquet_file/Cargo.toml b/parquet_file/Cargo.toml index 46f398c0df..d70b4a0962 100644 --- a/parquet_file/Cargo.toml +++ b/parquet_file/Cargo.toml @@ -15,7 +15,7 @@ datafusion_util = { path = "../datafusion_util" } futures = "0.3" generated_types = { path = "../generated_types" } iox_time = { path = "../iox_time" } -object_store = "0.5.1" +object_store = "0.5.2" observability_deps = { path = "../observability_deps" } parking_lot = "0.12" parquet = { workspace = true, features = ["experimental"]} diff --git a/parquet_to_line_protocol/Cargo.toml b/parquet_to_line_protocol/Cargo.toml index 7531aa87e7..966184c8bb 100644 --- a/parquet_to_line_protocol/Cargo.toml +++ b/parquet_to_line_protocol/Cargo.toml @@ -10,7 +10,7 @@ datafusion = { workspace = true } influxdb_line_protocol = { path = "../influxdb_line_protocol" } futures = {version = "0.3"} num_cpus = "1.13.1" -object_store = { version = "0.5.1" } +object_store = { version = "0.5.2" } parquet_file = { path = "../parquet_file" } schema = { path = "../schema" } tokio = "1.22" diff --git a/querier/Cargo.toml b/querier/Cargo.toml index c1bf517e3a..aec1f178d8 100644 --- a/querier/Cargo.toml +++ b/querier/Cargo.toml @@ -22,7 +22,7 @@ iox_catalog = { path = "../iox_catalog" } iox_query = { path = "../iox_query" } iox_time = { path = "../iox_time" } metric = { path = "../metric" } -object_store = "0.5.1" +object_store = "0.5.2" observability_deps = { path = "../observability_deps" } parking_lot = "0.12" parquet_file = { path = "../parquet_file" } diff --git a/router/Cargo.toml b/router/Cargo.toml index 9922c86973..a1b00c6576 100644 --- a/router/Cargo.toml +++ b/router/Cargo.toml @@ -22,7 +22,7 @@ metric = { path = "../metric" } mutable_batch = { path = "../mutable_batch" } mutable_batch_lp = { path = "../mutable_batch_lp" } mutable_batch_pb = { version = "0.1.0", path = "../mutable_batch_pb" } -object_store = "0.5.1" +object_store = "0.5.2" observability_deps = { path = "../observability_deps" } parking_lot = "0.12" predicate = { path = "../predicate" } diff --git a/service_grpc_object_store/Cargo.toml b/service_grpc_object_store/Cargo.toml index 39ae32b248..660f30681a 100644 --- a/service_grpc_object_store/Cargo.toml +++ b/service_grpc_object_store/Cargo.toml @@ -10,7 +10,7 @@ data_types = { path = "../data_types" } futures = "0.3" generated_types = { path = "../generated_types" } iox_catalog = { path = "../iox_catalog" } -object_store = "0.5.1" +object_store = "0.5.2" observability_deps = { path = "../observability_deps" } parquet_file = { path = "../parquet_file" } tokio = { version = "1", features = ["rt-multi-thread", "macros"] } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index c0c07b534c..057447362a 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -37,7 +37,7 @@ futures-io = { version = "0.3", features = ["std"] } futures-sink = { version = "0.3", features = ["alloc", "std"] } futures-task = { version = "0.3", default-features = false, features = ["alloc", "std"] } futures-util = { version = "0.3", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "sink", "slab", "std"] } -getrandom = { version = "0.2", default-features = false, features = ["std"] } +getrandom = { version = "0.2", default-features = false, features = ["js", "js-sys", "std", "wasm-bindgen"] } hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12", features = ["ahash", "inline-more", "raw"] } hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13", features = ["ahash", "inline-more", "raw"] } indexmap = { version = "1", default-features = false, features = ["std"] } @@ -49,7 +49,7 @@ memchr = { version = "2", features = ["std"] } nom = { version = "7", features = ["alloc", "std"] } num-integer = { version = "0.1", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2", features = ["i128", "libm", "std"] } -object_store = { version = "0.5", default-features = false, features = ["aws", "azure", "base64", "cloud", "gcp", "quick-xml", "rand", "reqwest", "ring", "rustls-pemfile", "serde", "serde_json"] } +object_store = { version = "0.5", default-features = false, features = ["aws", "azure", "base64", "cloud", "gcp", "getrandom", "quick-xml", "rand", "reqwest", "ring", "rustls-pemfile", "serde", "serde_json"] } once_cell = { version = "1", features = ["alloc", "parking_lot", "parking_lot_core", "race", "std"] } parking_lot = { version = "0.12", features = ["arc_lock"] } parquet = { version = "28", features = ["arrow", "arrow-array", "arrow-buffer", "arrow-cast", "arrow-data", "arrow-ipc", "arrow-schema", "arrow-select", "async", "base64", "brotli", "experimental", "flate2", "futures", "lz4", "snap", "tokio", "zstd"] } @@ -103,7 +103,7 @@ futures-io = { version = "0.3", features = ["std"] } futures-sink = { version = "0.3", features = ["alloc", "std"] } futures-task = { version = "0.3", default-features = false, features = ["alloc", "std"] } futures-util = { version = "0.3", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "sink", "slab", "std"] } -getrandom = { version = "0.2", default-features = false, features = ["std"] } +getrandom = { version = "0.2", default-features = false, features = ["js", "js-sys", "std", "wasm-bindgen"] } hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12", features = ["ahash", "inline-more", "raw"] } heck = { version = "0.4", features = ["unicode", "unicode-segmentation"] } indexmap = { version = "1", default-features = false, features = ["std"] }