Unverified Commit 4abde4f1 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

[Turbopack] add tracing to turbopack-tests (#76033)

### What?

* add tracing to turbopack-tests
* remove env-filter from turbopack-cli
* add empty feature list
parent 71d8bfcc
...@@ -9984,6 +9984,8 @@ dependencies = [ ...@@ -9984,6 +9984,8 @@ dependencies = [
"serde_json", "serde_json",
"testing", "testing",
"tokio", "tokio",
"tracing",
"tracing-subscriber",
"turbo-rcstr", "turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-backend", "turbo-tasks-backend",
...@@ -10002,6 +10004,7 @@ dependencies = [ ...@@ -10002,6 +10004,7 @@ dependencies = [
"turbopack-nodejs", "turbopack-nodejs",
"turbopack-resolve", "turbopack-resolve",
"turbopack-test-utils", "turbopack-test-utils",
"turbopack-trace-utils",
] ]
[[package]] [[package]]
......
...@@ -9,6 +9,7 @@ edition = "2021" ...@@ -9,6 +9,7 @@ edition = "2021"
bench = false bench = false
[features] [features]
default = []
tokio_tracing = ["tokio/tracing"] tokio_tracing = ["tokio/tracing"]
hanging_detection = [] hanging_detection = []
......
...@@ -44,7 +44,7 @@ rustc-hash = { workspace = true } ...@@ -44,7 +44,7 @@ rustc-hash = { workspace = true }
serde = { workspace = true } serde = { workspace = true }
tokio = { workspace = true, features = ["full"] } tokio = { workspace = true, features = ["full"] }
tracing = { workspace = true } tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter", "json"] } tracing-subscriber = { workspace = true, features = ["json"] }
turbo-rcstr = { workspace = true } turbo-rcstr = { workspace = true }
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
turbo-tasks-backend = { workspace = true } turbo-tasks-backend = { workspace = true }
......
...@@ -26,6 +26,8 @@ serde = { workspace = true } ...@@ -26,6 +26,8 @@ serde = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
testing = { workspace = true } testing = { workspace = true }
tokio = { workspace = true } tokio = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["json"] }
turbo-rcstr = { workspace = true } turbo-rcstr = { workspace = true }
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
turbo-tasks-bytes = { workspace = true } turbo-tasks-bytes = { workspace = true }
...@@ -44,6 +46,7 @@ turbopack-node = { workspace = true } ...@@ -44,6 +46,7 @@ turbopack-node = { workspace = true }
turbopack-nodejs = { workspace = true, features = ["test"] } turbopack-nodejs = { workspace = true, features = ["test"] }
turbopack-resolve = { workspace = true } turbopack-resolve = { workspace = true }
turbopack-test-utils = { workspace = true } turbopack-test-utils = { workspace = true }
turbopack-trace-utils = { workspace = true }
[build-dependencies] [build-dependencies]
turbo-tasks-build = { workspace = true } turbo-tasks-build = { workspace = true }
...@@ -10,6 +10,7 @@ use std::path::PathBuf; ...@@ -10,6 +10,7 @@ use std::path::PathBuf;
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use dunce::canonicalize; use dunce::canonicalize;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, Registry};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
apply_effects, debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs, Completion, apply_effects, debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs, Completion,
...@@ -47,6 +48,10 @@ use turbopack_node::{debug::should_debug, evaluate::evaluate}; ...@@ -47,6 +48,10 @@ use turbopack_node::{debug::should_debug, evaluate::evaluate};
use turbopack_nodejs::NodeJsChunkingContext; use turbopack_nodejs::NodeJsChunkingContext;
use turbopack_resolve::resolve_options_context::ResolveOptionsContext; use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
use turbopack_test_utils::jest::JestRunResult; use turbopack_test_utils::jest::JestRunResult;
use turbopack_trace_utils::{
filter_layer::FilterLayer, raw_trace::RawTraceLayer, trace_writer::TraceWriter,
tracing_presets::TRACING_TURBO_TASKS_TARGETS,
};
use crate::util::REPO_ROOT; use crate::util::REPO_ROOT;
...@@ -168,6 +173,21 @@ async fn run(resource: PathBuf, snapshot_mode: IssueSnapshotMode) -> Result<JsRe ...@@ -168,6 +173,21 @@ async fn run(resource: PathBuf, snapshot_mode: IssueSnapshotMode) -> Result<JsRe
std::fs::remove_dir_all(&output_path)?; std::fs::remove_dir_all(&output_path)?;
} }
let subscriber = Registry::default();
let trace = TRACING_TURBO_TASKS_TARGETS.join(",");
let subscriber = subscriber.with(FilterLayer::try_new(&trace).unwrap());
std::fs::create_dir_all(&output_path)
.context("Unable to create output directory")
.unwrap();
let trace_file = output_path.join("trace-turbopack");
let trace_writer = std::fs::File::create(trace_file.clone()).unwrap();
let (trace_writer, trace_writer_guard) = TraceWriter::new(trace_writer);
let subscriber = subscriber.with(RawTraceLayer::new(trace_writer));
subscriber.init();
let tt = TurboTasks::new(TurboTasksBackend::new( let tt = TurboTasks::new(TurboTasksBackend::new(
BackendOptions { BackendOptions {
storage_mode: None, storage_mode: None,
...@@ -176,15 +196,20 @@ async fn run(resource: PathBuf, snapshot_mode: IssueSnapshotMode) -> Result<JsRe ...@@ -176,15 +196,20 @@ async fn run(resource: PathBuf, snapshot_mode: IssueSnapshotMode) -> Result<JsRe
}, },
noop_backing_storage(), noop_backing_storage(),
)); ));
tt.run_once(async move { let result = tt
let emit_op = .run_once(async move {
run_inner_operation(resource.to_str().unwrap().into(), Value::new(snapshot_mode)); let emit_op =
let result = emit_op.read_strongly_consistent().owned().await?; run_inner_operation(resource.to_str().unwrap().into(), Value::new(snapshot_mode));
apply_effects(emit_op).await?; let result = emit_op.read_strongly_consistent().owned().await?;
apply_effects(emit_op).await?;
Ok(result)
}) Ok(result)
.await })
.await;
drop(trace_writer_guard);
result
} }
#[turbo_tasks::function(operation)] #[turbo_tasks::function(operation)]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment