From 0a86b1e11e3621e79b02a17fcda6bdd21285f368 Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Thu, 21 Aug 2025 09:37:17 +0200 Subject: [PATCH 01/11] Update Arroy v0.6.2 The new version of arroy contains a search optimization when there is few input candidates compared to the number of documents in the database --- Cargo.lock | 4 ++-- crates/milli/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 33c15f42f..396a7c41e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -444,9 +444,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arroy" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08e6111f351d004bd13e95ab540721272136fd3218b39d3ec95a2ea1c4e6a0a6" +checksum = "733ce4c7a5250d770985c56466fac41238ffdaec0502bee64a4289e300164c5e" dependencies = [ "bytemuck", "byteorder", diff --git a/crates/milli/Cargo.toml b/crates/milli/Cargo.toml index 28da78835..68e894ca9 100644 --- a/crates/milli/Cargo.toml +++ b/crates/milli/Cargo.toml @@ -87,7 +87,7 @@ rhai = { version = "1.22.2", features = [ "no_time", "sync", ] } -arroy = "0.6.1" +arroy = "0.6.2" rand = "0.8.5" tracing = "0.1.41" ureq = { version = "2.12.1", features = ["json"] } From 938ef77ee5993a65907713f588d6eb226b025d06 Mon Sep 17 00:00:00 2001 From: arithmeticmean Date: Sat, 23 Aug 2025 19:30:26 +0530 Subject: [PATCH 02/11] Fix scheduled CI failure Disabled default features on the meilisearch dependency in one crate to prevent lindera from being pulled in during the scheduled CI build --- crates/openapi-generator/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/openapi-generator/Cargo.toml b/crates/openapi-generator/Cargo.toml index 652f6fc57..03a410fe5 100644 --- a/crates/openapi-generator/Cargo.toml +++ b/crates/openapi-generator/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies] -meilisearch = { path = "../meilisearch" } +meilisearch = { path = "../meilisearch" , default-features = false} serde_json = "1.0" clap = { version = "4.5.40", features = ["derive"] } anyhow = "1.0.98" From 79d3d1606c812591e955ae3d09cf0c89ca103f5f Mon Sep 17 00:00:00 2001 From: Shree Date: Mon, 25 Aug 2025 23:33:26 -0700 Subject: [PATCH 03/11] Display the progressTrace in real time #5835 --- crates/index-scheduler/src/queue/batches.rs | 8 ++++++++ crates/index-scheduler/src/queue/batches_test.rs | 9 +++++++++ crates/meilisearch/tests/vector/rest.rs | 2 ++ 3 files changed, 19 insertions(+) diff --git a/crates/index-scheduler/src/queue/batches.rs b/crates/index-scheduler/src/queue/batches.rs index b96f65836..2045258df 100644 --- a/crates/index-scheduler/src/queue/batches.rs +++ b/crates/index-scheduler/src/queue/batches.rs @@ -284,6 +284,14 @@ impl BatchQueue { if Some(batch_id) == processing.batch.as_ref().map(|batch| batch.uid) { let mut batch = processing.batch.as_ref().unwrap().to_batch(); batch.progress = processing.get_progress_view(); + // Add progress_trace from the current progress state + if let Some(progress) = &processing.progress { + batch.stats.progress_trace = progress + .accumulated_durations() + .into_iter() + .map(|(k, v)| (k, v.into())) + .collect(); + } Ok(batch) } else { self.get_batch(rtxn, batch_id) diff --git a/crates/index-scheduler/src/queue/batches_test.rs b/crates/index-scheduler/src/queue/batches_test.rs index 49dc0ba61..bbcdc4296 100644 --- a/crates/index-scheduler/src/queue/batches_test.rs +++ b/crates/index-scheduler/src/queue/batches_test.rs @@ -104,6 +104,12 @@ fn query_batches_simple() { batches[0].started_at = OffsetDateTime::UNIX_EPOCH; assert!(batches[0].enqueued_at.is_some()); batches[0].enqueued_at = None; + + if !batches[0].stats.progress_trace.is_empty() { + batches[0].stats.progress_trace.clear(); + batches[0].stats.progress_trace.insert("processing tasks".to_string(), "deterministic_duration".into()); + } + // Insta cannot snapshot our batches because the batch stats contains an enum as key: https://github.com/mitsuhiko/insta/issues/689 let batch = serde_json::to_string_pretty(&batches[0]).unwrap(); snapshot!(batch, @r###" @@ -122,6 +128,9 @@ fn query_batches_simple() { }, "indexUids": { "catto": 1 + }, + "progressTrace": { + "processing tasks": "deterministic_duration" } }, "startedAt": "1970-01-01T00:00:00Z", diff --git a/crates/meilisearch/tests/vector/rest.rs b/crates/meilisearch/tests/vector/rest.rs index 7668dbcc3..3b1222795 100644 --- a/crates/meilisearch/tests/vector/rest.rs +++ b/crates/meilisearch/tests/vector/rest.rs @@ -2184,6 +2184,7 @@ async fn last_error_stats() { ".progress" => "[ignored]", ".stats.embedderRequests.total" => "[ignored]", ".stats.embedderRequests.failed" => "[ignored]", + ".stats.progressTrace" => "[ignored]", ".startedAt" => "[ignored]" }), @r#" { @@ -2204,6 +2205,7 @@ async fn last_error_stats() { "indexUids": { "doggo": 1 }, + "progressTrace": "[ignored]", "embedderRequests": { "total": "[ignored]", "failed": "[ignored]", From b68431367f582aaca6e65fc4fe42bddede3f431e Mon Sep 17 00:00:00 2001 From: Shree Date: Mon, 25 Aug 2025 23:47:24 -0700 Subject: [PATCH 04/11] run cargo fmt --- crates/index-scheduler/src/queue/batches_test.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/index-scheduler/src/queue/batches_test.rs b/crates/index-scheduler/src/queue/batches_test.rs index bbcdc4296..ca48a7022 100644 --- a/crates/index-scheduler/src/queue/batches_test.rs +++ b/crates/index-scheduler/src/queue/batches_test.rs @@ -107,7 +107,10 @@ fn query_batches_simple() { if !batches[0].stats.progress_trace.is_empty() { batches[0].stats.progress_trace.clear(); - batches[0].stats.progress_trace.insert("processing tasks".to_string(), "deterministic_duration".into()); + batches[0] + .stats + .progress_trace + .insert("processing tasks".to_string(), "deterministic_duration".into()); } // Insta cannot snapshot our batches because the batch stats contains an enum as key: https://github.com/mitsuhiko/insta/issues/689 From 7acac2f560fe4c481a9cb7a7702c75408c2a2f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9mentine?= Date: Tue, 26 Aug 2025 08:51:07 +0200 Subject: [PATCH 05/11] Revert "Fix license detection" --- LICENSE.md => LICENSE | 2 +- LICENSE-EE.md => LICENSE-EE | 0 README.md | 6 +++--- crates/meilisearch-types/src/enterprise_edition/mod.rs | 2 +- crates/meilisearch-types/src/enterprise_edition/network.rs | 2 +- .../src/routes/indexes/enterprise_edition/mod.rs | 2 +- .../src/routes/indexes/enterprise_edition/proxy.rs | 2 +- .../milli/src/update/new/indexer/enterprise_edition/mod.rs | 2 +- .../src/update/new/indexer/enterprise_edition/sharding.rs | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) rename LICENSE.md => LICENSE (96%) rename LICENSE-EE.md => LICENSE-EE (100%) diff --git a/LICENSE.md b/LICENSE similarity index 96% rename from LICENSE.md rename to LICENSE index 17fda2f28..c6ed62f37 100644 --- a/LICENSE.md +++ b/LICENSE @@ -26,4 +26,4 @@ SOFTWARE. Certain parts of this codebase are not licensed under the MIT license and governed by the Business Source License 1.1. -See the LICENSE-EE.md file for details. +See the LICENSE-EE file for details. diff --git a/LICENSE-EE.md b/LICENSE-EE similarity index 100% rename from LICENSE-EE.md rename to LICENSE-EE diff --git a/README.md b/README.md index 598341891..aa371d650 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@

