Add: Legacy procedural macro integration tests

.github/workflows/coverage.yml

@@ -22,8 +22,6 @@ jobs:
           RUSTDOCFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests"
         run: |
           cargo test --workspace --all-features --no-fail-fast
-          cargo run --example synchronous
-          cargo run --example asynchronous
           cargo run --example get_started
       - id: coverage
         uses: actions-rs/[email protected]

minitrace-macro/Cargo.toml

@@ -22,9 +22,9 @@ proc-macro2 = "1"
 proc-macro-error = "1"
 
 [dev-dependencies]
-trybuild = "1"
-minitrace = "0.4.0"
+futures = "0.3.21"
+futures-timer = "3.0.2"
+minitrace = { path = "../minitrace" }
+test-utilities = { path = "../test-utilities" }
 tokio = { version = "1", features = ["full"] }
-
-[patch.crates-io]
-minitrace = { path = "../" }
+trybuild = "1"

minitrace-macro/tests/spans.rs

@@ -0,0 +1,5 @@
+#[test]
+fn spans() {
+    let t = trybuild::TestCases::new();
+    t.pass("tests/spans/*.rs");
+}

minitrace-macro/tests/spans/black-box-false-local-async.rs

@@ -0,0 +1,41 @@
+use minitrace::trace;
+use test_utilities::*;
+
+// Reference:
+// - https://github.com/tikv/minitrace-rust/issues/122
+#[trace("a-span")]
+async fn f(a: u32) -> u32 {
+    a
+}
+
+#[tokio::main]
+async fn main() {
+    let (root, collector) = minitrace::Span::root("root");
+    {
+        let _child_span = root.set_local_parent();
+        f(1).await;
+    }
+    drop(root);
+    let records: Vec<minitrace::collector::SpanRecord> = futures::executor::block_on(collector.collect());
+
+    let expected = r#"[
+    SpanRecord {
+        id: 1,
+        parent_id: 0,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "root",
+        properties: [],
+    },
+    SpanRecord {
+        id: 2,
+        parent_id: 1,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "a-span",
+        properties: [],
+    },
+]"#;
+    let actual = normalize_spans(records);
+    assert_eq_text!(expected, &actual);
+}

minitrace-macro/tests/spans/black-box-false-local-sync.rs

@@ -0,0 +1,40 @@
+use minitrace::trace;
+use test_utilities::*;
+
+// Reference:
+// - https://github.com/tikv/minitrace-rust/issues/122
+#[trace("a-span")]
+fn f(a: u32) -> u32 {
+    a
+}
+
+fn main() {
+    let (root, collector) = minitrace::Span::root("root");
+    {
+        let _sg1 = root.set_local_parent();
+        f(1);
+    }
+    drop(root);
+    let records: Vec<minitrace::collector::SpanRecord> =
+        futures::executor::block_on(collector.collect());
+    let expected = r#"[
+    SpanRecord {
+        id: 1,
+        parent_id: 0,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "root",
+        properties: [],
+    },
+    SpanRecord {
+        id: 2,
+        parent_id: 1,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "a-span",
+        properties: [],
+    },
+]"#;
+    let actual = normalize_spans(records);
+    assert_eq_text!(expected, &actual);
+}

minitrace-macro/tests/spans/black-box-false-threads-async.rs

@@ -0,0 +1,42 @@
+use minitrace::trace;
+use test_utilities::*;
+
+// Span names passed via `enter_with_parent` override default names.
+// Reference:
+// - https://github.com/tikv/minitrace-rust/issues/122
+#[trace("a-span")]
+async fn f(a: u32) -> u32 {
+    a
+}
+
+#[tokio::main]
+async fn main() {
+    let (root, collector) = minitrace::Span::root("root");
+    {
+        let _child_span = minitrace::Span::enter_with_parent("test-span", &root);
+        f(1).await;
+    }
+    drop(root);
+    let records: Vec<minitrace::collector::SpanRecord> = futures::executor::block_on(collector.collect());
+
+    let expected = r#"[
+    SpanRecord {
+        id: 1,
+        parent_id: 0,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "root",
+        properties: [],
+    },
+    SpanRecord {
+        id: 2,
+        parent_id: 1,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "test-span",
+        properties: [],
+    },
+]"#;
+    let actual = normalize_spans(records);
+    assert_eq_text!(expected, &actual);
+}

minitrace-macro/tests/spans/black-box-false-threads-sync.rs

