Skip to content

Commit 3038d08

Browse files
authored
[HOTFIX] applying PR #5785 to release/2025-10-24 (#5786)
## Description of changes Also, revert #5776. ## Test plan CI ## Migration plan N/A ## Observability plan Confirm that tracing is re-enabled for chroma-system after merging. ## Documentation Changes N/A
1 parent f0b8346 commit 3038d08

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

rust/log-service/src/lib.rs

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,24 +1449,13 @@ impl LogServer {
14491449
Arc::clone(&storage),
14501450
target_prefix,
14511451
);
1452-
let new_manifest = log_reader
1453-
.manifest()
1454-
.await
1455-
.map_err(|err| {
1456-
Status::new(
1457-
err.code().into(),
1458-
format!("Unable to read copied manifest: {}", err),
1459-
)
1460-
})?
1461-
.ok_or_else(|| Status::internal("Unable to find copied manifest"))?;
1462-
let first_copied_offset = new_manifest.oldest_timestamp();
1463-
if offset < first_copied_offset {
1464-
return Err(Status::internal(format!(
1465-
"Compaction cursor [{offset:?}] is behind start of manifest [{first_copied_offset:?}]",
1466-
)));
1467-
}
14681452
// This is the next record to insert, so we'll have to adjust downwards.
1469-
let max_offset = new_manifest.next_write_timestamp();
1453+
let max_offset = log_reader.next_write_timestamp().await.map_err(|err| {
1454+
Status::new(
1455+
err.code().into(),
1456+
format!("Failed to read copied log: {}", err),
1457+
)
1458+
})?;
14701459
if max_offset < offset {
14711460
return Err(Status::new(
14721461
chroma_error::ErrorCodes::Internal.into(),

rust/tracing/src/init_tracer.rs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,28 @@ pub fn init_global_filter_layer(
5252
"chroma_cache",
5353
"chroma_distance",
5454
"chroma_error",
55-
"chroma_log",
56-
"chroma_log-service",
55+
"chroma_frontend",
5756
"chroma_index",
57+
"chroma_log",
58+
"chroma_log_service",
59+
"chroma_memberlist",
60+
"chroma_metering",
61+
"chroma_metering_macros",
62+
"chroma_segment",
63+
"chroma_sqlite",
64+
"chroma_storage",
65+
"chroma_sysdb",
66+
"chroma_system",
5867
"chroma_test",
68+
"chroma_tracing",
5969
"chroma_types",
6070
"compaction_service",
6171
"distance_metrics",
6272
"full_text",
6373
"metadata_filtering",
6474
"query_service",
75+
"s3heap",
76+
"s3heap_service",
6577
"wal3",
6678
"worker",
6779
];

0 commit comments

Comments
 (0)