fixup! fixup! build: enable Perfetto by default

Author: aduh95

Makefile

@@ -320,9 +320,23 @@ v8: ## Build deps/v8.
 	export PATH="$(NO_BIN_OVERRIDE_PATH)" && \
 		tools/make-v8.sh $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)
 
+ifneq ($(V8_USE_PERFETTO),0)
+TRACE_PROCESSOR_SHELL_PATH ?= tools/perfetto/trace_processor_shell
+
+# The downloaded copy has to match the vendored perfetto, so a version bump
+# re-downloads it. An overridden path is a build we do not manage and may not
+# be writable, so it gets no prerequisite and is left alone once it exists.
+ifeq ($(TRACE_PROCESSOR_SHELL_PATH),tools/perfetto/trace_processor_shell)
+TRACE_PROCESSOR_SHELL_DEPS = deps/perfetto/VERSION
+endif
+
+$(TRACE_PROCESSOR_SHELL_PATH): $(TRACE_PROCESSOR_SHELL_DEPS)
+	@tools/perfetto/get_trace_processor $@
+
+endif # </V8_USE_PERFETTO != 0>
+
 .PHONY: jstest
-## Run addon tests and JS tests.
-jstest: build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests $(TRACE_PROCESSOR_SHELL_PATH)
+jstest: build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests $(TRACE_PROCESSOR_SHELL_PATH) ## Run addon tests and JS tests.
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
 		$(TEST_CI_ARGS) \
 		--skip-tests=$(CI_SKIP_TESTS) \
@@ -340,19 +354,6 @@ coverage-run-js: ## Run JavaScript tests with coverage.
 					TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) jstest
 	$(MAKE) coverage-report-js
 
-TRACE_PROCESSOR_SHELL_PATH ?= tools/perfetto/trace_processor_shell
-
-# The downloaded copy has to match the vendored perfetto, so a version bump
-# re-downloads it. An overridden path is a build we do not manage and may not
-# be writable, so it gets no prerequisite and is left alone once it exists.
-ifeq ($(TRACE_PROCESSOR_SHELL_PATH),tools/perfetto/trace_processor_shell)
-TRACE_PROCESSOR_SHELL_DEPS = deps/perfetto/VERSION
-endif
-
-# Set TRACE_PROCESSOR_SHELL_PATH=/dev/null to disable the download
-$(TRACE_PROCESSOR_SHELL_PATH): $(TRACE_PROCESSOR_SHELL_DEPS)
-	@tools/perfetto/get_trace_processor $@
-
 .PHONY: test
 # This does not run tests of third-party libraries inside deps.
 test: all ## Run default tests and build docs.

configure.py

@@ -551,8 +551,7 @@
     action='store_true',
     dest='shared_perfetto',
     default=None,
-    help='link to a shared perfetto SDK instead of the one in deps/perfetto '
-         '(requires --with-perfetto)')
+    help='link to a shared perfetto SDK instead of the one in deps/perfetto')
 
 shared_optgroup.add_argument('--shared-perfetto-includes',
     action='store',
@@ -3080,6 +3079,7 @@ def make_bin_override():
 config = {
   'BUILDTYPE': 'Debug' if options.debug else 'Release',
   'NODE_TARGET_TYPE': variables['node_target_type'],
+  'V8_USE_PERFETTO': str(variables['v8_use_perfetto']),
 }
 
 # Not needed for trivial case. Useless when it's a win32 path.

shell.nix

@@ -149,8 +149,6 @@ pkgs.mkShell {
         )
       )
     );
-    TRACE_PROCESSOR_SHELL_PATH =
-      if withPerfetto then "${pkgs.perfetto.tools}/bin/trace_processor_shell" else "/dev/null";
   }
   // (
     let
@@ -179,6 +177,9 @@ pkgs.mkShell {
   // pkgs.lib.optionalAttrs (!withSQLite) {
     NOSQLITE = "1";
   }
+  // pkgs.lib.optionalAttrs (withPerfetto) {
+    TRACE_PROCESSOR_SHELL_PATH = "${pkgs.perfetto.tools}/bin/trace_processor_shell";
+  }
   // pkgs.lib.optionalAttrs (pkcs11 != false && pkcs11 != null) (
     let
       pkcs11' =

test/trace_events/README.md

@@ -1,11 +1,11 @@
 # `trace_events` Tests
 
-When the `node` binary is built with configure flag `--with-perfetto`,
+When the `node` binary is not built with configure flag `--without-perfetto`,
 the tests in this folder depends on `tools/perfetto/trace_processor_shell`,
 which is downloaded with `tools/perfetto/get_trace_processor` via
 `make tools/perfetto/trace_processor_shell`, to convert Perfetto binary trace
 files to JSON format. Set `TRACE_PROCESSOR_SHELL_PATH` to use an existing build
-of the tool instead of downloading a release.
+of the tool to disable downloading a release.
 
 Refer to <https://perfetto.dev/docs/reference/trace-processor-cli>
 for help of the `trace_processor_shell` CLI.