Skip to content

Commit b344993

Browse files
authored
chore: ci logging management (#476)
1 parent 6e86c50 commit b344993

64 files changed

Lines changed: 1671 additions & 1195 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.config/nextest.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ default-filter = 'not (binary(=integration_test_isolated) & test(/nightly_full_g
2828

2929
[profile.ci.junit]
3030
path = "junit.xml"
31-
store-success-output = true
31+
store-success-output = false
3232
store-failure-output = true
3333

3434
# Long timeout for tests that use production-sized FHE parameters (Default +
@@ -71,7 +71,7 @@ test-group = "k8s-integration"
7171

7272
[profile.ci-nightly.junit]
7373
path = "junit.xml"
74-
store-success-output = true
74+
store-success-output = false
7575
store-failure-output = true
7676

7777
# Long timeout + serialization for slow Default-param tests (same as ci profile).

Cargo.lock

Lines changed: 25 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ members = [
1919
"observability",
2020
"tools/kms-health-check",
2121
"tools/generate-test-material",
22+
"tools/kms-test-tracing",
23+
"tools/kms-test-tracing-macro",
2224
]
2325

2426
# The backward-compatibility modules are excluded from the workspace to avoid dependency conflicts.
@@ -217,7 +219,7 @@ tracing = { version = "=0.1.44", features = ["log"] } # Application instrumenta
217219
tracing-appender = "=0.2.3" # Log file rotation - LOW RISK: tokio-rs team
218220
tracing-opentelemetry = "=0.32.1" # OpenTelemetry integration - LOW RISK: tokio-rs team
219221
tracing-subscriber = { version = "=0.3.22", features = ["fmt", "std"] } # Tracing subscriber - LOW RISK: tokio-rs team
220-
tracing-test = "=0.2.5" # Tracing test utilities - LOW RISK: tokio-rs team
222+
kms-test-tracing = { path = "./tools/kms-test-tracing" } # In-repo test harness (not crates.io `tracing-test`) - LOW RISK: in-repo
221223
trait-variant = "0.1.2" # Trait variant generation - LOW RISK: rust-lang team utility
222224
typed-builder = "=0.21.0" # Builder pattern macro - HIGH RISK: Individual maintainer (idanarye), despite 48M+ downloads
223225
url = { version = "=2.5.8", features = ["serde"] } # URL parsing and manipulation - LOW RISK: servo team,

core-client/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ test-utils-cc = { path = "./test-utils-cc" }
9696
futures.workspace = true
9797
# Self-import for integration tests
9898
kms-core-client = { workspace = true, features = ["testing"] }
99+
kms-test-tracing.workspace = true
99100
serial_test.workspace = true
100101
test-context.workspace = true
101102

core-client/src/lib.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ use serde::{Deserialize, Serialize};
5353
use std::collections::HashMap;
5454
use std::path::{Path, PathBuf};
5555
use std::str::FromStr;
56-
use std::sync::{Arc, Once};
56+
use std::sync::Arc;
5757
use std::time::Duration;
5858
use strum_macros::{Display, EnumString};
5959
use tfhe::FheTypes as TfheFheType;
@@ -1357,12 +1357,6 @@ pub async fn encrypt(
13571357
))
13581358
}
13591359

1360-
static INIT_LOG: Once = Once::new();
1361-
1362-
pub fn init_testing() {
1363-
INIT_LOG.call_once(setup_logging);
1364-
}
1365-
13661360
pub fn setup_logging() {
13671361
let file_appender = RollingFileAppender::new(Rotation::DAILY, "logs", "core-client.log");
13681362
let file_and_stdout = file_appender.and(std::io::stdout);
@@ -1371,8 +1365,6 @@ pub fn setup_logging() {
13711365
let log_level_str = std::env::var("RUST_LOG").unwrap_or_else(|_| "INFO".to_string());
13721366
let log_level = tracing::Level::from_str(&log_level_str).unwrap_or(tracing::Level::INFO);
13731367

1374-
println!("Setting up logging with level: {log_level:?}");
1375-
13761368
let subscriber = tracing_subscriber::fmt()
13771369
.with_writer(file_and_stdout)
13781370
.with_ansi(false)

0 commit comments

Comments
 (0)