@@ -0,0 +1,41 @@
+use minitrace::trace;
+use test_utilities::*;
+
+// Span names passed via `enter_with_parent` override default names.
+// Reference:
+// - https://github.com/tikv/minitrace-rust/issues/122
+#[trace("a-span")]
+fn f(a: u32) -> u32 {
+    a
+}
+
+fn main() {
+    let (root, collector) = minitrace::Span::root("root");
+    {
+        let _sg1 = minitrace::Span::enter_with_parent("test-span", &root);
+        f(1);
+    }
+    drop(root);
+    let records: Vec<minitrace::collector::SpanRecord> =
+        futures::executor::block_on(collector.collect());
+    let expected = r#"[
+    SpanRecord {
+        id: 1,
+        parent_id: 0,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "root",
+        properties: [],
+    },
+    SpanRecord {
+        id: 2,
+        parent_id: 1,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "test-span",
+        properties: [],
+    },
+]"#;
+    let actual = normalize_spans(records);
+    assert_eq_text!(expected, &actual);
+}

minitrace-macro/tests/spans/default-name-local-async.rs

@@ -0,0 +1,39 @@
+use minitrace::trace;
+use test_utilities::*;
+
+#[trace]
+async fn fa(a: u32) -> u32 {
+    a
+}
+
+#[tokio::main]
+async fn main() {
+    let (root, collector) = minitrace::Span::root("root");
+    {
+        let _g = root.set_local_parent();
+        fa(1).await;
+    }
+    drop(root);
+    let records: Vec<minitrace::collector::SpanRecord> = futures::executor::block_on(collector.collect());
+
+    let expected = r#"[
+    SpanRecord {
+        id: 1,
+        parent_id: 0,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "root",
+        properties: [],
+    },
+    SpanRecord {
+        id: 2,
+        parent_id: 1,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "fa",
+        properties: [],
+    },
+]"#;
+    let actual = normalize_spans(records);
+    assert_eq_text!(expected, &actual);
+}

minitrace-macro/tests/spans/default-name-local-sync.rs

@@ -0,0 +1,38 @@
+use minitrace::trace;
+use test_utilities::*;
+
+#[trace]
+fn f(a: u64) {
+    std::thread::sleep(std::time::Duration::from_nanos(a));
+}
+
+fn main() {
+    let (root, collector) = minitrace::Span::root("root");
+    {
+        let _g = root.set_local_parent();
+        f(1);
+    }
+    drop(root);
+    let records: Vec<minitrace::collector::SpanRecord> =
+        futures::executor::block_on(collector.collect());
+    let expected = r#"[
+    SpanRecord {
+        id: 1,
+        parent_id: 0,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "root",
+        properties: [],
+    },
+    SpanRecord {
+        id: 2,
+        parent_id: 1,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "f",
+        properties: [],
+    },
+]"#;
+    let actual = normalize_spans(records);
+    assert_eq_text!(expected, &actual);
+}

minitrace-macro/tests/spans/default-name-threads-async.rs

@@ -0,0 +1,40 @@
+use minitrace::trace;
+use test_utilities::*;
+
+// Span names passed via `enter_with_parent` override default names.
+#[trace]
+async fn fa(a: u32) -> u32 {
+    a
+}
+
+#[tokio::main]
+async fn main() {
+    let (root, collector) = minitrace::Span::root("root");
+    {
+        let _child_span = minitrace::Span::enter_with_parent("test-span", &root);
+        fa(1).await;
+    }
+    drop(root);
+    let records: Vec<minitrace::collector::SpanRecord> = futures::executor::block_on(collector.collect());
+
+    let expected = r#"[
+    SpanRecord {
+        id: 1,
+        parent_id: 0,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "root",
+        properties: [],
+    },
+    SpanRecord {
+        id: 2,
+        parent_id: 1,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "test-span",
+        properties: [],
+    },
+]"#;
+    let actual = normalize_spans(records);
+    assert_eq_text!(expected, &actual);
+}

minitrace-macro/tests/spans/default-name-threads-sync.rs

@@ -0,0 +1,39 @@
+use minitrace::trace;
+use test_utilities::*;
+
+// Span names passed via `enter_with_parent` override default names.
+#[trace]
+fn f(a: u64) {
+    std::thread::sleep(std::time::Duration::from_nanos(a));
+}
+
+fn main() {
+    let (root, collector) = minitrace::Span::root("root");
+    {
+        let _g = minitrace::Span::enter_with_parent("test-span", &root);
+        f(1);
+    }
+    drop(root);
+    let records: Vec<minitrace::collector::SpanRecord> =
+        futures::executor::block_on(collector.collect());
+    let expected = r#"[
+    SpanRecord {
+        id: 1,
+        parent_id: 0,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "root",
+        properties: [],
+    },
+    SpanRecord {
+        id: 2,
+        parent_id: 1,
+        begin_unix_time_ns: \d+,
+        duration_ns: \d+,
+        event: "test-span",
+        properties: [],
+    },
+]"#;
+    let actual = normalize_spans(records);
+    assert_eq_text!(expected, &actual);
+}