From 898830b332b384fb9c4db124b0960bc3171e03bb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 18 Mar 2024 12:07:56 +0200 Subject: fix(tvix/boot/tests): disable otlp 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 Reviewed-by: Connor Brewster --- tvix/boot/default.nix | 2 +- tvix/boot/tests/default.nix | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'tvix') diff --git a/tvix/boot/default.nix b/tvix/boot/default.nix index db32c9ce7c4d..22a696060c76 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 4204f5de9f79..3720bf149efe 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 -- cgit 1.4.1