Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
652 changes: 557 additions & 95 deletions Cargo.lock

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ bazel_dep(name = "platforms", version = "1.1.0")
bazel_dep(name = "bazel_skylib", version = "1.9.0")
bazel_dep(name = "rules_python", version = "2.0.0")
bazel_dep(name = "rules_shell", version = "0.6.1")
bazel_dep(name = "zstd", version = "1.5.7.bcr.1")

# hermetic-llvm: zero-sysroot, fully hermetic LLVM cross-compilation toolchain.
# Inside Nix, lre.bazelrc registers @local-remote-execution//generated-cc/...
Expand Down Expand Up @@ -107,6 +108,14 @@ crate.from_cargo(
# selects against legacy @rules_rust//rust/platform:* labels.
use_legacy_rules_rust_platforms = True,
)
crate.annotation(
crate = "zstd-sys",
gen_build_script = "off",
deps = ["@zstd"],
)

inject_repo(crate, "zstd")

use_repo(crate, "crates")

# NativeLink uses Local Remote Execution for Rust by default which automatically
Expand Down
51 changes: 39 additions & 12 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,12 @@
# FIXME(palfrey): Attempted workaround from https://github.com/llvm/llvm-project/issues/32849#issuecomment-2353071071 but doesn't work
# CFLAGS = "-femit-all-decls";
${linkerEnvVar} = linkerPath;
# musl libc does not provide __memcpy_chk (a glibc _FORTIFY_SOURCE extension).
# C crates compiled for musl (e.g. zstd-sys via opentelemetry-otlp's zstd-tonic
# feature) fail to link when the nixpkgs cc-wrapper injects -D_FORTIFY_SOURCE=2.
# hardeningDisable removes "fortify" from NIX_HARDENING_ENABLE so the cc-wrapper
# never emits that flag for this derivation.
hardeningDisable = ["fortify"];
});

