diff --git a/AGENTS.md b/AGENTS.md deleted file mode 100644 index fb14d462..00000000 --- a/AGENTS.md +++ /dev/null @@ -1,61 +0,0 @@ -# Fastrace Agent Guide - -## Overview -- Fastrace is a high-performance tracing library focused on low overhead when disabled and fast collection when enabled. The workspace bundles the core tracer, a proc-macro, async/stream helpers, and reporters for Datadog, Jaeger, and OpenTelemetry. - -## Workspace Map -- `fastrace/` core library (types, collectors, local spans, future helpers). Critical files: `src/span.rs`, `src/local/*`, `src/collector/*`, `src/future.rs`, `src/macros.rs`. -- `fastrace-macro/` implements the `#[trace]` attribute and codegen rules. -- Reporter crates: `fastrace-jaeger/`, `fastrace-datadog/`, `fastrace-opentelemetry/`. -- Async/stream integration: `fastrace-futures/`. -- Examples in `examples/*.rs`; integration tests in `fastrace/tests`; UI macro tests under `tests/macros`. -- `tests/statically-disable/` ensures the crate still compiles as a no-op when `enable` feature is absent. - -## Runtime & Data Flow -- Applications call `set_reporter` (e.g., `ConsoleReporter`, Datadog/Jaeger/OTel) to spin up a background global collector thread (`collector/global_collector.rs`). It polls per-thread SPSC queues (`util/spsc.rs`) at `Config.report_interval`. -- `Span::root` allocates a collect_id (if sampled) and stores a `CollectToken` describing parent linkage and sampling. Dropping a span records end time and submits a `SpanSet` to the global collector; root spans also emit `DropCollect`. -- `LocalParentGuard` from `Span::set_local_parent` installs a thread-local `LocalSpanStack`; dropping the guard drains collected `LocalSpan`s and submits them as `SpanSet::LocalSpansInner`. -- The collector converts `RawSpan`s into `SpanRecord`s using a single `Anchor` for timestamp to unix conversion. Events and property-only raw entries are re-attached to their parent in `mount_danglings`. -- Tail sampling: spans are held until root commit; `Span::cancel()` on the root triggers `CancelCollect` to discard the trace. - -## Key Types & Behaviors -- `Span` (`fastrace/src/span.rs`): thread-safe span, can be cross-thread; supports `enter_with_parent(s)`, `enter_with_local_parent`, `add_event`, `add_properties`, `push_child_spans`, `elapsed`, `cancel`. -- `LocalSpan` (`local/local_span.rs`): single-thread fast path; requires an active local parent (`Span::set_local_parent` or nested `LocalSpan`). Stack discipline enforced; dropping out of order panics in tests. -- `LocalCollector` (`local/local_collector.rs`): start/collect local spans when parent may be set later; returns `LocalSpans` attachable via `Span::push_child_spans` or convertible to `SpanRecord`s without a reporter. -- ID types (`collector/id.rs`): `TraceId(u128)`, `SpanId(u64)`; thread-local generator (`SpanId::next_id`) and W3C traceparent encode/decode helpers. `SpanContext` carries trace, parent span id, and `sampled` flag. -- `Config` (`collector/mod.rs`): `report_interval`; note `max_spans_per_trace` deprecated no-op and `tail_sampled` deprecated no-op. -- `Reporter` trait (`collector/global_collector.rs`): synchronous `report(Vec)`. TestReporter collects into a shared Vec; ConsoleReporter prints. -- Async adapters: `FutureExt::{in_span, enter_on_poll}` (`src/future.rs`); Stream/Sink adapters in `fastrace-futures`. -- Proc macro `#[trace]` (`fastrace-macro/src/lib.rs`): wraps sync fns with `LocalSpan`; async fns with `Span::enter_with_local_parent` plus `in_span` by default or `enter_on_poll=true`. Options: `name`, `short_name`, `enter_on_poll`, `properties={k:"fmt"}`, `crate=path`. -- `enable` feature gates runtime collection; workspace members (examples/tests) request it, so full builds usually compile with tracing enabled. Ensure any changes keep the no-feature path compiling (many functions are #[cfg(feature="enable")] guarded). - -## Reporters -- Datadog (`fastrace-datadog/src/lib.rs`): maps `SpanRecord` to msgpack payload; send to `http://{agent}/v0.4/traces`. -- Jaeger (`fastrace-jaeger/src/lib.rs`): UDP compact-thrift batches; splits batches to fit 8k. -- OpenTelemetry (`fastrace-opentelemetry/src/lib.rs`): maps properties to OTel semantics (`span.kind`, `span.status_code`, `span.status_description`, `span.parent_span_is_remote`); filters those keys out of attributes; uses provided exporter + instrumentation scope. - -## Testing & Examples -- Core integration tests (`fastrace/tests/lib.rs`) use `TestReporter` snapshots (insta) and serial execution; cover multi-thread spans, macro behavior, properties/events, sampling, and LocalCollector workflow. -- Macro UI tests (`tests/macros`) exercise error cases via trybuild. -- Examples: `cargo run --example basic|synchronous|asynchronous` demonstrate setup; `examples/logging.rs` shows log integration; `examples/sampling.rs` tail-sampling. -- Statically-disabled check: `cargo run --package test-statically-disable` builds with `enable` off. - -## Development Workflow (executed 2025-12-15) -- `cargo test --workspace` -- `cargo clippy --all-targets --all-features -- -D warnings` -- `cargo run --example asynchronous` -- `cargo run --example synchronous` -- `cargo run --example basic` -- `cargo run --package test-statically-disable` - -## Gotchas & Tips -- Always call `set_reporter` early; spans emitted before reporter init are dropped. Call `flush()` before shutdown to drain SPSC queues. -- `LocalSpan` does nothing without a local parent; `Span::enter_with_local_parent` falls back to noop if no stack token exists. -- Default local stack capacity: 4096 span lines and span queue size 10240; overflows drop spans silently (return None). -- Tail sampling is the default; `Span::cancel()` on the root discards spans collected up to the root's drop (spans submitted after the root finishes may still be reported). -- Keep both code paths healthy: when `enable` is off, public APIs stay callable but must remain no-ops without panicking. - -## Where to Start -- Trace lifecycle: `fastrace/src/span.rs` (Span), `fastrace/src/local/*` (LocalSpan stack), `fastrace/src/collector/global_collector.rs` (queue + reporting). -- Macro instrumentation rules: `fastrace-macro/src/lib.rs`. -- Reporter mapping details: respective reporter crates above. diff --git a/Cargo.lock b/Cargo.lock index b2ed6c52..a8ef0503 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,7 +33,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -44,7 +44,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -53,12 +53,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "autocfg" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" - [[package]] name = "base64" version = "0.22.1" @@ -77,28 +71,12 @@ version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - [[package]] name = "bytes" version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" -[[package]] -name = "cc" -version = "1.2.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f" -dependencies = [ - "find-msvc-tools", - "shlex", -] - [[package]] name = "cfg-if" version = "1.0.4" @@ -148,7 +126,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.52.0", + "windows-sys", ] [[package]] @@ -165,35 +143,9 @@ checksum = "d64e8af5551369d19cf50138de61f1c42074ab970f74e99be916646777f8fc87" dependencies = [ "encode_unicode", "libc", - "windows-sys 0.61.2", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" -dependencies = [ - "core-foundation-sys", - "libc", + "windows-sys", ] -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - [[package]] name = "cpufeatures" version = "0.3.0" @@ -259,17 +211,6 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" -[[package]] -name = "displaydoc" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "divan" version = "0.1.21" @@ -292,7 +233,7 @@ checksum = "9556bc800956545d6420a640173e5ba7dfa82f38d3ea5a167eb555bc69ac3323" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -313,15 +254,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -335,7 +267,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -344,8 +276,6 @@ version = "0.0.0" dependencies = [ "anyhow", "fastrace", - "fastrace-datadog", - "fastrace-jaeger", "fastrace-opentelemetry", "log", "logcall", @@ -398,17 +328,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "fastrace-datadog" -version = "0.7.18" -dependencies = [ - "fastrace", - "log", - "reqwest", - "rmp-serde", - "serde", -] - [[package]] name = "fastrace-futures" version = "0.7.18" @@ -422,15 +341,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "fastrace-jaeger" -version = "0.7.18" -dependencies = [ - "fastrace", - "log", - "thrift_codec", -] - [[package]] name = "fastrace-macro" version = "0.7.18" @@ -438,7 +348,7 @@ dependencies = [ "fastrace", "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -462,12 +372,6 @@ dependencies = [ "getrandom 0.3.4", ] -[[package]] -name = "find-msvc-tools" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" - [[package]] name = "flume" version = "0.12.0" @@ -492,30 +396,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" -dependencies = [ - "percent-encoding", -] - [[package]] name = "fragile" version = "2.1.0" @@ -581,7 +461,7 @@ checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -619,17 +499,6 @@ dependencies = [ "slab", ] -[[package]] -name = "getrandom" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - [[package]] name = "getrandom" version = "0.3.4" @@ -666,9 +535,9 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "h2" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733" +checksum = "6cb093c84e8bd9b188d4c4a8cb6579fc016968d14c99882163cd3ff402a4f155" dependencies = [ "atomic-waker", "bytes", @@ -706,9 +575,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "http" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0" +checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" dependencies = [ "bytes", "itoa", @@ -764,21 +633,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.27.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" -dependencies = [ - "http", - "hyper", - "hyper-util", - "rustls", - "tokio", - "tokio-rustls", - "tower-service", -] - [[package]] name = "hyper-timeout" version = "0.5.2" @@ -792,127 +646,24 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ - "base64", "bytes", "futures-channel", "futures-util", "http", "http-body", "hyper", - "ipnet", "libc", - "percent-encoding", "pin-project-lite", "socket2", - "system-configuration", "tokio", "tower-service", "tracing", - "windows-registry", -] - -[[package]] -name = "icu_collections" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" -dependencies = [ - "displaydoc", - "potential_utf", - "utf8_iter", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locale_core" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_normalizer" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" -dependencies = [ - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" - -[[package]] -name = "icu_properties" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" -dependencies = [ - "icu_collections", - "icu_locale_core", - "icu_properties_data", - "icu_provider", - "zerotrie", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" - -[[package]] -name = "icu_provider" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" -dependencies = [ - "displaydoc", - "icu_locale_core", - "writeable", - "yoke", - "zerofrom", - "zerotrie", - "zerovec", ] [[package]] @@ -921,27 +672,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" -[[package]] -name = "idna" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" -dependencies = [ - "idna_adapter", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "idna_adapter" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" -dependencies = [ - "icu_normalizer", - "icu_properties", -] - [[package]] name = "indexmap" version = "2.14.0" @@ -956,9 +686,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.47.2" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4a6248eb93a4401ed2f37dfe8ea592d3cf05b7cf4f8efa867b6895af7e094e" +checksum = "86f0f8fee8c926415c58d6ae43a08523a26faccb2323f5e6b644fe7dd4ef6b82" dependencies = [ "console", "once_cell", @@ -966,12 +696,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "ipnet" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" - [[package]] name = "itertools" version = "0.14.0" @@ -1010,7 +734,7 @@ checksum = "782d32378dddf207193ac91cefb848ad41abb58195c95168e1291227a0832b47" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -1030,13 +754,12 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.99" +version = "0.3.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11" +checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31" dependencies = [ "cfg-if", "futures-util", - "once_cell", "wasm-bindgen", ] @@ -1064,12 +787,6 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" -[[package]] -name = "litemap" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" - [[package]] name = "lock_api" version = "0.4.14" @@ -1093,7 +810,7 @@ checksum = "003d767f357cf1f04a444766b2646682a75732505d71553d02f81c6848e0533e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -1198,15 +915,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" - -[[package]] -name = "mime" -version = "0.3.17" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" [[package]] name = "mio" @@ -1216,7 +927,7 @@ checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" dependencies = [ "libc", "wasi", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -1242,24 +953,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.117", -] - -[[package]] -name = "native-tls" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", + "syn", ] [[package]] @@ -1268,16 +962,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", + "windows-sys", ] [[package]] @@ -1286,49 +971,6 @@ version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" -[[package]] -name = "openssl" -version = "0.10.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - -[[package]] -name = "openssl-probe" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" - -[[package]] -name = "openssl-sys" -version = "0.9.116" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "opentelemetry" version = "0.32.0" @@ -1434,7 +1076,7 @@ checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -1443,12 +1085,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" -[[package]] -name = "pkg-config" -version = "0.3.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" - [[package]] name = "pollster" version = "0.4.0" @@ -1470,15 +1106,6 @@ dependencies = [ "portable-atomic", ] -[[package]] -name = "potential_utf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" -dependencies = [ - "zerovec", -] - [[package]] name = "ppv-lite86" version = "0.2.21" @@ -1521,7 +1148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.117", + "syn", ] [[package]] @@ -1553,7 +1180,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -1648,182 +1275,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973" [[package]] -name = "reqwest" -version = "0.12.28" +name = "rtrb" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" -dependencies = [ - "base64", - "bytes", - "encoding_rs", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-tls", - "hyper-util", - "js-sys", - "log", - "mime", - "native-tls", - "percent-encoding", - "pin-project-lite", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-native-tls", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] +checksum = "4ade083ccbb4bf536df69d1f6432cc23deb7acccff86b183f3923a6fd56a1153" [[package]] -name = "ring" -version = "0.17.14" +name = "rustix" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.17", + "bitflags", + "errno", "libc", - "untrusted", - "windows-sys 0.52.0", + "linux-raw-sys", + "windows-sys", ] [[package]] -name = "rmp" -version = "0.8.15" +name = "rustversion" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ba8be72d372b2c9b35542551678538b562e7cf86c3315773cae48dfbfe7790c" -dependencies = [ - "num-traits", -] +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] -name = "rmp-serde" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f81bee8c8ef9b577d1681a70ebbc962c232461e397b22c208c43c04b67a155" -dependencies = [ - "rmp", - "serde", -] - -[[package]] -name = "rtrb" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ade083ccbb4bf536df69d1f6432cc23deb7acccff86b183f3923a6fd56a1153" - -[[package]] -name = "rustix" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.61.2", -] - -[[package]] -name = "rustls" -version = "0.23.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" -dependencies = [ - "once_cell", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pki-types" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" -dependencies = [ - "zeroize", -] - -[[package]] -name = "rustls-webpki" -version = "0.103.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" - -[[package]] -name = "ryu" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" - -[[package]] -name = "schannel" -version = "0.1.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" +name = "scopeguard" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "security-framework" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" -dependencies = [ - "bitflags", - "core-foundation 0.10.1", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "semver" version = "1.0.28" @@ -1857,7 +1338,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -1882,18 +1363,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - [[package]] name = "serial_test" version = "3.5.0" @@ -1916,7 +1385,7 @@ checksum = "94e153fc76e1c6a068703d6d29c508a0b15c061c4b7e43da59cc097bc342673c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -1928,12 +1397,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shlex" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" - [[package]] name = "signal-hook-registry" version = "1.4.8" @@ -1964,9 +1427,9 @@ checksum = "88414a5ca1f85d82cc34471e975f0f74f6aa54c40f062efa42c0080e7f763f81" [[package]] name = "smallvec" -version = "1.15.1" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" [[package]] name = "socket2" @@ -1975,7 +1438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -1987,34 +1450,11 @@ dependencies = [ "lock_api", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - [[package]] name = "syn" -version = "1.0.109" +version = "2.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" dependencies = [ "proc-macro2", "quote", @@ -2026,41 +1466,6 @@ name = "sync_wrapper" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -dependencies = [ - "futures-core", -] - -[[package]] -name = "synstructure" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - -[[package]] -name = "system-configuration" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" -dependencies = [ - "bitflags", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] [[package]] name = "target-triple" @@ -2078,7 +1483,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -2097,7 +1502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874" dependencies = [ "rustix", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -2114,7 +1519,7 @@ checksum = "540dedb2dcfa0cff7a79ec955936440a13a75839b6ac14b834a8bbae929bb489" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -2155,7 +1560,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -2167,26 +1572,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "thrift_codec" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d957f535b242b91aa9f47bde08080f9a6fef276477e55b0079979d002759d5" -dependencies = [ - "byteorder", - "trackable", -] - -[[package]] -name = "tinystr" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" -dependencies = [ - "displaydoc", - "zerovec", -] - [[package]] name = "tokio" version = "1.52.3" @@ -2201,7 +1586,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -2212,27 +1597,7 @@ checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" -dependencies = [ - "rustls", - "tokio", + "syn", ] [[package]] @@ -2365,24 +1730,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" -dependencies = [ - "bitflags", - "bytes", - "futures-util", - "http", - "http-body", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", - "url", -] - [[package]] name = "tower-layer" version = "0.3.3" @@ -2414,7 +1761,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] @@ -2468,25 +1815,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "trackable" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15bd114abb99ef8cee977e517c8f37aee63f184f2d08e3e6ceca092373369ae" -dependencies = [ - "trackable_derive", -] - -[[package]] -name = "trackable_derive" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebeb235c5847e2f82cfe0f07eb971d1e5f6804b18dac2ae16349cc604380f82f" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "try-lock" version = "0.2.5" @@ -2520,42 +1848,12 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - [[package]] name = "valuable" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "want" version = "0.3.1" @@ -2573,9 +1871,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.3+wasi-0.2.9" +version = "1.0.4+wasi-0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" +checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" dependencies = [ "wit-bindgen 0.57.1", ] @@ -2591,9 +1889,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.122" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409" +checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a" dependencies = [ "cfg-if", "once_cell", @@ -2602,21 +1900,11 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "wasm-bindgen-macro" -version = "0.2.122" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6" +checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2624,22 +1912,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.122" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e" +checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.117", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.122" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437" +checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f" dependencies = [ "unicode-ident", ] @@ -2678,16 +1966,6 @@ dependencies = [ "semver", ] -[[package]] -name = "web-sys" -version = "0.3.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "web-time" version = "1.1.0" @@ -2704,7 +1982,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -2713,44 +1991,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -[[package]] -name = "windows-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" -dependencies = [ - "windows-link", - "windows-result", - "windows-strings", -] - -[[package]] -name = "windows-result" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-strings" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", -] - [[package]] name = "windows-sys" version = "0.61.2" @@ -2760,70 +2000,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - [[package]] name = "winnow" version = "1.0.3" @@ -2866,7 +2042,7 @@ dependencies = [ "heck", "indexmap", "prettyplease", - "syn 2.0.117", + "syn", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -2882,7 +2058,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.117", + "syn", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -2924,113 +2100,24 @@ dependencies = [ "wasmparser", ] -[[package]] -name = "writeable" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" - -[[package]] -name = "yoke" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" -dependencies = [ - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", - "synstructure", -] - [[package]] name = "zerocopy" -version = "0.8.50" +version = "0.8.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1" +checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - -[[package]] -name = "zerofrom" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", - "synstructure", -] - -[[package]] -name = "zeroize" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" - -[[package]] -name = "zerotrie" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", -] - -[[package]] -name = "zerovec" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.11.3" +version = "0.8.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 6196bca6..f3caba9c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,8 +2,6 @@ members = [ "fastrace", "fastrace-macro", - "fastrace-jaeger", - "fastrace-datadog", "fastrace-opentelemetry", "fastrace-futures", @@ -26,9 +24,7 @@ fastrace = { version = "0.7.18", path = "fastrace" } fastrace-macro = { version = "0.7.18", path = "fastrace-macro" } # Workspace leaves -fastrace-datadog = { path = "fastrace-datadog" } fastrace-futures = { path = "fastrace-futures" } -fastrace-jaeger = { path = "fastrace-jaeger" } fastrace-opentelemetry = { path = "fastrace-opentelemetry" } # crates.io dependencies diff --git a/README.md b/README.md index 35af67cf..a98cb37a 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Features: - [Extremely fast](#benchmarks) - [Rich features for logging](https://github.com/fast/fastrace/blob/main/examples/logging.rs) -- Compatible with [Jaeger], [Datadog], and [OpenTelemetry] +- Compatible with [OpenTelemetry] ## Resources @@ -99,8 +99,6 @@ Fastrace is built against the latest stable release. The minimum supported versi Fastrace supports multiple out-of-box reporters to export spans: -- [`fastrace-jaeger`](https://crates.io/crates/fastrace-jaeger): Export spans to [Jaeger](https://www.jaegertracing.io/) -- [`fastrace-datadog`](https://crates.io/crates/fastrace-datadog): Export spans to [Datadog](https://www.datadoghq.com/) - [`fastrace-opentelemetry`](https://crates.io/crates/fastrace-opentelemetry): Export spans to [OpenTelemetry](https://opentelemetry.io/) ## Integrations @@ -173,8 +171,6 @@ In this context, Fastrace offers a more efficient solution by filtering out enti [Docs]: https://docs.rs/fastrace/ [Examples]: https://github.com/fast/fastrace/tree/main/examples [OpenTelemetry]: https://opentelemetry.io/ -[Jaeger]: https://crates.io/crates/fastrace-jaeger -[Datadog]: https://crates.io/crates/fastrace-datadog ## Benchmarks diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 0a0e4ff0..c74ce1f7 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -14,8 +14,6 @@ release = false [dev-dependencies] anyhow = { version = "1.0.98" } fastrace = { workspace = true, features = ["enable"] } -fastrace-datadog = { workspace = true } -fastrace-jaeger = { workspace = true } fastrace-opentelemetry = { workspace = true } log = { workspace = true } logcall = { version = "0.2.0" } diff --git a/examples/asynchronous.rs b/examples/asynchronous.rs index 3e9407cb..7b038da3 100644 --- a/examples/asynchronous.rs +++ b/examples/asynchronous.rs @@ -16,8 +16,6 @@ // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0. // [1]: https://github.com/tikv/minitrace-rust/blob/v0.6.4/minitrace/examples/asynchronous.rs -#![allow(clippy::new_without_default)] - use std::borrow::Cow; use fastrace::collector::Config; @@ -36,7 +34,7 @@ fn parallel_job() -> Vec> { } async fn iter_job(iter: u64) { - std::thread::sleep(std::time::Duration::from_millis(iter * 10)); + tokio::time::sleep(std::time::Duration::from_millis(iter * 10)).await; tokio::task::yield_now().await; other_job().await; } @@ -47,7 +45,7 @@ async fn other_job() { if i == 10 { tokio::task::yield_now().await; } - std::thread::sleep(std::time::Duration::from_millis(1)); + tokio::time::sleep(std::time::Duration::from_millis(1)).await; } } @@ -81,25 +79,12 @@ async fn main() { } pub struct ReportAll { - jaeger: fastrace_jaeger::JaegerReporter, - datadog: fastrace_datadog::DatadogReporter, opentelemetry: fastrace_opentelemetry::OpenTelemetryReporter, } impl ReportAll { pub fn create() -> ReportAll { ReportAll { - jaeger: fastrace_jaeger::JaegerReporter::new( - "127.0.0.1:6831".parse().unwrap(), - "asynchronous", - ) - .unwrap(), - datadog: fastrace_datadog::DatadogReporter::new( - "127.0.0.1:8126".parse().unwrap(), - "asynchronous", - "db", - "select", - ), opentelemetry: fastrace_opentelemetry::OpenTelemetryReporter::new( opentelemetry_otlp::SpanExporter::builder() .with_tonic() @@ -126,8 +111,6 @@ impl ReportAll { impl Reporter for ReportAll { fn report(&mut self, spans: Vec) { - self.jaeger.report(spans.clone()); - self.datadog.report(spans.clone()); self.opentelemetry.report(spans); } } diff --git a/examples/synchronous.rs b/examples/synchronous.rs index d2bc0d73..b0a4f49a 100644 --- a/examples/synchronous.rs +++ b/examples/synchronous.rs @@ -56,25 +56,12 @@ async fn main() { } pub struct ReportAll { - jaeger: fastrace_jaeger::JaegerReporter, - datadog: fastrace_datadog::DatadogReporter, opentelemetry: fastrace_opentelemetry::OpenTelemetryReporter, } impl ReportAll { pub fn create() -> ReportAll { ReportAll { - jaeger: fastrace_jaeger::JaegerReporter::new( - "127.0.0.1:6831".parse().unwrap(), - "synchronous", - ) - .unwrap(), - datadog: fastrace_datadog::DatadogReporter::new( - "127.0.0.1:8126".parse().unwrap(), - "synchronous", - "db", - "select", - ), opentelemetry: fastrace_opentelemetry::OpenTelemetryReporter::new( opentelemetry_otlp::SpanExporter::builder() .with_tonic() @@ -101,8 +88,6 @@ impl ReportAll { impl Reporter for ReportAll { fn report(&mut self, spans: Vec) { - self.jaeger.report(spans.clone()); - self.datadog.report(spans.clone()); self.opentelemetry.report(spans); } } diff --git a/fastrace-datadog/Cargo.toml b/fastrace-datadog/Cargo.toml deleted file mode 100644 index 8398578a..00000000 --- a/fastrace-datadog/Cargo.toml +++ /dev/null @@ -1,23 +0,0 @@ -[package] -name = "fastrace-datadog" -version = "0.7.18" - -categories = ["development-tools::debugging"] -description = "Datadog reporter for fastrace" -documentation = "https://docs.rs/fastrace-datadog" -keywords = ["tracing", "span", "datadog", "jaeger", "opentelemetry"] -readme = "README.md" - -edition.workspace = true -license.workspace = true -repository.workspace = true -rust-version.workspace = true - -[dependencies] -fastrace = { workspace = true } -log = { workspace = true } -reqwest = { version = "0.12", features = ["blocking"] } -rmp-serde = "1.3" -serde = { workspace = true } - -[dev-dependencies] diff --git a/fastrace-datadog/LICENSE b/fastrace-datadog/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/fastrace-datadog/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/fastrace-datadog/README.md b/fastrace-datadog/README.md deleted file mode 100644 index a79458a2..00000000 --- a/fastrace-datadog/README.md +++ /dev/null @@ -1,118 +0,0 @@ -# fastrace-datadog - -[![Documentation](https://docs.rs/fastrace-datadog/badge.svg)](https://docs.rs/fastrace-datadog/) -[![Crates.io](https://img.shields.io/crates/v/fastrace-datadog.svg)](https://crates.io/crates/fastrace-datadog) -[![LICENSE](https://img.shields.io/github/license/fast/fastrace.svg)](https://github.com/fast/fastrace/blob/main/LICENSE) - -[Datadog](https://docs.datadoghq.com/tracing/) reporter for [`fastrace`](https://crates.io/crates/fastrace). - -> [!WARNING] -> -> `fastrace-datadog` is deprecated in favor of [`fastrace-opentelemetry`](https://crates.io/crates/fastrace-opentelemetry). -> -> The Datadog Agent ingests OTLP natively, so traces can be sent through `fastrace-opentelemetry` instead. -> -> See [Migration](#migration-to-fastrace-opentelemetry) below. - -## Migration to fastrace-opentelemetry - -The Datadog Agent ingests OTLP natively. First, enable OTLP ingestion in your Agent (see Datadog's [OTLP ingest docs](https://docs.datadoghq.com/opentelemetry/interoperability/otlp_ingest_in_the_agent/)). Then replace the reporter with `fastrace-opentelemetry` pointed at the Agent's OTLP endpoint (gRPC `4317` by default). Your instrumentation (`Span::root`, `#[trace]`, ...) stays the same — only the reporter setup changes. - -Update your dependencies: - -```toml -[dependencies] -fastrace = { version = "0.7", features = ["enable"] } -fastrace-opentelemetry = { version = "0.18.0" } -opentelemetry = { version = "0.32.0", default-features = false, features = ["trace"] } -opentelemetry-otlp = { version = "0.32.0", default-features = false, features = ["trace", "grpc-tonic"] } -opentelemetry_sdk = { version = "0.32.0", default-features = false, features = ["trace"] } -``` - -**Before** (deprecated): - -```rust,ignore -let reporter = fastrace_datadog::DatadogReporter::new( - "127.0.0.1:8126".parse().unwrap(), - "my-service", - "db", - "select", -); -fastrace::set_reporter(reporter, Config::default()); -``` - -**After** (OTLP to the Datadog Agent): - -```rust,ignore -use std::borrow::Cow; - -use fastrace::collector::Config; -use fastrace_opentelemetry::OpenTelemetryReporter; -use opentelemetry::InstrumentationScope; -use opentelemetry::KeyValue; -use opentelemetry_otlp::SpanExporter; -use opentelemetry_otlp::WithExportConfig; -use opentelemetry_sdk::Resource; - -let reporter = OpenTelemetryReporter::new( - SpanExporter::builder() - .with_tonic() - .with_endpoint("http://127.0.0.1:4317".to_string()) // Datadog Agent OTLP endpoint - .with_protocol(opentelemetry_otlp::Protocol::Grpc) - .with_timeout(opentelemetry_otlp::OTEL_EXPORTER_OTLP_TIMEOUT_DEFAULT) - .build() - .expect("initialize otlp exporter"), - Cow::Owned( - Resource::builder() - .with_service_name("my-service") - .with_attributes([KeyValue::new("span.resource", "db")]) - .with_attributes([KeyValue::new("span.type", "select")]) - .build(), - ), - InstrumentationScope::builder("my-crate") - .with_version(env!("CARGO_PKG_VERSION")) - .build(), -); -fastrace::set_reporter(reporter, Config::default()); -``` - -## Dependencies - -```toml -[dependencies] -fastrace = "0.7" -fastrace-datadog = "0.7" -``` - -## Setup Datadog Agent - -Please follow the Datadog [official documentation](https://docs.datadoghq.com/getting_started/tracing/#datadog-agent). - -```sh -cargo run --example synchronous -``` - -## Report to Datadog Agent - -```rust -use std::net::SocketAddr; - -use fastrace::collector::Config; -use fastrace::prelude::*; - -// Initialize reporter -let reporter = fastrace_datadog::DatadogReporter::new( - "127.0.0.1:8126".parse().unwrap(), - "asynchronous", - "db", - "select", -); -fastrace::set_reporter(reporter, Config::default()); - -{ - // Start tracing - let root = Span::root("root", SpanContext::random()); -} - -fastrace::flush(); -``` diff --git a/fastrace-datadog/src/lib.rs b/fastrace-datadog/src/lib.rs deleted file mode 100644 index 0cc30cbd..00000000 --- a/fastrace-datadog/src/lib.rs +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0. - -#![doc = include_str!("../README.md")] - -use std::collections::HashMap; -use std::net::SocketAddr; - -use fastrace::collector::Reporter; -use fastrace::prelude::*; -use rmp_serde::Serializer; -use serde::Serialize; - -/// [Datadog](https://docs.datadoghq.com/tracing/) reporter for `fastrace` in msgpack format. -pub struct DatadogReporter { - agent_addr: SocketAddr, - service_name: String, - resource: String, - trace_type: String, -} - -impl DatadogReporter { - pub fn new( - agent_addr: SocketAddr, - service_name: impl Into, - resource: impl Into, - trace_type: impl Into, - ) -> DatadogReporter { - DatadogReporter { - agent_addr, - service_name: service_name.into(), - resource: resource.into(), - trace_type: trace_type.into(), - } - } - - fn convert<'a>(&'a self, spans: &'a [SpanRecord]) -> Vec> { - spans - .iter() - .map(move |s| DatadogSpan { - name: &s.name, - service: &self.service_name, - trace_type: &self.trace_type, - resource: &self.resource, - start: s.begin_time_unix_ns as i64, - duration: s.duration_ns as i64, - meta: if s.properties.is_empty() { - None - } else { - Some( - s.properties - .iter() - .map(|(k, v)| (k.as_ref(), v.as_ref())) - .collect(), - ) - }, - error_code: 0, - span_id: s.span_id.0, - trace_id: s.trace_id.0 as u64, - parent_id: s.parent_id.0, - }) - .collect() - } - - fn serialize(&self, spans: Vec) -> Result, Box> { - let mut buf = vec![0b10010001]; - spans.serialize(&mut Serializer::new(&mut buf).with_struct_map())?; - Ok(buf) - } - - fn try_report(&self, spans: Vec) -> Result<(), Box> { - let datadog_spans = self.convert(&spans); - let bytes = self.serialize(datadog_spans)?; - let client = reqwest::blocking::Client::new(); - let _rep = client - .post(format!("http://{}/v0.4/traces", self.agent_addr)) - .header("Datadog-Meta-Tracer-Version", "v1.27.0") - .header("Content-Type", "application/msgpack") - .body(bytes) - .send()?; - Ok(()) - } -} - -impl Reporter for DatadogReporter { - fn report(&mut self, spans: Vec) { - if spans.is_empty() { - return; - } - - if let Err(err) = self.try_report(spans) { - log::error!("report to datadog failed: {err}"); - } - } -} - -#[derive(Serialize)] -struct DatadogSpan<'a> { - name: &'a str, - service: &'a str, - #[serde(rename = "type")] - trace_type: &'a str, - resource: &'a str, - start: i64, - duration: i64, - #[serde(skip_serializing_if = "Option::is_none")] - meta: Option>, - error_code: i32, - span_id: u64, - trace_id: u64, - parent_id: u64, -} diff --git a/fastrace-futures/Cargo.toml b/fastrace-futures/Cargo.toml index 60cdab8f..b04d3e67 100644 --- a/fastrace-futures/Cargo.toml +++ b/fastrace-futures/Cargo.toml @@ -5,7 +5,7 @@ version = "0.7.18" categories = ["development-tools::debugging"] description = "Utilities for tracing `futures` with fastrace" documentation = "https://docs.rs/fastrace-futures" -keywords = ["tracing", "span", "futures", "jaeger", "opentelemetry"] +keywords = ["tracing", "span", "futures", "opentelemetry"] readme = "README.md" edition.workspace = true diff --git a/fastrace-jaeger/Cargo.toml b/fastrace-jaeger/Cargo.toml deleted file mode 100644 index 4203189f..00000000 --- a/fastrace-jaeger/Cargo.toml +++ /dev/null @@ -1,21 +0,0 @@ -[package] -name = "fastrace-jaeger" -version = "0.7.18" - -categories = ["development-tools::debugging"] -description = "Jaeger reporter for fastrace" -documentation = "https://docs.rs/fastrace-jaeger" -keywords = ["tracing", "span", "datadog", "jaeger", "opentelemetry"] -readme = "README.md" - -edition.workspace = true -license.workspace = true -repository.workspace = true -rust-version.workspace = true - -[dependencies] -fastrace = { workspace = true } -log = { workspace = true } -thrift_codec = "0.3" - -[dev-dependencies] diff --git a/fastrace-jaeger/LICENSE b/fastrace-jaeger/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/fastrace-jaeger/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/fastrace-jaeger/README.md b/fastrace-jaeger/README.md deleted file mode 100644 index a74a7fbb..00000000 --- a/fastrace-jaeger/README.md +++ /dev/null @@ -1,118 +0,0 @@ -# fastrace-jaeger - -[![Documentation](https://docs.rs/fastrace-jaeger/badge.svg)](https://docs.rs/fastrace-jaeger/) -[![Crates.io](https://img.shields.io/crates/v/fastrace-jaeger.svg)](https://crates.io/crates/fastrace-jaeger) -[![LICENSE](https://img.shields.io/github/license/fast/fastrace.svg)](https://github.com/fast/fastrace/blob/main/LICENSE) - -[Jaeger](https://www.jaegertracing.io/) reporter for [`fastrace`](https://crates.io/crates/fastrace). - -> [!WARNING] -> -> `fastrace-jaeger` is deprecated in favor of [`fastrace-opentelemetry`](https://crates.io/crates/fastrace-opentelemetry). -> -> Jaeger has supported OTLP natively since v1.35 — the path Jaeger now recommends — and a dedicated Jaeger reporter only duplicates `fastrace-opentelemetry`. -> -> See [Migrating to fastrace-opentelemetry](#migrating-to-fastrace-opentelemetry) below. - -## Dependencies - -```toml -[dependencies] -fastrace = "0.7" -fastrace-jaeger = "0.7" -``` - -## Setup Jaeger Agent - -```sh -docker run --rm -d -p6831:6831/udp -p14268:14268 -p16686:16686 --name jaeger jaegertracing/all-in-one:1.6.0 - -cargo run --example synchronous -``` - -Web UI is available on [http://127.0.0.1:16686/](http://127.0.0.1:16686/) - -## Report to Jaeger Agent - -```rust -// deprecated -use std::net::SocketAddr; - -use fastrace::collector::Config; -use fastrace::prelude::*; -use fastrace_jaeger::JaegerReporter; - -// Initialize reporter -let reporter = JaegerReporter::new("127.0.0.1:6831".parse().unwrap(), "asynchronous").unwrap(); -fastrace::set_reporter(reporter, Config::default()); - -{ - // Start tracing - let root = Span::root("root", SpanContext::random()); -} - -fastrace::flush(); -``` - -### Migrating to fastrace-opentelemetry - -`fastrace-opentelemetry` exports via OTLP, which Jaeger accepts natively (v1.35+). Your instrumentation (`Span::root`, `#[trace]`, ...) stays the same — only the reporter changes. - -For example, given that you have a Jaeger stack as below: - -```shell -docker run --rm -d -p6831:6831/udp -p14268:14268 -p16686:16686 -p4317:4317 --name jaeger jaegertracing/all-in-one:1.76.0 -``` - -You can report to it via OTLP as below: - -First, update your dependencies: - -```toml -[dependencies] -fastrace = { version = "0.7", features = ["enable"] } -fastrace-opentelemetry = { version = "0.18.0" } -opentelemetry = { version = "0.32.0", default-features = false, features = ["trace"] } -opentelemetry-otlp = { version = "0.32.0", default-features = false, features = ["trace", "grpc-tonic"] } -opentelemetry_sdk = { version = "0.32.0", default-features = false, features = ["trace"] } -``` - -Then, initialize `OpenTelemetryReporter` with OTLP exporter: - -```rust,ignore -use std::borrow::Cow; - -use fastrace::collector::Config; -use fastrace::prelude::*; -use fastrace_opentelemetry::OpenTelemetryReporter; -use opentelemetry::InstrumentationScope; -use opentelemetry::KeyValue; -use opentelemetry_otlp::SpanExporter; -use opentelemetry_otlp::WithExportConfig; -use opentelemetry_sdk::Resource; - -// Initialize reporter -let reporter = OpenTelemetryReporter::new( - SpanExporter::builder() - .with_tonic() - .with_endpoint("http://127.0.0.1:4317".to_string()) - .with_protocol(opentelemetry_otlp::Protocol::Grpc) - .with_timeout(opentelemetry_otlp::OTEL_EXPORTER_OTLP_TIMEOUT_DEFAULT) - .build() - .expect("initialize otlp exporter"), - Cow::Owned( - Resource::builder() - .with_attributes([KeyValue::new("service.name", "asynchronous")]) - .build() - ), - InstrumentationScope::builder("example-crate").with_version(env!("CARGO_PKG_VERSION")).build(), -); -fastrace::set_reporter(reporter, Config::default()); - -{ - // Start tracing - let root = Span::root("root", SpanContext::random()); -} - -fastrace::flush(); -``` diff --git a/fastrace-jaeger/src/lib.rs b/fastrace-jaeger/src/lib.rs deleted file mode 100644 index 288dfd9e..00000000 --- a/fastrace-jaeger/src/lib.rs +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0. - -#![doc = include_str!("../README.md")] - -mod thrift; - -use std::error::Error; -use std::net::SocketAddr; -use std::net::UdpSocket; - -use fastrace::collector::Reporter; -use fastrace::prelude::*; -use thrift::Log; -use thrift_codec::CompactEncode; -use thrift_codec::message::Message; - -use crate::thrift::Batch; -use crate::thrift::EmitBatchNotification; -use crate::thrift::JaegerSpan; -use crate::thrift::Process; -use crate::thrift::Tag; - -/// [Jaeger](https://www.jaegertracing.io/) reporter for `fastrace` via UDP endpoint. -pub struct JaegerReporter { - agent_addr: SocketAddr, - service_name: String, - socket: UdpSocket, -} - -impl JaegerReporter { - pub fn new( - agent_addr: SocketAddr, - service_name: impl Into, - ) -> Result> { - let local_addr: SocketAddr = if agent_addr.is_ipv4() { - "0.0.0.0:0" - } else { - "[::]:0" - } - .parse() - .unwrap(); - let socket = std::net::UdpSocket::bind(local_addr)?; - - Ok(Self { - agent_addr, - service_name: service_name.into(), - socket, - }) - } - - fn convert(&self, spans: &[SpanRecord]) -> Vec { - spans - .iter() - .map(move |s| JaegerSpan { - trace_id_high: (s.trace_id.0 >> 64) as i64, - trace_id_low: s.trace_id.0 as i64, - span_id: s.span_id.0 as i64, - parent_span_id: s.parent_id.0 as i64, - operation_name: s.name.to_string(), - references: vec![], - flags: 1, - start_time: (s.begin_time_unix_ns / 1_000) as i64, - duration: (s.duration_ns / 1_000) as i64, - tags: s - .properties - .iter() - .map(|(k, v)| Tag::String { - key: k.to_string(), - value: v.to_string(), - }) - .collect(), - logs: s - .events - .iter() - .map(|event| Log { - timestamp: (event.timestamp_unix_ns / 1_000) as i64, - fields: [("name".into(), event.name.clone())] - .iter() - .chain(&event.properties) - .map(|(k, v)| Tag::String { - key: k.to_string(), - value: v.to_string(), - }) - .collect(), - }) - .collect(), - }) - .collect() - } - - fn serialize(&self, spans: Vec) -> Result, Box> { - let bn = EmitBatchNotification { - batch: Batch { - process: Process { - service_name: self.service_name.clone(), - tags: vec![], - }, - spans, - }, - }; - - let mut bytes = Vec::new(); - let msg = Message::from(bn); - msg.compact_encode(&mut bytes)?; - - Ok(bytes) - } - - fn try_report(&self, spans: &[SpanRecord]) -> Result<(), Box> { - const MAX_UDP_PACKAGE_SIZE: usize = 8000; - - let mut spans_per_batch = spans.len(); - let mut sent_spans = 0; - - while sent_spans < spans.len() { - let batch_size = spans_per_batch.min(spans.len() - sent_spans); - let jaeger_spans = self.convert(&spans[sent_spans..sent_spans + batch_size]); - let bytes = self.serialize(jaeger_spans)?; - if bytes.len() >= MAX_UDP_PACKAGE_SIZE { - if batch_size <= 1 { - sent_spans += 1; - } else { - spans_per_batch /= 2; - } - continue; - } - self.socket.send_to(&bytes, self.agent_addr)?; - sent_spans += batch_size; - } - - Ok(()) - } -} - -impl Reporter for JaegerReporter { - fn report(&mut self, spans: Vec) { - if spans.is_empty() { - return; - } - - if let Err(err) = self.try_report(&spans) { - log::error!("report to jaeger failed: {err}"); - } - } -} diff --git a/fastrace-jaeger/src/thrift.rs b/fastrace-jaeger/src/thrift.rs deleted file mode 100644 index 06f235dd..00000000 --- a/fastrace-jaeger/src/thrift.rs +++ /dev/null @@ -1,233 +0,0 @@ -// Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0. - -//! Thrift components defined in [jaeger.thrift]. -//! -//! [jaeger.thrift]: https://github.com/uber/jaeger-idl/blob/main/thrift/jaeger.thrift - -use thrift_codec::data::Field; -use thrift_codec::data::List; -use thrift_codec::data::Struct; -use thrift_codec::message::Message; - -#[derive(Debug, Clone)] -pub struct EmitBatchNotification { - pub batch: Batch, -} - -impl From for Message { - fn from(f: EmitBatchNotification) -> Self { - Message::oneway("emitBatch", 0, Struct::from((Struct::from(f.batch),))) - } -} - -/// `TagKind` denotes the kind of a `Tag`'s value. -#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] -pub enum TagKind { - String = 0, - Double = 1, - Bool = 2, - Long = 3, - Binary = 4, -} - -/// `Tag` is a basic strongly typed key/value pair. -#[derive(Debug, Clone, PartialEq, PartialOrd)] -pub enum Tag { - String { key: String, value: String }, - Double { key: String, value: f64 }, - Bool { key: String, value: bool }, - Long { key: String, value: i64 }, - Binary { key: String, value: Vec }, -} - -impl Tag { - /// Returns the key of this tag. - pub fn key(&self) -> &str { - match *self { - Tag::String { ref key, .. } - | Tag::Double { ref key, .. } - | Tag::Bool { ref key, .. } - | Tag::Long { ref key, .. } - | Tag::Binary { ref key, .. } => key, - } - } - - /// Returns the kind of this tag. - pub fn kind(&self) -> TagKind { - match *self { - Tag::String { .. } => TagKind::String, - Tag::Double { .. } => TagKind::Double, - Tag::Bool { .. } => TagKind::Bool, - Tag::Long { .. } => TagKind::Long, - Tag::Binary { .. } => TagKind::Binary, - } - } -} - -impl From for Struct { - fn from(f: Tag) -> Self { - let mut fields = vec![Field::new(1, f.key()), Field::new(2, f.kind() as i32)]; - match f { - Tag::String { value, .. } => fields.push(Field::new(3, value)), - Tag::Double { value, .. } => fields.push(Field::new(4, value)), - Tag::Bool { value, .. } => fields.push(Field::new(5, value)), - Tag::Long { value, .. } => fields.push(Field::new(6, value)), - Tag::Binary { value, .. } => fields.push(Field::new(7, value)), - }; - Struct::new(fields) - } -} - -/// `Log` is a timed even with an arbitrary set of tags. -#[derive(Debug, Clone)] -pub struct Log { - pub timestamp: i64, - pub fields: Vec, -} - -impl From for Struct { - fn from(f: Log) -> Self { - Struct::from(( - f.timestamp, - List::from(f.fields.into_iter().map(Struct::from).collect::>()), - )) - } -} - -/// Span reference kind. -#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] -pub enum SpanRefKind { - // ChildOf = 0, - FollowsFrom = 1, -} - -/// `SpanRef` describes causal relationship of the current span to another span (e.g. 'child-of') -#[derive(Debug, Clone)] -pub struct SpanRef { - pub kind: SpanRefKind, - pub trace_id_low: i64, - pub trace_id_high: i64, - pub span_id: i64, -} - -impl From for Struct { - fn from(f: SpanRef) -> Self { - Struct::from((f.kind as i32, f.trace_id_low, f.trace_id_high, f.span_id)) - } -} - -/// `JaegerSpan` represents a named unit of work performed by a service. -#[derive(Debug, Clone)] -pub struct JaegerSpan { - /// The least significant 64 bits of a trace id. - pub trace_id_low: i64, - - /// The most significant 64 bits of a trace id; 0 when only 64 bit IDs are used. - pub trace_id_high: i64, - - /// Unique span id (only unique within a given trace). - pub span_id: i64, - - /// Since nearly all spans will have parents spans, `ChildOf` refs do not have to be explicit. - /// - /// Should be `0` if the current span is a root span. - pub parent_span_id: i64, - - /// The name of operation. - pub operation_name: String, - - /// Causal references to other spans. - pub references: Vec, - - /// A bit field used to propagate sampling decisions. - /// - /// `1` signifies a SAMPLED span, `2` signifies a DEBUG span. - pub flags: i32, - - /// Start time of this span. - pub start_time: i64, - - /// Duration of this span. - pub duration: i64, - - /// Tag list. - pub tags: Vec, - - /// Log list. - pub logs: Vec, -} - -impl From for Struct { - fn from(f: JaegerSpan) -> Self { - let mut fields = Vec::with_capacity(11); - fields.push(Field::new(1, f.trace_id_low)); - fields.push(Field::new(2, f.trace_id_high)); - fields.push(Field::new(3, f.span_id)); - fields.push(Field::new(4, f.parent_span_id)); - fields.push(Field::new(5, f.operation_name)); - if !f.references.is_empty() { - fields.push(Field::new( - 6, - List::from( - f.references - .into_iter() - .map(Struct::from) - .collect::>(), - ), - )); - } - fields.push(Field::new(7, f.flags)); - fields.push(Field::new(8, f.start_time)); - fields.push(Field::new(9, f.duration)); - if !f.tags.is_empty() { - fields.push(Field::new( - 10, - List::from(f.tags.into_iter().map(Struct::from).collect::>()), - )); - } - if !f.logs.is_empty() { - fields.push(Field::new( - 11, - List::from(f.logs.into_iter().map(Struct::from).collect::>()), - )); - } - Struct::new(fields) - } -} - -/// `Process` describes the traced process/service that emits spans. -#[derive(Debug, Clone)] -pub struct Process { - /// The name of this service. - pub service_name: String, - - /// Tag list. - pub tags: Vec, -} - -impl From for Struct { - fn from(f: Process) -> Self { - let tags = List::from(f.tags.into_iter().map(Struct::from).collect::>()); - if tags.is_empty() { - Struct::from((f.service_name,)) - } else { - Struct::from((f.service_name, tags)) - } - } -} - -/// `Batch` is a collection of spans reported out of process. -#[derive(Debug, Clone)] -pub struct Batch { - pub process: Process, - pub spans: Vec, -} - -impl From for Struct { - fn from(f: Batch) -> Self { - Struct::from(( - Struct::from(f.process), - List::from(f.spans.into_iter().map(Struct::from).collect::>()), - )) - } -} diff --git a/fastrace-macro/Cargo.toml b/fastrace-macro/Cargo.toml index c01be943..f7c50c76 100644 --- a/fastrace-macro/Cargo.toml +++ b/fastrace-macro/Cargo.toml @@ -5,7 +5,7 @@ version = "0.7.18" categories = ["development-tools::debugging"] description = "Attribute procedural macro for fastrace" documentation = "https://docs.rs/fastrace-macro" -keywords = ["tracing", "span", "datadog", "jaeger", "opentelemetry"] +keywords = ["tracing", "span", "opentelemetry"] readme = "README.md" edition.workspace = true diff --git a/fastrace-opentelemetry/Cargo.toml b/fastrace-opentelemetry/Cargo.toml index 9f28a89f..79cb3398 100644 --- a/fastrace-opentelemetry/Cargo.toml +++ b/fastrace-opentelemetry/Cargo.toml @@ -5,7 +5,7 @@ version = "0.18.1" categories = ["development-tools::debugging"] description = "Opentelemetry reporter for fastrace" documentation = "https://docs.rs/fastrace-opentelemetry" -keywords = ["tracing", "span", "datadog", "jaeger", "opentelemetry"] +keywords = ["tracing", "span", "opentelemetry"] readme = "README.md" edition.workspace = true diff --git a/fastrace/Cargo.toml b/fastrace/Cargo.toml index 5ab75ed9..6267b827 100644 --- a/fastrace/Cargo.toml +++ b/fastrace/Cargo.toml @@ -5,7 +5,7 @@ version = "0.7.18" categories = ["development-tools::debugging"] description = "A high-performance timeline tracing library for Rust" documentation = "https://docs.rs/fastrace" -keywords = ["tracing", "span", "datadog", "jaeger", "opentelemetry"] +keywords = ["tracing", "span", "opentelemetry"] readme = "../README.md" edition.workspace = true diff --git a/fastrace/src/lib.rs b/fastrace/src/lib.rs index 7fdeaa2b..6a774a2b 100644 --- a/fastrace/src/lib.rs +++ b/fastrace/src/lib.rs @@ -293,15 +293,13 @@ //! //! ## Reporter //! -//! [`Reporter`] is responsible for reporting the span records to a remote agent, -//! such as Jaeger. +//! [`Reporter`] is responsible for reporting the span records to a remote agent. //! -//! Executables should initialize a reporter implementation early in the program's -//! runtime. Span records generated before the reporter is initialized will be ignored. +//! Executables should initialize a reporter at the very beginning of the program's lifetime. +//! Span records generated before the reporter is initialized will be ignored. //! -//! For an easy start, `fastrace` offers a [`ConsoleReporter`] that prints span -//! records to stderr. For more advanced use, crates like `fastrace-jaeger`, `fastrace-datadog`, -//! and `fastrace-opentelemetry` are available. +//! For an easy start, `fastrace` offers a [`ConsoleReporter`] that prints span records to stderr. +//! For more advanced use, crates like `fastrace-opentelemetry` are available. //! //! The reporter runs in a background collector thread. [`Config::report_interval()`] controls the //! *maximum* interval between report cycles, but the reporter may be invoked earlier. Do not rely