Add and update tests

packages/next/src/pages/_document.tsx

@@ -1077,7 +1077,6 @@ export class NextScript extends React.Component<OriginProps> {
               data-ampdevmode
             />
           ))}
-          {/* TODO: Do we need to render the meta tags here too? */}
         </>
       )
     }
@@ -1130,7 +1129,6 @@ export class NextScript extends React.Component<OriginProps> {
           !disableRuntimeJS &&
           this.getDynamicChunks(files)}
         {disableOptimizedLoading && !disableRuntimeJS && this.getScripts(files)}
-        {/* TODO: Do we need to render the meta tags here too? */}
       </>
     )
   }

test/e2e/opentelemetry/client-trace-metadata/app/static-page/page.tsx → test/e2e/opentelemetry/client-trace-metadata/app/app-router/static-page/page.tsx

@@ -4,10 +4,10 @@ export default function StaticPage() {
   return (
     <>
       <h1 id="static-page-header">Static Page</h1>
-      <Link href="/dynamic-page" id="go-to-dynamic-page">
+      <Link href="/app-router/dynamic-page" id="go-to-dynamic-page">
         Go to dynamic page
       </Link>
-      <Link href="/static-page-2" id="go-to-static-page">
+      <Link href="/app-router/static-page-2" id="go-to-static-page">
         Go to static page
       </Link>
     </>

test/e2e/opentelemetry/client-trace-metadata/instrumentation.ts

@@ -14,7 +14,7 @@ export async function register() {
           setter.set(
             carrier,
             'my-parent-span-id',
-            trace.getSpanContext(context).spanId
+            trace.getSpanContext(context)?.spanId ?? 'invariant'
           )
         },
         extract(context) {

test/e2e/opentelemetry/client-trace-metadata/pages/pages-router/dynamic-page.tsx

@@ -0,0 +1,7 @@
+export default function DynamicPage() {
+  return <h1 id="dynamic-page-header">Dynamic Page</h1>
+}
+
+export async function getServerSideProps() {
+  return { props: {} }
+}

test/e2e/opentelemetry/client-trace-metadata/pages/pages-router/static-page-2.tsx

@@ -0,0 +1,3 @@
+export default function StaticPage() {
+  return <h1 id="static-page-2-header">Static Page 2</h1>
+}

test/e2e/opentelemetry/client-trace-metadata/pages/pages-router/static-page.tsx

@@ -0,0 +1,15 @@
+import Link from 'next/link'
+
+export default function StaticPage() {
+  return (
+    <>
+      <h1 id="static-page-header">Static Page</h1>
+      <Link href="/pages-router/dynamic-page" id="go-to-dynamic-page">
+        Go to dynamic page
+      </Link>
+      <Link href="/pages-router/static-page-2" id="go-to-static-page">
+        Go to static page
+      </Link>
+    </>
+  )
+}