# Additional target for external dependencies to simplify caching.
Expand Down
4 changes: 2 additions & 2 deletions nativelink-scheduler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ futures = { version = "0.3.31", default-features = false }
humantime = { version = "2.3.0", default-features = false }
lru = { version = "0.16.0", default-features = false }
mock_instant = { version = "0.5.3", default-features = false }
opentelemetry = { version = "0.29.1", default-features = false }
opentelemetry-semantic-conventions = { version = "0.29.0", default-features = false, features = [
opentelemetry = { version = "0.30.0", default-features = false }
opentelemetry-semantic-conventions = { version = "0.30.0", default-features = false, features = [
"default",
"semconv_experimental",
] }
Expand Down
4 changes: 2 additions & 2 deletions nativelink-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ bytes = { version = "1.10.1", default-features = false }
futures = { version = "0.3.31", default-features = false }
http-body-util = { version = "0.1.3", default-features = false }
hyper = { version = "1.6.0", default-features = false }
opentelemetry = { version = "0.29.1", default-features = false }
opentelemetry-semantic-conventions = { version = "0.29.0", default-features = false, features = [
opentelemetry = { version = "0.30.0", default-features = false }
opentelemetry-semantic-conventions = { version = "0.30.0", default-features = false, features = [
"default",
"semconv_experimental",
] }
Expand Down
2 changes: 1 addition & 1 deletion nativelink-store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ mongodb = { version = "3", features = [
"compat-3-0-0",
"rustls-tls",
], default-features = false }
opentelemetry = { version = "0.29.1", default-features = false }
opentelemetry = { version = "0.30.0", default-features = false }
parking_lot = { version = "0.12.3", features = [
"arc_lock",
"send_guard",
Expand Down
6 changes: 6 additions & 0 deletions nativelink-util/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ rust_library(
"@crates//:blake3",
"@crates//:bytes",
"@crates//:futures",
"@crates//:ginepro",
"@crates//:hex",
"@crates//:humantime",
"@crates//:hyper-1.7.0",
Expand Down Expand Up @@ -83,6 +84,7 @@ rust_library(
"@crates//:tracing",
"@crates//:tracing-opentelemetry",
"@crates//:tracing-subscriber",
"@crates//:url",
"@crates//:uuid",
"@crates//:walkdir",
"@crates//:wincode",
Expand Down Expand Up @@ -136,6 +138,7 @@ rust_test_suite(
"@crates//:mock_instant",
"@crates//:opentelemetry",
"@crates//:opentelemetry-http",
"@crates//:opentelemetry_sdk",
"@crates//:parking_lot",
"@crates//:pretty_assertions",
"@crates//:prost",
Expand Down Expand Up @@ -164,10 +167,13 @@ rust_test(
],
deps = [
"@crates//:http-body-util",
"@crates//:opentelemetry-proto",
"@crates//:opentelemetry_sdk",
"@crates//:pretty_assertions",
"@crates//:rand",
"@crates//:serde_json",
"@crates//:tempfile",
"@crates//:tokio-stream",
"@crates//:tracing-test",
],
)
Expand Down
23 changes: 16 additions & 7 deletions nativelink-util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ hyper-util = { version = "0.1.11", default-features = false }
libc = { version = "0.2.177", default-features = false }
lru = { version = "0.16.0", default-features = false }
mock_instant = { version = "0.5.3", default-features = false }
opentelemetry = { version = "0.29.0", default-features = false }
opentelemetry-appender-tracing = { version = "0.29.1", default-features = false }
opentelemetry-http = { version = "0.29.0", default-features = false }
opentelemetry-otlp = { version = "0.29.0", default-features = false, features = [
opentelemetry = { version = "0.30.0", default-features = false }
opentelemetry-appender-tracing = { version = "0.30.0", default-features = false }
opentelemetry-http = { version = "0.30.0", default-features = false }
opentelemetry-otlp = { version = "0.30.0", default-features = false, features = [
"grpc-tonic",
"logs",
"metrics",
"trace",
"zstd-tonic",
] }
opentelemetry-semantic-conventions = { version = "0.29.0", default-features = false, features = [
opentelemetry-semantic-conventions = { version = "0.30.0", default-features = false, features = [
"default",
"semconv_experimental",
] }
opentelemetry_sdk = { version = "0.29.0", default-features = false }
opentelemetry_sdk = { version = "0.30.0", default-features = false }
parking_lot = { version = "0.12.3", features = [
"arc_lock",
"send_guard",
Expand Down Expand Up @@ -77,7 +77,7 @@ tonic = { version = "0.13.0", features = [
], default-features = false }
tower = { version = "0.5.2", default-features = false }
tracing = { version = "0.1.41", default-features = false }
tracing-opentelemetry = { version = "0.30.0", default-features = false, features = [
tracing-opentelemetry = { version = "0.31.0", default-features = false, features = [
"metrics",
] }
tracing-subscriber = { version = "0.3.19", features = [
Expand All @@ -87,6 +87,8 @@ tracing-subscriber = { version = "0.3.19", features = [
], default-features = false }
tracing-test = { version = "0.2.5", default-features = false, features = [] }

ginepro = { version = "0.9.3", default-features = false }
url = { version = "2.5.7", default-features = false }
uuid = { version = "1.16.0", default-features = false, features = [
"serde",
"v4",
Expand All @@ -97,6 +99,13 @@ wincode = { version = "0.5.4", default-features = false, features = ["derive"] }

[dev-dependencies]
nativelink-macro = { path = "../nativelink-macro" }
opentelemetry-proto = { version = "0.30.0", default-features = false, features = [
"gen-tonic",
"metrics",
] }
opentelemetry_sdk = { version = "0.30.0", default-features = false, features = [
"testing",
] }

axum = { version = "0.8.3", default-features = false }
http-body-util = { version = "0.1.3", default-features = false }
Expand Down
Loading
Loading