Dependency status - License + License Merge Queues enabled

@@ -95,7 +95,7 @@ Meilisearch is available in two editions: ### 🧪 Community Edition (CE) -- Fully open source under the [MIT license](./LICENSE.md) +- Fully open source under the [MIT license](./LICENSE) - Core search engine with fast and relevant full-text, semantic or hybrid search - Free to use for anyone, including commercial usage @@ -103,7 +103,7 @@ Meilisearch is available in two editions: - Includes advanced features such as: - Sharding -- Governed by a [commercial license](./LICENSE-EE.md) or the [Business Source License 1.1](https://mariadb.com/bsl11) +- Governed by a [commercial license](./LICENSE-EE) or the [Business Source License 1.1](https://mariadb.com/bsl11) - Not allowed in production without a commercial agreement with Meilisearch. - You may use, modify, and distribute the Licensed Work for non-production purposes only, such as testing, development, or evaluation. diff --git a/crates/meilisearch-types/src/enterprise_edition/mod.rs b/crates/meilisearch-types/src/enterprise_edition/mod.rs index a8ab640cb..47047de48 100644 --- a/crates/meilisearch-types/src/enterprise_edition/mod.rs +++ b/crates/meilisearch-types/src/enterprise_edition/mod.rs @@ -1,6 +1,6 @@ // Copyright © 2025 Meilisearch Some Rights Reserved // This file is part of Meilisearch Enterprise Edition (EE). // Use of this source code is governed by the Business Source License 1.1, -// as found in the LICENSE-EE.md file or at +// as found in the LICENSE-EE file or at pub mod network; diff --git a/crates/meilisearch-types/src/enterprise_edition/network.rs b/crates/meilisearch-types/src/enterprise_edition/network.rs index 37b74e574..9d5c51e25 100644 --- a/crates/meilisearch-types/src/enterprise_edition/network.rs +++ b/crates/meilisearch-types/src/enterprise_edition/network.rs @@ -1,7 +1,7 @@ // Copyright © 2025 Meilisearch Some Rights Reserved // This file is part of Meilisearch Enterprise Edition (EE). // Use of this source code is governed by the Business Source License 1.1, -// as found in the LICENSE-EE.md file or at +// as found in the LICENSE-EE file or at use std::collections::BTreeMap; diff --git a/crates/meilisearch/src/routes/indexes/enterprise_edition/mod.rs b/crates/meilisearch/src/routes/indexes/enterprise_edition/mod.rs index 7fe2e093c..a3ca7350c 100644 --- a/crates/meilisearch/src/routes/indexes/enterprise_edition/mod.rs +++ b/crates/meilisearch/src/routes/indexes/enterprise_edition/mod.rs @@ -1,6 +1,6 @@ // Copyright © 2025 Meilisearch Some Rights Reserved // This file is part of Meilisearch Enterprise Edition (EE). // Use of this source code is governed by the Business Source License 1.1, -// as found in the LICENSE-EE.md file or at +// as found in the LICENSE-EE file or at pub mod proxy; diff --git a/crates/meilisearch/src/routes/indexes/enterprise_edition/proxy.rs b/crates/meilisearch/src/routes/indexes/enterprise_edition/proxy.rs index 257ec85ef..7cb3eb8cc 100644 --- a/crates/meilisearch/src/routes/indexes/enterprise_edition/proxy.rs +++ b/crates/meilisearch/src/routes/indexes/enterprise_edition/proxy.rs @@ -1,7 +1,7 @@ // Copyright © 2025 Meilisearch Some Rights Reserved // This file is part of Meilisearch Enterprise Edition (EE). // Use of this source code is governed by the Business Source License 1.1, -// as found in the LICENSE-EE.md file or at +// as found in the LICENSE-EE file or at use std::collections::BTreeMap; use std::fs::File; diff --git a/crates/milli/src/update/new/indexer/enterprise_edition/mod.rs b/crates/milli/src/update/new/indexer/enterprise_edition/mod.rs index a0a5b0e53..9f89e8e31 100644 --- a/crates/milli/src/update/new/indexer/enterprise_edition/mod.rs +++ b/crates/milli/src/update/new/indexer/enterprise_edition/mod.rs @@ -1,6 +1,6 @@ // Copyright © 2025 Meilisearch Some Rights Reserved // This file is part of Meilisearch Enterprise Edition (EE). // Use of this source code is governed by the Business Source License 1.1, -// as found in the LICENSE-EE.md file or at +// as found in the LICENSE-EE file or at pub mod sharding; diff --git a/crates/milli/src/update/new/indexer/enterprise_edition/sharding.rs b/crates/milli/src/update/new/indexer/enterprise_edition/sharding.rs index bb30feff7..c0322f868 100644 --- a/crates/milli/src/update/new/indexer/enterprise_edition/sharding.rs +++ b/crates/milli/src/update/new/indexer/enterprise_edition/sharding.rs @@ -1,7 +1,7 @@ // Copyright © 2025 Meilisearch Some Rights Reserved // This file is part of Meilisearch Enterprise Edition (EE). // Use of this source code is governed by the Business Source License 1.1, -// as found in the LICENSE-EE.md file or at +// as found in the LICENSE-EE file or at use std::hash::{BuildHasher as _, BuildHasherDefault}; From 32785cb2d0570001e209ec780b571a4e86f3c4d4 Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Tue, 26 Aug 2025 08:39:16 +0000 Subject: [PATCH 06/11] Update version for the next release (v1.19.1) in Cargo.toml --- Cargo.lock | 34 +++++++++++++++++----------------- Cargo.toml | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc96152a6..171735fcf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -580,7 +580,7 @@ source = "git+https://github.com/meilisearch/bbqueue#cbb87cc707b5af415ef203bdaf2 [[package]] name = "benchmarks" -version = "1.19.0" +version = "1.19.1" dependencies = [ "anyhow", "bumpalo", @@ -770,7 +770,7 @@ dependencies = [ [[package]] name = "build-info" -version = "1.19.0" +version = "1.19.1" dependencies = [ "anyhow", "time", @@ -1774,7 +1774,7 @@ dependencies = [ [[package]] name = "dump" -version = "1.19.0" +version = "1.19.1" dependencies = [ "anyhow", "big_s", @@ -2006,7 +2006,7 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "file-store" -version = "1.19.0" +version = "1.19.1" dependencies = [ "tempfile", "thiserror 2.0.12", @@ -2028,7 +2028,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.19.0" +version = "1.19.1" dependencies = [ "insta", "levenshtein_automata", @@ -2050,7 +2050,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.19.0" +version = "1.19.1" dependencies = [ "criterion", "serde_json", @@ -2195,7 +2195,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.19.0" +version = "1.19.1" dependencies = [ "arbitrary", "bumpalo", @@ -2995,7 +2995,7 @@ dependencies = [ [[package]] name = "index-scheduler" -version = "1.19.0" +version = "1.19.1" dependencies = [ "anyhow", "backoff", @@ -3231,7 +3231,7 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "1.19.0" +version = "1.19.1" dependencies = [ "criterion", "serde_json", @@ -3725,7 +3725,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.19.0" +version = "1.19.1" dependencies = [ "insta", "md5", @@ -3736,7 +3736,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.19.0" +version = "1.19.1" dependencies = [ "actix-cors", "actix-http", @@ -3833,7 +3833,7 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.19.0" +version = "1.19.1" dependencies = [ "base64 0.22.1", "enum-iterator", @@ -3852,7 +3852,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.19.0" +version = "1.19.1" dependencies = [ "actix-web", "anyhow", @@ -3887,7 +3887,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.19.0" +version = "1.19.1" dependencies = [ "anyhow", "clap", @@ -3921,7 +3921,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.19.0" +version = "1.19.1" dependencies = [ "allocator-api2 0.3.0", "arroy", @@ -4485,7 +4485,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.19.0" +version = "1.19.1" dependencies = [ "big_s", "serde_json", @@ -7279,7 +7279,7 @@ dependencies = [ [[package]] name = "xtask" -version = "1.19.0" +version = "1.19.1" dependencies = [ "anyhow", "build-info", diff --git a/Cargo.toml b/Cargo.toml index 836e08dcb..e4efedab9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ members = [ ] [workspace.package] -version = "1.19.0" +version = "1.19.1" authors = [ "Quentin de Quelen ", "Clément Renault ", From 0ade376b00d2888a61f2f8596ff4974dab6b94ee Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Tue, 26 Aug 2025 11:57:27 +0200 Subject: [PATCH 07/11] update version tests --- .../upgrade_failure/after_processing_everything.snap | 4 ++-- .../upgrade_failure/register_automatic_upgrade_task.snap | 2 +- .../registered_a_task_while_the_upgrade_task_is_enqueued.snap | 2 +- .../test_failure.rs/upgrade_failure/upgrade_task_failed.snap | 4 ++-- .../upgrade_failure/upgrade_task_failed_again.snap | 4 ++-- .../upgrade_failure/upgrade_task_succeeded.snap | 4 ++-- crates/meilisearch/tests/upgrade/mod.rs | 4 ++-- ...ches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap | 2 +- ...ches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap | 2 +- ...tches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap | 2 +- ...asks_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap | 2 +- ...asks_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap | 2 +- ...tasks_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap | 2 +- ..._whole_batch_queue_once_everything_has_been_processed.snap | 2 +- ...e_whole_task_queue_once_everything_has_been_processed.snap | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/after_processing_everything.snap b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/after_processing_everything.snap index 90fb618f1..14e45cf88 100644 --- a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/after_processing_everything.snap +++ b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/after_processing_everything.snap @@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs [] ---------------------------------------------------------------------- ### All Tasks: -0 {uid: 0, batch_uid: 0, status: succeeded, details: { from: (1, 12, 0), to: (1, 19, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }} +0 {uid: 0, batch_uid: 0, status: succeeded, details: { from: (1, 12, 0), to: (1, 19, 1) }, kind: UpgradeDatabase { from: (1, 12, 0) }} 1 {uid: 1, batch_uid: 1, status: succeeded, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }} 2 {uid: 2, batch_uid: 2, status: succeeded, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }} 3 {uid: 3, batch_uid: 3, status: failed, error: ResponseError { code: 200, message: "Index `doggo` already exists.", error_code: "index_already_exists", error_type: "invalid_request", error_link: "https://docs.meilisearch.com/errors#index_already_exists" }, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }} @@ -57,7 +57,7 @@ girafo: { number_of_documents: 0, field_distribution: {} } [timestamp] [4,] ---------------------------------------------------------------------- ### All Batches: -0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.19.0"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", } +0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.19.1"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", } 1 {uid: 1, details: {"primaryKey":"mouse"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"indexCreation":1},"indexUids":{"catto":1}}, stop reason: "created batch containing only task with id 1 of type `indexCreation` that cannot be batched with any other task.", } 2 {uid: 2, details: {"primaryKey":"bone"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"indexCreation":1},"indexUids":{"doggo":1}}, stop reason: "created batch containing only task with id 2 of type `indexCreation` that cannot be batched with any other task.", } 3 {uid: 3, details: {"primaryKey":"bone"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"indexCreation":1},"indexUids":{"doggo":1}}, stop reason: "created batch containing only task with id 3 of type `indexCreation` that cannot be batched with any other task.", } diff --git a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/register_automatic_upgrade_task.snap b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/register_automatic_upgrade_task.snap index 9a3edc8ed..8c60cc61d 100644 --- a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/register_automatic_upgrade_task.snap +++ b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/register_automatic_upgrade_task.snap @@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs [] ---------------------------------------------------------------------- ### All Tasks: -0 {uid: 0, status: enqueued, details: { from: (1, 12, 0), to: (1, 19, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }} +0 {uid: 0, status: enqueued, details: { from: (1, 12, 0), to: (1, 19, 1) }, kind: UpgradeDatabase { from: (1, 12, 0) }} ---------------------------------------------------------------------- ### Status: enqueued [0,] diff --git a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/registered_a_task_while_the_upgrade_task_is_enqueued.snap b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/registered_a_task_while_the_upgrade_task_is_enqueued.snap index fdaecb1b8..6fe7efecc 100644 --- a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/registered_a_task_while_the_upgrade_task_is_enqueued.snap +++ b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/registered_a_task_while_the_upgrade_task_is_enqueued.snap @@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs [] ---------------------------------------------------------------------- ### All Tasks: -0 {uid: 0, status: enqueued, details: { from: (1, 12, 0), to: (1, 19, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }} +0 {uid: 0, status: enqueued, details: { from: (1, 12, 0), to: (1, 19, 1) }, kind: UpgradeDatabase { from: (1, 12, 0) }} 1 {uid: 1, status: enqueued, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }} ---------------------------------------------------------------------- ### Status: diff --git a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed.snap b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed.snap index fc28df258..2f134fd0b 100644 --- a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed.snap +++ b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed.snap @@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs [] ---------------------------------------------------------------------- ### All Tasks: -0 {uid: 0, batch_uid: 0, status: failed, error: ResponseError { code: 200, message: "Planned failure for tests.", error_code: "internal", error_type: "internal", error_link: "https://docs.meilisearch.com/errors#internal" }, details: { from: (1, 12, 0), to: (1, 19, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }} +0 {uid: 0, batch_uid: 0, status: failed, error: ResponseError { code: 200, message: "Planned failure for tests.", error_code: "internal", error_type: "internal", error_link: "https://docs.meilisearch.com/errors#internal" }, details: { from: (1, 12, 0), to: (1, 19, 1) }, kind: UpgradeDatabase { from: (1, 12, 0) }} 1 {uid: 1, status: enqueued, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }} ---------------------------------------------------------------------- ### Status: @@ -37,7 +37,7 @@ catto [1,] [timestamp] [0,] ---------------------------------------------------------------------- ### All Batches: -0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.19.0"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", } +0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.19.1"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", } ---------------------------------------------------------------------- ### Batch to tasks mapping: 0 [0,] diff --git a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed_again.snap b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed_again.snap index d09780553..644496d37 100644 --- a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed_again.snap +++ b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_failed_again.snap @@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs [] ---------------------------------------------------------------------- ### All Tasks: -0 {uid: 0, batch_uid: 0, status: failed, error: ResponseError { code: 200, message: "Planned failure for tests.", error_code: "internal", error_type: "internal", error_link: "https://docs.meilisearch.com/errors#internal" }, details: { from: (1, 12, 0), to: (1, 19, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }} +0 {uid: 0, batch_uid: 0, status: failed, error: ResponseError { code: 200, message: "Planned failure for tests.", error_code: "internal", error_type: "internal", error_link: "https://docs.meilisearch.com/errors#internal" }, details: { from: (1, 12, 0), to: (1, 19, 1) }, kind: UpgradeDatabase { from: (1, 12, 0) }} 1 {uid: 1, status: enqueued, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }} 2 {uid: 2, status: enqueued, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }} ---------------------------------------------------------------------- @@ -40,7 +40,7 @@ doggo [2,] [timestamp] [0,] ---------------------------------------------------------------------- ### All Batches: -0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.19.0"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", } +0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.19.1"}, stats: {"totalNbTasks":1,"status":{"failed":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", } ---------------------------------------------------------------------- ### Batch to tasks mapping: 0 [0,] diff --git a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_succeeded.snap b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_succeeded.snap index aa687425e..f9d50472a 100644 --- a/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_succeeded.snap +++ b/crates/index-scheduler/src/scheduler/snapshots/test_failure.rs/upgrade_failure/upgrade_task_succeeded.snap @@ -6,7 +6,7 @@ source: crates/index-scheduler/src/scheduler/test_failure.rs [] ---------------------------------------------------------------------- ### All Tasks: -0 {uid: 0, batch_uid: 0, status: succeeded, details: { from: (1, 12, 0), to: (1, 19, 0) }, kind: UpgradeDatabase { from: (1, 12, 0) }} +0 {uid: 0, batch_uid: 0, status: succeeded, details: { from: (1, 12, 0), to: (1, 19, 1) }, kind: UpgradeDatabase { from: (1, 12, 0) }} 1 {uid: 1, status: enqueued, details: { primary_key: Some("mouse"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }} 2 {uid: 2, status: enqueued, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }} 3 {uid: 3, status: enqueued, details: { primary_key: Some("bone"), old_new_uid: None, new_index_uid: None }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("bone") }} @@ -43,7 +43,7 @@ doggo [2,3,] [timestamp] [0,] ---------------------------------------------------------------------- ### All Batches: -0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.19.0"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", } +0 {uid: 0, details: {"upgradeFrom":"v1.12.0","upgradeTo":"v1.19.1"}, stats: {"totalNbTasks":1,"status":{"succeeded":1},"types":{"upgradeDatabase":1},"indexUids":{}}, stop reason: "stopped after the last task of type `upgradeDatabase` because they cannot be batched with tasks of any other type.", } ---------------------------------------------------------------------- ### Batch to tasks mapping: 0 [0,] diff --git a/crates/meilisearch/tests/upgrade/mod.rs b/crates/meilisearch/tests/upgrade/mod.rs index e259b7c42..274a4b5ab 100644 --- a/crates/meilisearch/tests/upgrade/mod.rs +++ b/crates/meilisearch/tests/upgrade/mod.rs @@ -43,7 +43,7 @@ async fn version_too_old() { std::fs::write(db_path.join("VERSION"), "1.11.9999").unwrap(); let options = Opt { experimental_dumpless_upgrade: true, ..default_settings }; let err = Server::new_with_options(options).await.map(|_| ()).unwrap_err(); - snapshot!(err, @"Database version 1.11.9999 is too old for the experimental dumpless upgrade feature. Please generate a dump using the v1.11.9999 and import it in the v1.19.0"); + snapshot!(err, @"Database version 1.11.9999 is too old for the experimental dumpless upgrade feature. Please generate a dump using the v1.11.9999 and import it in the v1.19.1"); } #[actix_rt::test] @@ -58,7 +58,7 @@ async fn version_requires_downgrade() { std::fs::write(db_path.join("VERSION"), format!("{major}.{minor}.{patch}")).unwrap(); let options = Opt { experimental_dumpless_upgrade: true, ..default_settings }; let err = Server::new_with_options(options).await.map(|_| ()).unwrap_err(); - snapshot!(err, @"Database version 1.19.1 is higher than the Meilisearch version 1.19.0. Downgrade is not supported"); + snapshot!(err, @"Database version 1.19.2 is higher than the Meilisearch version 1.19.1. Downgrade is not supported"); } #[actix_rt::test] diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap index 8ca0ef6ac..bc015ef08 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap @@ -8,7 +8,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "progress": null, "details": { "upgradeFrom": "v1.12.0", - "upgradeTo": "v1.19.0" + "upgradeTo": "v1.19.1" }, "stats": { "totalNbTasks": 1, diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap index 8ca0ef6ac..bc015ef08 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap @@ -8,7 +8,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "progress": null, "details": { "upgradeFrom": "v1.12.0", - "upgradeTo": "v1.19.0" + "upgradeTo": "v1.19.1" }, "stats": { "totalNbTasks": 1, diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap index 8ca0ef6ac..bc015ef08 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap @@ -8,7 +8,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "progress": null, "details": { "upgradeFrom": "v1.12.0", - "upgradeTo": "v1.19.0" + "upgradeTo": "v1.19.1" }, "stats": { "totalNbTasks": 1, diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap index ffeabf4ca..2e0b7b99d 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap @@ -12,7 +12,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "canceledBy": null, "details": { "upgradeFrom": "v1.12.0", - "upgradeTo": "v1.19.0" + "upgradeTo": "v1.19.1" }, "error": null, "duration": "[duration]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap index ffeabf4ca..2e0b7b99d 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap @@ -12,7 +12,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "canceledBy": null, "details": { "upgradeFrom": "v1.12.0", - "upgradeTo": "v1.19.0" + "upgradeTo": "v1.19.1" }, "error": null, "duration": "[duration]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap index ffeabf4ca..2e0b7b99d 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/tasks_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap @@ -12,7 +12,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "canceledBy": null, "details": { "upgradeFrom": "v1.12.0", - "upgradeTo": "v1.19.0" + "upgradeTo": "v1.19.1" }, "error": null, "duration": "[duration]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap index 5267a2edd..8ba86ac03 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap @@ -8,7 +8,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "progress": null, "details": { "upgradeFrom": "v1.12.0", - "upgradeTo": "v1.19.0" + "upgradeTo": "v1.19.1" }, "stats": { "totalNbTasks": 1, diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_task_queue_once_everything_has_been_processed.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_task_queue_once_everything_has_been_processed.snap index 1b482a69e..c09964019 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_task_queue_once_everything_has_been_processed.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_task_queue_once_everything_has_been_processed.snap @@ -12,7 +12,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "canceledBy": null, "details": { "upgradeFrom": "v1.12.0", - "upgradeTo": "v1.19.0" + "upgradeTo": "v1.19.1" }, "error": null, "duration": "[duration]", From 026b95afbb6a6f379ee5b87e7210ed34c3b842e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Aug 2025 20:54:30 +0000 Subject: [PATCH 08/11] Bump tracing-subscriber from 0.3.19 to 0.3.20 Bumps [tracing-subscriber](https://github.com/tokio-rs/tracing) from 0.3.19 to 0.3.20. - [Release notes](https://github.com/tokio-rs/tracing/releases) - [Commits](https://github.com/tokio-rs/tracing/compare/tracing-subscriber-0.3.19...tracing-subscriber-0.3.20) --- updated-dependencies: - dependency-name: tracing-subscriber dependency-version: 0.3.20 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 17 +++++------------ crates/meilisearch/Cargo.toml | 2 +- crates/tracing-trace/Cargo.toml | 2 +- crates/xtask/Cargo.toml | 2 +- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb4fde897..577743547 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4129,12 +4129,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" dependencies = [ - "overload", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4391,12 +4390,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "owo-colors" version = "4.2.1" @@ -6407,9 +6400,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" dependencies = [ "nu-ansi-term", "serde", diff --git a/crates/meilisearch/Cargo.toml b/crates/meilisearch/Cargo.toml index c110830c4..14a9c7aeb 100644 --- a/crates/meilisearch/Cargo.toml +++ b/crates/meilisearch/Cargo.toml @@ -96,7 +96,7 @@ serde_urlencoded = "0.7.1" termcolor = "1.4.1" url = { version = "2.5.4", features = ["serde"] } tracing = "0.1.41" -tracing-subscriber = { version = "0.3.19", features = ["json"] } +tracing-subscriber = { version = "0.3.20", features = ["json"] } tracing-trace = { version = "0.1.0", path = "../tracing-trace" } tracing-actix-web = "0.7.18" build-info = { version = "1.7.0", path = "../build-info" } diff --git a/crates/tracing-trace/Cargo.toml b/crates/tracing-trace/Cargo.toml index 866a982a0..fe28febaf 100644 --- a/crates/tracing-trace/Cargo.toml +++ b/crates/tracing-trace/Cargo.toml @@ -12,7 +12,7 @@ serde = { version = "1.0.219", features = ["derive"] } serde_json = "1.0.140" tracing = "0.1.41" tracing-error = "0.2.1" -tracing-subscriber = "0.3.19" +tracing-subscriber = "0.3.20" byte-unit = { version = "5.1.6", default-features = false, features = [ "std", "byte", diff --git a/crates/xtask/Cargo.toml b/crates/xtask/Cargo.toml index 5fdf157df..f95984832 100644 --- a/crates/xtask/Cargo.toml +++ b/crates/xtask/Cargo.toml @@ -39,6 +39,6 @@ tokio = { version = "1.45.1", features = [ "signal", ] } tracing = "0.1.41" -tracing-subscriber = "0.3.19" +tracing-subscriber = "0.3.20" tracing-trace = { version = "0.1.0", path = "../tracing-trace" } uuid = { version = "1.17.0", features = ["v7", "serde"] } From 9c06545ae3284c5c842c34b57c247a3c0ad4f500 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Sep 2025 08:23:15 +0000 Subject: [PATCH 09/11] Bump actions/setup-java from 4 to 5 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4 to 5. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-java dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/sdks-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdks-tests.yml b/.github/workflows/sdks-tests.yml index 62e31a4ae..6cf08c086 100644 --- a/.github/workflows/sdks-tests.yml +++ b/.github/workflows/sdks-tests.yml @@ -133,7 +133,7 @@ jobs: with: repository: meilisearch/meilisearch-java - name: Set up Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 8 distribution: 'zulu' From c3cefbc17006534107b5d83771c1dde98fc66ba5 Mon Sep 17 00:00:00 2001 From: Tamo Date: Tue, 2 Sep 2025 12:40:18 +0200 Subject: [PATCH 10/11] send the version when returning prometheus metrics --- crates/meilisearch/src/routes/metrics.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/crates/meilisearch/src/routes/metrics.rs b/crates/meilisearch/src/routes/metrics.rs index 31abb93a7..99e44e132 100644 --- a/crates/meilisearch/src/routes/metrics.rs +++ b/crates/meilisearch/src/routes/metrics.rs @@ -8,6 +8,7 @@ use meilisearch_types::keys::actions; use meilisearch_types::tasks::Status; use prometheus::{Encoder, TextEncoder}; use time::OffsetDateTime; +use tracing::Instrument; use utoipa::OpenApi; use crate::extractors::authentication::policies::ActionPolicy; @@ -181,5 +182,12 @@ pub async fn get_metrics( let response = String::from_utf8(buffer).expect("Failed to convert bytes to string"); - Ok(HttpResponse::Ok().insert_header(header::ContentType(mime::TEXT_PLAIN)).body(response)) + // We cannot specify the version with ContentType(TEXT_PLAIN_UTF_8) so we have to write everything by hand :( + // see the following for what should be returned: https://prometheus.io/docs/instrumenting/content_negotiation/#content-type-response + let content_type = ("content-type", "text/plain; version=0.0.4; charset=utf-8"); + + Ok(HttpResponse::Ok() + // .insert_header(header::ContentType(mime::TEXT_PLAIN_UTF_8)) + .insert_header(content_type) + .body(response)) } From b144d9ab2b5cf44c5e0f151ca5b3d801906b168d Mon Sep 17 00:00:00 2001 From: Tamo Date: Tue, 2 Sep 2025 14:31:24 +0200 Subject: [PATCH 11/11] fix warnings --- crates/meilisearch/src/routes/metrics.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/crates/meilisearch/src/routes/metrics.rs b/crates/meilisearch/src/routes/metrics.rs index 99e44e132..1efd6d367 100644 --- a/crates/meilisearch/src/routes/metrics.rs +++ b/crates/meilisearch/src/routes/metrics.rs @@ -1,4 +1,3 @@ -use actix_web::http::header; use actix_web::web::{self, Data}; use actix_web::HttpResponse; use index_scheduler::{IndexScheduler, Query}; @@ -8,7 +7,6 @@ use meilisearch_types::keys::actions; use meilisearch_types::tasks::Status; use prometheus::{Encoder, TextEncoder}; use time::OffsetDateTime; -use tracing::Instrument; use utoipa::OpenApi; use crate::extractors::authentication::policies::ActionPolicy;