Skip to content

Commit

Permalink
Ensure opentelemetry mismatched version error bubbles (#55868)
Browse files Browse the repository at this point in the history
Noticed that the error happens to be caught accidentally and doesn't bubble up because of that.
  • Loading branch information
timneutkens committed Sep 23, 2023
1 parent ec671bb commit 19f2fe4
Showing 1 changed file with 26 additions and 17 deletions.
43 changes: 26 additions & 17 deletions packages/next/src/build/webpack-config.ts
Expand Up @@ -536,6 +536,31 @@ export async function loadProjectInfo({
}
}

function getOpenTelemetryVersion(): string | null {
try {
return require('@opentelemetry/api/package.json')?.version ?? null
} catch {
return null
}
}

function hasExternalOtelApiPackage(): boolean {
const opentelemetryVersion = getOpenTelemetryVersion()
if (!opentelemetryVersion) {
return false
}

// 0.19.0 is the first version of the package that has the `tracer.getSpan` API that we need:
// https://github.com/vercel/next.js/issues/48118
if (semver.gte(opentelemetryVersion, '0.19.0')) {
return true
} else {
throw new Error(
`Installed "@opentelemetry/api" with version ${opentelemetryVersion} is not supported by Next.js. Please upgrade to 0.19.0 or newer version.`
)
}
}

const UNSAFE_CACHE_REGEX = /[\\/]pages[\\/][^\\/]+(?:$|\?|#)/

export default async function getBaseWebpackConfig(
Expand Down Expand Up @@ -927,22 +952,6 @@ export default async function getBaseWebpackConfig(
]
}

let hasExternalOtelApiPackage = false
try {
const opentelemetryPackageJson = require('@opentelemetry/api/package.json')
if (opentelemetryPackageJson.version) {
// 0.19.0 is the first version of the package that has the `tracer.getSpan` API that we need:
// https://github.com/vercel/next.js/issues/48118
if (semver.gte(opentelemetryPackageJson.version, '0.19.0')) {
hasExternalOtelApiPackage = true
} else {
throw new Error(
`Installed "@opentelemetry/api" with version ${opentelemetryPackageJson.version} is not supported by Next.js. Please upgrade to 0.19.0 or newer version.`
)
}
}
} catch {}

const resolveConfig: webpack.Configuration['resolve'] = {
// Disable .mjs for node_modules bundling
extensions: isNodeServer
Expand Down Expand Up @@ -995,7 +1004,7 @@ export default async function getBaseWebpackConfig(
: undefined),

// For RSC server bundle
...(!hasExternalOtelApiPackage && {
...(!hasExternalOtelApiPackage() && {
'@opentelemetry/api': 'next/dist/compiled/@opentelemetry/api',
}),

Expand Down

0 comments on commit 19f2fe4

Please sign in to comment.