trace-forwarder: Move into root workspace

Add trace-forwarder to be a workspace member to simplify the
dependency management.

Assisted-by: IBM Bob
Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman
2026-04-29 12:11:04 +01:00
parent 1a22c3adec
commit 7664ebda7e
5 changed files with 105 additions and 1467 deletions

94
Cargo.lock generated
View File

@@ -612,6 +612,15 @@ dependencies = [
"syn 2.0.117",
]
[[package]]
name = "bincode"
version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
dependencies = [
"serde",
]
[[package]]
name = "bit-set"
version = "0.8.0"
@@ -3164,6 +3173,12 @@ dependencies = [
"cfg-if 1.0.4",
]
[[package]]
name = "integer-encoding"
version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f"
[[package]]
name = "integer-encoding"
version = "3.0.4"
@@ -3567,6 +3582,25 @@ dependencies = [
"thiserror 1.0.69",
]
[[package]]
name = "kata-trace-forwarder"
version = "0.0.1"
dependencies = [
"anyhow",
"bincode",
"byteorder",
"clap",
"futures",
"libc",
"logging",
"nix 0.30.1",
"opentelemetry 0.14.0",
"opentelemetry-jaeger 0.13.0",
"privdrop",
"slog",
"vsock 0.2.6",
]
[[package]]
name = "kata-types"
version = "0.1.0"
@@ -4754,6 +4788,24 @@ dependencies = [
"vcpkg",
]
[[package]]
name = "opentelemetry"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "492848ff47f11b7f9de0443b404e2c5775f695e1af6b7076ca25f999581d547a"
dependencies = [
"async-trait",
"crossbeam-channel",
"futures",
"js-sys",
"lazy_static",
"percent-encoding",
"pin-project",
"rand 0.8.5",
"serde",
"thiserror 1.0.69",
]
[[package]]
name = "opentelemetry"
version = "0.17.0"
@@ -4800,6 +4852,19 @@ dependencies = [
"tokio",
]
[[package]]
name = "opentelemetry-jaeger"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97fd9ed34f208e0394bfb17522ba0d890925685dfd883147670ed474339d4647"
dependencies = [
"async-trait",
"lazy_static",
"opentelemetry 0.14.0",
"thiserror 1.0.69",
"thrift 0.13.0",
]
[[package]]
name = "opentelemetry-jaeger"
version = "0.17.0"
@@ -4817,7 +4882,7 @@ dependencies = [
"opentelemetry-http",
"opentelemetry-semantic-conventions",
"thiserror 1.0.69",
"thrift",
"thrift 0.16.0",
"tokio",
]
@@ -5291,6 +5356,16 @@ dependencies = [
"syn 2.0.117",
]
[[package]]
name = "privdrop"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70722a5a3728c9603c8d9469b64b8d1ee54dae6d74e24146da7f501b4c76540f"
dependencies = [
"libc",
"nix 0.30.1",
]
[[package]]
name = "proc-macro-crate"
version = "1.3.1"
@@ -6267,7 +6342,7 @@ dependencies = [
"nix 0.25.1",
"oci-spec 0.8.4",
"opentelemetry 0.18.0",
"opentelemetry-jaeger",
"opentelemetry-jaeger 0.17.0",
"persist",
"procfs 0.12.0",
"prometheus",
@@ -7490,6 +7565,19 @@ dependencies = [
"num_cpus",
]
[[package]]
name = "thrift"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c6d965454947cc7266d22716ebfd07b18d84ebaf35eec558586bbb2a8cb6b5b"
dependencies = [
"byteorder",
"integer-encoding 1.1.7",
"log",
"ordered-float 1.1.1",
"threadpool",
]
[[package]]
name = "thrift"
version = "0.16.0"
@@ -7497,7 +7585,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09678c4cdbb4eed72e18b7c2af1329c69825ed16fcbac62d083fc3e2b0590ff0"
dependencies = [
"byteorder",
"integer-encoding",
"integer-encoding 3.0.4",
"log",
"ordered-float 1.1.1",
"threadpool",

View File

@@ -42,6 +42,9 @@ members = [
# genpolicy
"src/tools/genpolicy",
# trace-forwarder
"src/tools/trace-forwarder",
# kata-deploy (Kubernetes installer binary)
"tools/packaging/kata-deploy/binary",

File diff suppressed because it is too large Load Diff

View File

@@ -6,25 +6,25 @@
[package]
name = "kata-trace-forwarder"
version = "0.0.1"
authors = ["The Kata Containers community <kata-dev@lists.katacontainers.io>"]
edition = "2018"
license = "Apache-2.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
[dependencies]
futures = "0.3.15"
clap = { version = "4.5.40", features = ["cargo"] }
futures.workspace = true
clap = { workspace = true, features = ["cargo"] }
vsock = "0.2.3"
nix = { version = "0.30.1", features = ["fs", "user"] }
libc = "0.2.94"
libc.workspace = true
bincode = "1.3.3"
byteorder = "1.4.3"
anyhow = "1.0.31"
anyhow.workspace = true
opentelemetry = { version = "0.14.0", features = ["serialize"] }
opentelemetry-jaeger = "0.13.0"
# Note: this crate sets the slog 'max_*' features which allows the log level
# to be modified at runtime.
logging = { path = "../../libs/logging" }
slog = "2.5.2"
logging.workspace = true
slog.workspace = true
privdrop = "0.5.1"

View File

@@ -9,7 +9,7 @@ include ../../../utils.mk
default: build
build:
@RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE)
@RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build -p kata-trace-forwarder --target $(TRIPLE) --$(BUILD_TYPE)
static-checks-build:
@echo "INFO: static-checks-build do nothing.."
@@ -21,7 +21,7 @@ vendor:
cargo vendor
test:
@cargo test --all -- --nocapture
@cargo test -p kata-trace-forwarder -- --nocapture
install: