Skip to content

lib: fix module print timing when specifier includes " #55150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 2 commits into from
Oct 8, 2024
Merged

lib: fix module print timing when specifier includes " #55150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
030caee
lib: fix module print timing when specifier includes `"`
aduh95 Sep 28, 2024
bda9e62
fixup! lib: fix module print timing when specifier includes `"`
aduh95 Sep 28, 2024
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
2 changes: 1 addition & 1 deletion lib/internal/util/debuglog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function formatTime(ms) {
}

function safeTraceLabel(label) {
return label.replace(/\\/g, '\\\\');
return label.replace(/\\/g, '\\\\').replaceAll('"', '\\"');
}

/**
Expand Down
11 changes: 10 additions & 1 deletion test/parallel/test-module-print-timing.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import '../common/index.mjs';
import { isWindows } from '../common/index.mjs';
import assert from 'node:assert';
import { writeFileSync } from 'node:fs';
import { readFile } from 'node:fs/promises';
import { it } from 'node:test';
import tmpdir from '../common/tmpdir.js';
Expand Down Expand Up @@ -113,11 +114,19 @@ it('should support enable tracing dynamically', async () => {


const outputFile = tmpdir.resolve('output-dynamic-trace.log');
let requireFileWithDoubleQuote = '';
if (!isWindows) {
// Double quotes are not valid char for a path on Windows.
const fileWithDoubleQuote = tmpdir.resolve('filename-with-"double"-quotes.cjs');
writeFileSync(fileWithDoubleQuote, ';\n');
requireFileWithDoubleQuote = `require(${JSON.stringify(fileWithDoubleQuote)});`;
}
const jsScript = `
const traceEvents = require("trace_events");
const tracing = traceEvents.createTracing({ categories: ["node.module_timer"] });

tracing.enable();
${requireFileWithDoubleQuote}
require("http");
tracing.disable();

Expand Down