Skip to content

Commit

Permalink
misc: fix instrumentation with bundled server (#56318)
Browse files Browse the repository at this point in the history
This PR fixes an issue with the instrumentation hook breaking with the
bundled server. I'll follow up with a better test setup for the bundled
server in a follow up (tomorrow).

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->
  • Loading branch information
feedthejim authored Oct 2, 2023
1 parent 98432a4 commit 5fbc23e
Showing 1 changed file with 20 additions and 9 deletions.
29 changes: 20 additions & 9 deletions packages/next/src/server/next-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ import { loadManifest } from './load-manifest'

export * from './base-server'

declare const __non_webpack_require__: NodeRequire

const dynamicRequire = process.env.NEXT_MINIMAL
? __non_webpack_require__
: require

function writeStdoutLine(text: string) {
process.stdout.write(' ' + text + '\n')
}
Expand Down Expand Up @@ -244,12 +250,15 @@ export default class NextNodeServer extends BaseServer {
this.nextConfig.experimental.instrumentationHook
) {
try {
const instrumentationHook = await require(resolve(
this.serverOptions.dir || '.',
this.serverOptions.conf.distDir!,
'server',
INSTRUMENTATION_HOOK_FILENAME
))
const instrumentationHook = await dynamicRequire(
resolve(
this.serverOptions.dir || '.',
this.serverOptions.conf.distDir!,
'server',
INSTRUMENTATION_HOOK_FILENAME
)
)

await instrumentationHook.register?.()
} catch (err: any) {
if (err.code !== 'MODULE_NOT_FOUND') {
Expand Down Expand Up @@ -289,9 +298,11 @@ export default class NextNodeServer extends BaseServer {
const { incrementalCacheHandlerPath } = this.nextConfig.experimental

if (incrementalCacheHandlerPath) {
CacheHandler = require(isAbsolute(incrementalCacheHandlerPath)
? incrementalCacheHandlerPath
: join(this.distDir, incrementalCacheHandlerPath))
CacheHandler = dynamicRequire(
isAbsolute(incrementalCacheHandlerPath)
? incrementalCacheHandlerPath
: join(this.distDir, incrementalCacheHandlerPath)
)
CacheHandler = CacheHandler.default || CacheHandler
}

Expand Down

0 comments on commit 5fbc23e

Please sign in to comment.