Skip to content
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

Jump to bottom

Fix webpack 5 warning + disabling of profiling #21276

Merged
merged 5 commits into from
Jan 18, 2021
Merged

Fix webpack 5 warning + disabling of profiling #21276

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90e2b77
Fix webpack 5 warning + disabling of profiling
timneutkens Jan 18, 2021
769854d
Update import
timneutkens Jan 18, 2021
1b79027
Merge branch 'canary' into fix/webpack5-deprecation-warning-profiling
kodiakhq[bot] Jan 18, 2021
8758137
Fix ts-ignore not being detected
timneutkens Jan 18, 2021
c1ac6c7
Merge branch 'canary' into fix/webpack5-deprecation-warning-profiling
kodiakhq[bot] Jan 18, 2021
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
19 changes: 17 additions & 2 deletions packages/next/build/webpack/plugins/profiling-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
import { tracer } from '../../tracer'
import { webpack, isWebpack5 } from 'next/dist/compiled/webpack/webpack'

const pluginName = 'ProfilingPlugin'

export const spans = new WeakMap()

function getNormalModuleLoaderHook(compilation: any) {
if (isWebpack5) {
// @ts-ignore TODO: Remove ignore when webpack 5 is stable
return webpack.NormalModule.getCompilationHooks(compilation).loader
}

return compilation.hooks.normalModuleLoader
}

export class ProfilingPlugin {
apply(compiler: any) {
// Only enabled when instrumentation is loaded
if (!tracer.getCurrentSpan()) {
const currentSpan = tracer.getCurrentSpan()
console.log({
currentSpan,
isRecording: currentSpan?.isRecording(),
})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@timneutkens
Is this console.log kept intentionally?

Copy link
Member Author

@timneutkens timneutkens Jan 19, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't, totally missed this! Thanks!

if (!currentSpan || !currentSpan.isRecording()) {
return
}

Expand All @@ -29,7 +44,7 @@ export class ProfilingPlugin {
})
})

compilation.hooks.normalModuleLoader.tap(
getNormalModuleLoaderHook(compilation).tap(
pluginName,
(loaderContext: any, module: any) => {
const parentSpan = spans.get(module)
Expand Down