Build oak_containers_syslogd with bazel

This is not complete: * We need to fix the systemd linker issue b/335717840 * We need to build for musl b/350019075 Bug: b/349586824 Change-Id: I6182b8ddcbeab000fe8163fe6db21a2bb5bc2772
project-oak · Jul 2, 2024 · 69d4cb0 · 69d4cb0
1 parent 77e99b9
commit 69d4cb0
Show file tree

Hide file tree

Showing 7 changed files with 606 additions and 55 deletions.
diff --git a/Cargo.bazel.lock b/Cargo.bazel.lock
@@ -811,6 +811,15 @@ dependencies = [
  "itertools 0.10.5",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.5"
@@ -1078,13 +1087,13 @@ dependencies = [
  "lock_api",
  "log",
  "maplit",
- "nix 0.28.0",
+ "nix 0.27.1",
  "oci-spec",
  "once_cell",
- "opentelemetry",
+ "opentelemetry 0.22.0",
  "opentelemetry-otlp",
- "opentelemetry-proto",
- "opentelemetry_sdk",
+ "opentelemetry-proto 0.6.0",
+ "opentelemetry_sdk 0.22.1",
  "ouroboros",
  "p256",
  "p384",
@@ -2439,6 +2448,21 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
+[[package]]
+name = "opentelemetry"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "js-sys",
+ "once_cell",
+ "pin-project-lite",
+ "thiserror",
+ "urlencoding",
+]
+
 [[package]]
 name = "opentelemetry"
 version = "0.23.0"
@@ -2455,48 +2479,67 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-otlp"
-version = "0.16.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a94c69209c05319cdf7460c6d4c055ed102be242a0a6245835d7bc42c6ec7f54"
+checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb"
 dependencies = [
  "async-trait",
  "futures-core",
  "http 0.2.12",
- "opentelemetry",
- "opentelemetry-proto",
- "opentelemetry_sdk",
+ "opentelemetry 0.22.0",
+ "opentelemetry-proto 0.5.0",
+ "opentelemetry-semantic-conventions",
+ "opentelemetry_sdk 0.22.1",
  "prost",
  "thiserror",
  "tokio",
  "tonic",
 ]
 
+[[package]]
+name = "opentelemetry-proto"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4"
+dependencies = [
+ "opentelemetry 0.22.0",
+ "opentelemetry_sdk 0.22.1",
+ "prost",
+ "tonic",
+]
+
 [[package]]
 name = "opentelemetry-proto"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162"
 dependencies = [
- "opentelemetry",
- "opentelemetry_sdk",
+ "opentelemetry 0.23.0",
+ "opentelemetry_sdk 0.23.0",
  "prost",
  "tonic",
 ]
 
+[[package]]
+name = "opentelemetry-semantic-conventions"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910"
+
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.23.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd"
+checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e"
 dependencies = [
  "async-trait",
+ "crossbeam-channel",
  "futures-channel",
  "futures-executor",
  "futures-util",
  "glob",
- "lazy_static",
  "once_cell",
- "opentelemetry",
+ "opentelemetry 0.22.0",
  "ordered-float",
  "percent-encoding",
  "rand",
@@ -2506,6 +2549,25 @@ dependencies = [
  "tokio-stream",
 ]
 
+[[package]]
+name = "opentelemetry_sdk"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd"
+dependencies = [
+ "async-trait",
+ "futures-channel",
+ "futures-executor",
+ "futures-util",
+ "glob",
+ "lazy_static",
+ "once_cell",
+ "opentelemetry 0.23.0",
+ "ordered-float",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "ordered-float"
 version = "4.2.0"
@@ -4161,6 +4223,12 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.1"

diff --git a/WORKSPACE b/WORKSPACE
@@ -318,6 +318,12 @@ load("//bazel/rust:defs.bzl", "setup_rust_dependencies")
 
 setup_rust_dependencies()
 
+new_local_repository(
+    name = "systemd",
+    build_file = "systemd.BUILD",
+    path = "/",
+)
+
 load("//bazel/crates:repositories.bzl", "create_oak_crate_repositories")
 
 create_oak_crate_repositories()

diff --git a/bazel/crates/oak_crates_index.bzl b/bazel/crates/oak_crates_index.bzl
@@ -208,11 +208,12 @@ def oak_crates_index(cargo_lockfile, lockfile):
             "maplit": crate.spec(version = "*"),
             "nix": crate.spec(
                 features = ["user", "process", "signal"],
-                version = "*",
+                version = "0.27.1",
             ),
             "oci-spec": crate.spec(version = "*"),
             "once_cell": crate.spec(version = "*"),
-            "opentelemetry": crate.spec(version = "*"),
+            # TODO b/350061567 - Remove opentelemetry version pins
+            "opentelemetry": crate.spec(version = "0.22.0"),
             "opentelemetry-proto": crate.spec(
                 features = [
                     "gen-tonic",
@@ -222,15 +223,16 @@ def oak_crates_index(cargo_lockfile, lockfile):
                 version = "*",
             ),
             "opentelemetry-otlp": crate.spec(
-                features = ["metrics"],
-                version = "*",
+                features = ["grpc-tonic", "logs", "metrics"],
+                version = "0.15.0",
             ),
             "opentelemetry_sdk": crate.spec(
                 features = [
+                    "logs",
                     "metrics",
                     "rt-tokio",
                 ],
-                version = "*",
+                version = "0.22.1",
             ),
             "ouroboros": crate.spec(version = "*"),
             "portpicker": crate.spec(version = "*"),