about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-03-18T10·07+0200
committerflokli <flokli@flokli.de>2024-03-18T16·10+0000
commit898830b332b384fb9c4db124b0960bc3171e03bb (patch)
treed5a27bb1ef751632cbc37051ceb1529c1f6f9896
parent997b59e4526d2313580c9c2de71285c77dc28e77 (diff)
fix(tvix/boot/tests): disable otlp r/7728
We don't have a OTLP collector inside the Nix build, this removes some
noise from the log about not being able to reach it.

Change-Id: I058839c8f214821b536306c8c30e1a8e7192153b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11189
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Connor Brewster <cbrewster@hey.com>
-rw-r--r--tvix/boot/default.nix2
-rw-r--r--tvix/boot/tests/default.nix9
2 files changed, 8 insertions, 3 deletions
diff --git a/tvix/boot/default.nix b/tvix/boot/default.nix
index db32c9ce7c..22a696060c 100644
--- a/tvix/boot/default.nix
+++ b/tvix/boot/default.nix
@@ -83,7 +83,7 @@ rec {
     trap cleanup EXIT
 
     # Spin up the virtiofs daemon
-    tvix-store virtiofs -l $tempdir/tvix.sock &
+    tvix-store --otlp=false virtiofs -l $tempdir/tvix.sock &
     virtiofsd_pid=$!
 
     # Wait for the socket to exist.
diff --git a/tvix/boot/tests/default.nix b/tvix/boot/tests/default.nix
index 4204f5de9f..3720bf149e 100644
--- a/tvix/boot/tests/default.nix
+++ b/tvix/boot/tests/default.nix
@@ -42,7 +42,9 @@ let
           BLOB_SERVICE_ADDR=${blobServiceAddr} \
             DIRECTORY_SERVICE_ADDR=${directoryServiceAddr} \
             PATH_INFO_SERVICE_ADDR=${pathInfoServiceAddr} \
-            tvix-store daemon -l $PWD/tvix-store.sock &
+            tvix-store \
+              --otlp=false \
+              daemon -l $PWD/tvix-store.sock &
 
           # Wait for the socket to be created.
           while [ ! -e $PWD/tvix-store.sock ]; do sleep 1; done
@@ -60,7 +62,10 @@ let
           echo "imported to $outpath"
         '' + lib.optionalString (isClosure) ''
           echo "Starting nar-bridge…"
-          nar-bridge-http --store-addr=unix://$PWD/tvix-store.sock --listen-addr=$PWD/nar-bridge.sock &
+          nar-bridge-http \
+            --otlp=false \
+            --store-addr=unix://$PWD/tvix-store.sock \
+            --listen-addr=$PWD/nar-bridge.sock &
 
           # Wait for the socket to be created.
           while [ ! -e $PWD/nar-bridge.sock ]; do sleep 1; done