Unverified Commit a9f19757 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Update experimental profiling (#20357)

Adds profiling for terser and css-minimizer. Will move the old profiler to this new system as well.
parent 7d482419
const { NodeTracerProvider } = require('@opentelemetry/node')
const { BatchSpanProcessor } = require('@opentelemetry/tracing')
const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin')
const tracerProvider = new NodeTracerProvider()
tracerProvider.addSpanProcessor(
new BatchSpanProcessor(
new ZipkinExporter({
serviceName: 'next-js',
})
)
)
tracerProvider.register()
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
"publish-stable": "lerna version --force-publish", "publish-stable": "lerna version --force-publish",
"lint-staged": "lint-staged", "lint-staged": "lint-staged",
"next": "node --trace-deprecation packages/next/dist/bin/next", "next": "node --trace-deprecation packages/next/dist/bin/next",
"trace": "node --trace-deprecation -r ./bench/instrument.js packages/next/dist/bin/next",
"debug": "node --inspect packages/next/dist/bin/next" "debug": "node --inspect packages/next/dist/bin/next"
}, },
"pre-commit": "lint-staged", "pre-commit": "lint-staged",
...@@ -127,7 +128,12 @@ ...@@ -127,7 +128,12 @@
"wait-port": "0.2.2", "wait-port": "0.2.2",
"web-streams-polyfill": "2.1.1", "web-streams-polyfill": "2.1.1",
"webpack-bundle-analyzer": "4.3.0", "webpack-bundle-analyzer": "4.3.0",
"worker-loader": "2.0.0" "worker-loader": "2.0.0",
"@opentelemetry/exporter-zipkin": "0.14.0",
"@opentelemetry/node": "0.14.0",
"@opentelemetry/plugin-http": "0.14.0",
"@opentelemetry/plugin-https": "0.14.0",
"@opentelemetry/tracing": "0.14.0"
}, },
"resolutions": { "resolutions": {
"browserslist": "^4.14.7", "browserslist": "^4.14.7",
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import * as log from '../build/output/log' import * as log from '../build/output/log'
import arg from 'next/dist/compiled/arg/index.js' import arg from 'next/dist/compiled/arg/index.js'
import { NON_STANDARD_NODE_ENV } from '../lib/constants' import { NON_STANDARD_NODE_ENV } from '../lib/constants'
import opentelemetryApi from '@opentelemetry/api'
;['react', 'react-dom'].forEach((dependency) => { ;['react', 'react-dom'].forEach((dependency) => {
try { try {
// When 'npm link' is used it checks the clone location. Not the project. // When 'npm link' is used it checks the clone location. Not the project.
...@@ -108,7 +109,18 @@ if (typeof React.Suspense === 'undefined') { ...@@ -108,7 +109,18 @@ if (typeof React.Suspense === 'undefined') {
process.on('SIGTERM', () => process.exit(0)) process.on('SIGTERM', () => process.exit(0))
process.on('SIGINT', () => process.exit(0)) process.on('SIGINT', () => process.exit(0))
commands[command]().then((exec) => exec(forwardedArgs)) commands[command]()
.then((exec) => exec(forwardedArgs))
.then(async () => {
if (command === 'build') {
// @ts-ignore getDelegate exists
const tp = opentelemetryApi.trace.getTracerProvider().getDelegate()
if (tp.shutdown) {
await tp.shutdown()
}
process.exit(0)
}
})
if (command === 'dev') { if (command === 'dev') {
const { CONFIG_FILE } = require('../next-server/lib/constants') const { CONFIG_FILE } = require('../next-server/lib/constants')
......
This diff is collapsed.
import api, { Span } from '@opentelemetry/api'
export const tracer = api.trace.getTracer('next', process.env.__NEXT_VERSION)
export function traceFn<T extends (...args: unknown[]) => ReturnType<T>>(
span: Span,
fn: T
): ReturnType<T> {
return tracer.withSpan(span, () => {
try {
return fn()
} finally {
span.end()
}
})
}
export function traceAsyncFn<T extends (...args: unknown[]) => ReturnType<T>>(
span: Span,
fn: T
): Promise<ReturnType<T>> {
return tracer.withSpan(span, async () => {
try {
return await fn()
} finally {
span.end()
}
})
}
...@@ -3,6 +3,7 @@ import postcssScss from 'next/dist/compiled/postcss-scss' ...@@ -3,6 +3,7 @@ import postcssScss from 'next/dist/compiled/postcss-scss'
import postcss, { Parser } from 'postcss' import postcss, { Parser } from 'postcss'
import webpack from 'webpack' import webpack from 'webpack'
import sources from 'webpack-sources' import sources from 'webpack-sources'
import { tracer, traceAsyncFn } from '../../tracer'
// @ts-ignore: TODO: remove ignore when webpack 5 is stable // @ts-ignore: TODO: remove ignore when webpack 5 is stable
const { RawSource, SourceMapSource } = webpack.sources || sources const { RawSource, SourceMapSource } = webpack.sources || sources
...@@ -70,46 +71,89 @@ export class CssMinimizerPlugin { ...@@ -70,46 +71,89 @@ export class CssMinimizerPlugin {
stage: webpack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE, stage: webpack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE,
}, },
async (assets: any) => { async (assets: any) => {
const files = Object.keys(assets) const span = tracer.startSpan('css-minimizer-plugin', {
await Promise.all( attributes: {
files webpackVersion: 5,
.filter((file) => CSS_REGEX.test(file)) },
.map(async (file) => { })
const asset = assets[file]
return traceAsyncFn(span, async () => {
const etag = cache.getLazyHashedEtag(asset) const files = Object.keys(assets)
await Promise.all(
const cachedResult = await cache.getPromise(file, etag) files
if (cachedResult) { .filter((file) => CSS_REGEX.test(file))
assets[file] = cachedResult .map(async (file) => {
return const assetSpan = tracer.startSpan('minify-css', {
} attributes: {
file,
const result = await this.optimizeAsset(file, asset) },
await cache.storePromise(file, etag, result) })
assets[file] = result return traceAsyncFn(span, async () => {
}) const asset = assets[file]
)
const etag = cache.getLazyHashedEtag(asset)
const cachedResult = await cache.getPromise(file, etag)
assetSpan.setAttribute(
'cache',
cachedResult ? 'HIT' : 'MISS'
)
if (cachedResult) {
assets[file] = cachedResult
return
}
const result = await this.optimizeAsset(file, asset)
await cache.storePromise(file, etag, result)
assets[file] = result
})
})
)
})
} }
) )
return return
} }
compilation.hooks.optimizeChunkAssets.tapPromise( compilation.hooks.optimizeChunkAssets.tapPromise(
'CssMinimizerPlugin', 'CssMinimizerPlugin',
(chunks: webpack.compilation.Chunk[]) => (chunks: webpack.compilation.Chunk[]) => {
Promise.all( const span = tracer.startSpan('css-minimizer-plugin', {
chunks attributes: {
.reduce( webpackVersion: 4,
(acc, chunk) => acc.concat(chunk.files || []), compilationName: compilation.name,
[] as string[] },
) })
.filter((entry) => CSS_REGEX.test(entry))
.map(async (file) => { return traceAsyncFn(span, async () => {
const asset = compilation.assets[file] const res = await Promise.all(
chunks
compilation.assets[file] = await this.optimizeAsset(file, asset) .reduce(
}) (acc, chunk) => acc.concat(chunk.files || []),
) [] as string[]
)
.filter((entry) => CSS_REGEX.test(entry))
.map(async (file) => {
const assetSpan = tracer.startSpan('minify-css', {
attributes: {
file,
},
})
return traceAsyncFn(assetSpan, async () => {
const asset = compilation.assets[file]
// Makes trace attributes the same as webpack 5
// When using webpack 4 the result is not cached
assetSpan.setAttribute('cache', 'MISS')
compilation.assets[file] = await this.optimizeAsset(
file,
asset
)
})
})
)
return res
})
}
) )
}) })
} }
......
...@@ -55,13 +55,11 @@ const nextBuild: cliCommand = (argv) => { ...@@ -55,13 +55,11 @@ const nextBuild: cliCommand = (argv) => {
printAndExit(`> No such directory exists as the project root: ${dir}`) printAndExit(`> No such directory exists as the project root: ${dir}`)
} }
build(dir, null, args['--profile'], args['--debug']) return build(dir, null, args['--profile'], args['--debug']).catch((err) => {
.then(() => process.exit(0)) console.error('')
.catch((err) => { console.error('> Build error occurred')
console.error('') printAndExit(err)
console.error('> Build error occurred') })
printAndExit(err)
})
} }
export { nextBuild } export { nextBuild }
This diff is collapsed.
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
"@next/polyfill-module": "10.0.4-canary.8", "@next/polyfill-module": "10.0.4-canary.8",
"@next/react-dev-overlay": "10.0.4-canary.8", "@next/react-dev-overlay": "10.0.4-canary.8",
"@next/react-refresh-utils": "10.0.4-canary.8", "@next/react-refresh-utils": "10.0.4-canary.8",
"@opentelemetry/api": "0.14.0",
"ast-types": "0.13.2", "ast-types": "0.13.2",
"babel-plugin-transform-define": "2.0.0", "babel-plugin-transform-define": "2.0.0",
"babel-plugin-transform-react-remove-prop-types": "0.4.24", "babel-plugin-transform-react-remove-prop-types": "0.4.24",
......
...@@ -2345,6 +2345,103 @@ ...@@ -2345,6 +2345,103 @@
dependencies: dependencies:
"@types/node" ">= 8" "@types/node" ">= 8"
"@opentelemetry/api@0.14.0", "@opentelemetry/api@^0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-0.14.0.tgz#4e17d8d2f1da72b19374efa7b6526aa001267cae"
integrity sha512-L7RMuZr5LzMmZiQSQDy9O1jo0q+DaLy6XpYJfIGfYSfoJA5qzYwUP3sP1uMIQ549DvxAgM3ng85EaPTM/hUHwQ==
dependencies:
"@opentelemetry/context-base" "^0.14.0"
"@opentelemetry/context-async-hooks@^0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-0.14.0.tgz#34b77e87060bea2489b16f55168c35a580c5de50"
integrity sha512-BgAPWbmelvL/xhI0B17aidyw24E1D69PlKjDZD1L5AI050Glg1+pa6W0jMSoZltnM27Bc+Pc9n22fqxa4kvLRg==
dependencies:
"@opentelemetry/context-base" "^0.14.0"
"@opentelemetry/context-base@^0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.14.0.tgz#c67fc20a4d891447ca1a855d7d70fa79a3533001"
integrity sha512-sDOAZcYwynHFTbLo6n8kIbLiVF3a3BLkrmehJUyEbT9F+Smbi47kLGS2gG2g0fjBLR/Lr1InPD7kXL7FaTqEkw==
"@opentelemetry/core@^0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-0.14.0.tgz#35870e58e3d084dfc4dea99c973f3cf7479b3c6a"
integrity sha512-HJ4VM0cV6c5qjdW7C7koB2IT4ADunCOehxnKFRslQkbDqAEA1w42AZ9679siYALpWYxNqcJyqF2jxCNtfNHa6Q==
dependencies:
"@opentelemetry/api" "^0.14.0"
"@opentelemetry/context-base" "^0.14.0"
semver "^7.1.3"
"@opentelemetry/exporter-zipkin@0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-zipkin/-/exporter-zipkin-0.14.0.tgz#35281d96bd101c0c1a48837868ba8249a0332f7f"
integrity sha512-cg/86iRK64NSGEcWOTzTfqMByyAu8udi3HgcYP2r0WF8JseabfhrlnBp/4/ba4HuoaGe8uXVRmvDT0uAguhO8w==
dependencies:
"@opentelemetry/api" "^0.14.0"
"@opentelemetry/core" "^0.14.0"
"@opentelemetry/resources" "^0.14.0"
"@opentelemetry/tracing" "^0.14.0"
"@opentelemetry/node@0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/node/-/node-0.14.0.tgz#20af865de191a6b14443d619bb08d49003e64b19"
integrity sha512-79egldZKRIqXArjLHD8SYTJUfY5PrcFZll4+ykfbz23vy/CXEVev+1S8bS8bkE08DUNzskDuiFYlLdWTY8fdrQ==
dependencies:
"@opentelemetry/api" "^0.14.0"
"@opentelemetry/context-async-hooks" "^0.14.0"
"@opentelemetry/core" "^0.14.0"
"@opentelemetry/tracing" "^0.14.0"
require-in-the-middle "^5.0.0"
semver "^7.1.3"
"@opentelemetry/plugin-http@0.14.0", "@opentelemetry/plugin-http@^0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/plugin-http/-/plugin-http-0.14.0.tgz#5c5ac23bd3a5cbd8891fce857d52a86bb0dbf51c"
integrity sha512-j6VHSotl+geN+znYgGgn/GohTAirAtHum8Zpc52VZ/WQCrNfHcmEf4NYaGCuz5tW2EgmbH+66iDM/lgNadQuQg==
dependencies:
"@opentelemetry/api" "^0.14.0"
"@opentelemetry/core" "^0.14.0"
"@opentelemetry/semantic-conventions" "^0.14.0"
semver "^7.1.3"
shimmer "^1.2.1"
"@opentelemetry/plugin-https@0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/plugin-https/-/plugin-https-0.14.0.tgz#60a0db56339de497b35aaae0de91b10ecff9b0ea"
integrity sha512-FyT3iaEO9CdGu1EeIe+JmAwfoYwjG9GtHiyWSovFEKO/0OLQLrXA2AQDgltOeelu/snPGB2MF92iPqbpfVdhHw==
dependencies:
"@opentelemetry/api" "^0.14.0"
"@opentelemetry/core" "^0.14.0"
"@opentelemetry/plugin-http" "^0.14.0"
"@opentelemetry/semantic-conventions" "^0.14.0"
semver "^7.1.3"
shimmer "^1.2.1"
"@opentelemetry/resources@^0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-0.14.0.tgz#e89378931b4e02d4b6fb526d237d9594db2bb68a"
integrity sha512-7XVML4HxvoH6kWY+x0mhMc5m0a2YBvPCTSX7yAqyp9XIGvFpdjzAE2ggJ40DZrL1sPv9f0QYAbnIKFDVLBTfGA==
dependencies:
"@opentelemetry/api" "^0.14.0"
"@opentelemetry/core" "^0.14.0"
"@opentelemetry/semantic-conventions@^0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-0.14.0.tgz#7b48f4300709b34cef0beed8099b79e4a5907886"
integrity sha512-iDGRLQwo+ka1ljlLo4KyuUmzsJwtPw+PyCjetQwn3m/pTXjdyWLGOTARBrpQGpkQp7k87RaCCg5AqZaKFU2G6g==
"@opentelemetry/tracing@0.14.0", "@opentelemetry/tracing@^0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/tracing/-/tracing-0.14.0.tgz#f1e528b90def213a454ca410ca2d460acfacbe3f"
integrity sha512-sw9lXJQUQO0xaCvHWFUzIhgh2jGFgXubRQ6g1O84Q/ILU93ZMMVt+d97mihcrtBrV89Sy39HF8tAwekjpzv+cA==
dependencies:
"@opentelemetry/api" "^0.14.0"
"@opentelemetry/context-base" "^0.14.0"
"@opentelemetry/core" "^0.14.0"
"@opentelemetry/resources" "^0.14.0"
"@opentelemetry/semantic-conventions" "^0.14.0"
"@polka/url@^1.0.0-next.9": "@polka/url@^1.0.0-next.9":
version "1.0.0-next.11" version "1.0.0-next.11"
resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.11.tgz#aeb16f50649a91af79dbe36574b66d0f9e4d9f71" resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.11.tgz#aeb16f50649a91af79dbe36574b66d0f9e4d9f71"
...@@ -14035,6 +14132,15 @@ require-from-string@^1.1.0: ...@@ -14035,6 +14132,15 @@ require-from-string@^1.1.0:
version "1.2.1" version "1.2.1"
resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418" resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
require-in-the-middle@^5.0.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-5.1.0.tgz#b768f800377b47526d026bbf5a7f727f16eb412f"
integrity sha512-M2rLKVupQfJ5lf9OvqFGIT+9iVLnTmjgbOmpil12hiSQNn5zJTKGPoIisETNjfK+09vP3rpm1zJajmErpr2sEQ==
dependencies:
debug "^4.1.1"
module-details-from-path "^1.0.3"
resolve "^1.12.0"
require-like@^0.1.2: require-like@^0.1.2:
version "0.1.2" version "0.1.2"
resolved "https://registry.yarnpkg.com/require-like/-/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" resolved "https://registry.yarnpkg.com/require-like/-/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa"
...@@ -14617,6 +14723,13 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: ...@@ -14617,6 +14723,13 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
semver@^7.1.3:
version "7.3.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
dependencies:
lru-cache "^6.0.0"
semver@~5.3.0: semver@~5.3.0:
version "5.3.0" version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
...@@ -14756,6 +14869,11 @@ shellwords@^0.1.1: ...@@ -14756,6 +14869,11 @@ shellwords@^0.1.1:
version "0.1.1" version "0.1.1"
resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
shimmer@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
signal-exit@^3.0.0, signal-exit@^3.0.2: signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2" version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment