Unverified Commit 19f2fe45 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Ensure opentelemetry mismatched version error bubbles (#55868)

Noticed that the error happens to be caught accidentally and doesn't bubble up because of that.
parent ec671bb5
...@@ -536,6 +536,31 @@ export async function loadProjectInfo({ ...@@ -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[\\/][^\\/]+(?:$|\?|#)/ const UNSAFE_CACHE_REGEX = /[\\/]pages[\\/][^\\/]+(?:$|\?|#)/
export default async function getBaseWebpackConfig( export default async function getBaseWebpackConfig(
...@@ -927,22 +952,6 @@ export default async function getBaseWebpackConfig( ...@@ -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'] = { const resolveConfig: webpack.Configuration['resolve'] = {
// Disable .mjs for node_modules bundling // Disable .mjs for node_modules bundling
extensions: isNodeServer extensions: isNodeServer
...@@ -995,7 +1004,7 @@ export default async function getBaseWebpackConfig( ...@@ -995,7 +1004,7 @@ export default async function getBaseWebpackConfig(
: undefined), : undefined),
// For RSC server bundle // For RSC server bundle
...(!hasExternalOtelApiPackage && { ...(!hasExternalOtelApiPackage() && {
'@opentelemetry/api': 'next/dist/compiled/@opentelemetry/api', '@opentelemetry/api': 'next/dist/compiled/@opentelemetry/api',
}), }),
......
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