Merge branch 'develop' into nh/langchain-embeddings

# Conflicts:
#	CHANGELOG.md

Author: nicohrubec

.github/workflows/validate-pr.yml

@@ -10,7 +10,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: getsentry/github-workflows/validate-pr@33c378e8d3aa1515164b62c16c210784cee35638
+      - uses: getsentry/github-workflows/validate-pr@71588ddf95134f804e82c5970a8098588e2eaecd
         with:
           app-id: ${{ vars.SDK_MAINTAINER_BOT_APP_ID }}
           private-key: ${{ secrets.SDK_MAINTAINER_BOT_PRIVATE_KEY }}

.version.json

@@ -1,4 +1,4 @@
 {
   "_comment": "Auto-generated by scripts/bump-version.js. Used by the gitflow sync workflow to detect version bumps. Do not edit manually.",
-  "version": "10.46.0"
+  "version": "10.47.0"
 }

CHANGELOG.md

@@ -2,6 +2,38 @@
 
 ## Unreleased
 
+- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
+
+- **ref(core): Remove provider-specific AI span attributes in favor of `gen_ai` attributes in sentry conventions ([#20011](https://github.com/getsentry/sentry-javascript/pull/20011))**
+
+  The following provider-specific span attributes have been removed from the OpenAI and Anthropic AI integrations. Use the standardized `gen_ai.*` equivalents instead:
+
+  | Removed attribute                | Replacement                  |
+  | -------------------------------- | ---------------------------- |
+  | `openai.response.id`             | `gen_ai.response.id`         |
+  | `openai.response.model`          | `gen_ai.response.model`      |
+  | `openai.usage.prompt_tokens`     | `gen_ai.usage.input_tokens`  |
+  | `openai.usage.completion_tokens` | `gen_ai.usage.output_tokens` |
+  | `openai.response.timestamp`      | _(removed, no replacement)_  |
+  | `anthropic.response.timestamp`   | _(removed, no replacement)_  |
+
+  If you reference these attributes in hooks (e.g. `beforeSendTransaction`), update them to the `gen_ai.*` equivalents.
+
+- feat(langchain): Support embeddings APIs in LangChain ([#20017](https://github.com/getsentry/sentry-javascript/pull/20017))
+
+  Adds instrumentation for LangChain embeddings (`embedQuery`, `embedDocuments`), creating `gen_ai.embeddings` spans. In Node.js, embedding classes from `@langchain/openai`, `@langchain/google-genai`, `@langchain/mistralai`, and `@langchain/google-vertexai` are auto-instrumented. For other runtimes, use the new `instrumentLangChainEmbeddings` API:
+
+  ```javascript
+  import * as Sentry from '@sentry/cloudflare';
+  import { OpenAIEmbeddings } from '@langchain/openai';
+
+  const embeddings = Sentry.instrumentLangChainEmbeddings(new OpenAIEmbeddings({ model: 'text-embedding-3-small' }));
+
+  await embeddings.embedQuery('Hello world');
+  ```
+
+## 10.47.0
+
 ### Important Changes
 
 - **feat(node-core): Add OTLP integration for node-core/light ([#19729](https://github.com/getsentry/sentry-javascript/pull/19729))**
@@ -53,24 +85,68 @@
   });
   ```
 
-- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
-- feat(core): Support embedding APIs in google-genai ([#19797](https://github.com/getsentry/sentry-javascript/pull/19797))
+- **feat(core): Support embedding APIs in google-genai ([#19797](https://github.com/getsentry/sentry-javascript/pull/19797))**
 
   Adds instrumentation for the Google GenAI [`embedContent`](https://ai.google.dev/gemini-api/docs/embeddings) API, creating `gen_ai.embeddings` spans.
 
-- feat(langchain): Support embeddings APIs in LangChain ([#20017](https://github.com/getsentry/sentry-javascript/pull/20017))
+- **feat(browser): Add `elementTimingIntegration` for tracking element render and load times ([#19869](https://github.com/getsentry/sentry-javascript/pull/19869))**
 
-  Adds instrumentation for LangChain embeddings (`embedQuery`, `embedDocuments`), creating `gen_ai.embeddings` spans. In Node.js, embedding classes from `@langchain/openai`, `@langchain/google-genai`, `@langchain/mistralai`, and `@langchain/google-vertexai` are auto-instrumented. For other runtimes, use the new `instrumentLangChainEmbeddings` API:
+  The new `elementTimingIntegration` captures Element Timing API data as Sentry metrics. It emits `element_timing.render_time` and `element_timing.load_time` distribution metrics for elements annotated with the `elementtiming` HTML attribute.
 
-  ```javascript
-  import * as Sentry from '@sentry/cloudflare';
-  import { OpenAIEmbeddings } from '@langchain/openai';
+  ```ts
+  import * as Sentry from '@sentry/browser';
 
-  const embeddings = Sentry.instrumentLangChainEmbeddings(new OpenAIEmbeddings({ model: 'text-embedding-3-small' }));
+  Sentry.init({
+    dsn: '__DSN__',
+    integrations: [Sentry.browserTracingIntegration(), Sentry.elementTimingIntegration()],
+  });
+  ```
 
-  await embeddings.embedQuery('Hello world');
+  ```html
+  <img src="hero.jpg" elementtiming="hero-image" />
   ```
 
+### Other Changes
+
+- feat(nuxt): Add middleware instrumentation compatibility for Nuxt 5 ([#19968](https://github.com/getsentry/sentry-javascript/pull/19968))
+- feat(nuxt): Support parametrized SSR routes in Nuxt 5 ([#19977](https://github.com/getsentry/sentry-javascript/pull/19977))
+- feat(solid): Add route parametrization for Solid Router ([#20031](https://github.com/getsentry/sentry-javascript/pull/20031))
+- fix(core): Guard nullish response in supabase PostgREST handler ([#20033](https://github.com/getsentry/sentry-javascript/pull/20033))
+- fix(node): Deduplicate `sentry-trace` and `baggage` headers on outgoing requests ([#19960](https://github.com/getsentry/sentry-javascript/pull/19960))
+- fix(node): Ensure startNewTrace propagates traceId in OTel environments ([#19963](https://github.com/getsentry/sentry-javascript/pull/19963))
+- fix(nuxt): Use virtual module for Nuxt pages data (SSR route parametrization) ([#20020](https://github.com/getsentry/sentry-javascript/pull/20020))
+- fix(opentelemetry): Convert seconds timestamps in span.end() to milliseconds ([#19958](https://github.com/getsentry/sentry-javascript/pull/19958))
+- fix(profiling): Disable profiling in worker threads ([#20040](https://github.com/getsentry/sentry-javascript/pull/20040))
+- fix(react-router): Disable debug ID injection in Vite plugin to prevent double injection ([#19890](https://github.com/getsentry/sentry-javascript/pull/19890))
+- refactor(browser): Reduce browser package bundle size ([#19856](https://github.com/getsentry/sentry-javascript/pull/19856))
+- feat(deps): Bump OpenTelemetry dependencies ([#20046](https://github.com/getsentry/sentry-javascript/pull/20046))
+
+<details>
+  <summary> <strong>Internal Changes</strong> </summary>
+
+- chore: Add shared validate-pr composite action ([#20025](https://github.com/getsentry/sentry-javascript/pull/20025))
+- chore: Update validate-pr action to latest version ([#20027](https://github.com/getsentry/sentry-javascript/pull/20027))
+- chore(deps): Bump @apollo/server from 5.4.0 to 5.5.0 ([#20007](https://github.com/getsentry/sentry-javascript/pull/20007))
+- chore(deps): Bump amqplib from 0.10.7 to 0.10.9 ([#20000](https://github.com/getsentry/sentry-javascript/pull/20000))
+- chore(deps): Bump srvx from 0.11.12 to 0.11.13 ([#20001](https://github.com/getsentry/sentry-javascript/pull/20001))
+- chore(deps-dev): Bump node-forge from 1.3.2 to 1.4.0 ([#20012](https://github.com/getsentry/sentry-javascript/pull/20012))
+- chore(deps-dev): Bump yaml from 2.8.2 to 2.8.3 ([#19985](https://github.com/getsentry/sentry-javascript/pull/19985))
+- ci(deps): Bump actions/upload-artifact from 6 to 7 ([#19569](https://github.com/getsentry/sentry-javascript/pull/19569))
+- docs(release): Update publishing-a-release.md ([#19982](https://github.com/getsentry/sentry-javascript/pull/19982))
+- feat(deps): Bump babel-loader from 10.0.0 to 10.1.1 ([#19997](https://github.com/getsentry/sentry-javascript/pull/19997))
+- feat(deps): Bump handlebars from 4.7.7 to 4.7.9 ([#20008](https://github.com/getsentry/sentry-javascript/pull/20008))
+- fix(browser-tests): Pin axios to 1.13.5 to avoid compromised 1.14.1 ([#20047](https://github.com/getsentry/sentry-javascript/pull/20047))
+- fix(ci): Update validate-pr action to remove draft enforcement ([#20035](https://github.com/getsentry/sentry-javascript/pull/20035))
+- fix(ci): Update validate-pr action to remove draft enforcement ([#20037](https://github.com/getsentry/sentry-javascript/pull/20037))
+- fix(e2e): Pin @opentelemetry/api to 1.9.0 in ts3.8 test app ([#19992](https://github.com/getsentry/sentry-javascript/pull/19992))
+- ref(browser-tests): Add waitForMetricRequest helper ([#20002](https://github.com/getsentry/sentry-javascript/pull/20002))
+- ref(core): Consolidate getOperationName into one shared utility ([#19971](https://github.com/getsentry/sentry-javascript/pull/19971))
+- ref(core): Introduce instrumented method registry for AI integrations ([#19981](https://github.com/getsentry/sentry-javascript/pull/19981))
+- test(deno): Expand Deno E2E test coverage ([#19957](https://github.com/getsentry/sentry-javascript/pull/19957))
+- test(e2e): Add e2e tests for `nodeRuntimeMetricsIntegration` ([#19989](https://github.com/getsentry/sentry-javascript/pull/19989))
+
+</details>
+
 ## 10.46.0
 
 ### Important Changes

dev-packages/browser-integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "10.46.0",
+  "version": "10.47.0",
   "main": "index.js",
   "license": "MIT",
   "engines": {
@@ -60,9 +60,9 @@
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "~1.56.0",
     "@sentry-internal/rrweb": "2.34.0",
-    "@sentry/browser": "10.46.0",
+    "@sentry/browser": "10.47.0",
     "@supabase/supabase-js": "2.49.3",
-    "axios": "^1.12.2",
+    "axios": "1.13.5",
     "babel-loader": "^10.1.1",
     "fflate": "0.8.2",
     "html-webpack-plugin": "^5.5.0",

dev-packages/browser-integration-tests/suites/tracing/metrics/element-timing/test.ts

@@ -1,84 +1,15 @@
-import type { Page, Request, Route } from '@playwright/test';
+import type { Page, Route } from '@playwright/test';
 import { expect } from '@playwright/test';
-import type { Envelope } from '@sentry/core';
+import type { SerializedMetric } from '@sentry/core';
 import { sentryTest } from '../../../../utils/fixtures';
-import {
-  properFullEnvelopeRequestParser,
-  shouldSkipMetricsTest,
-  shouldSkipTracingTest,
-} from '../../../../utils/helpers';
-
-type MetricItem = Record<string, unknown> & {
-  name: string;
-  type: string;
-  value: number;
-  unit?: string;
-  attributes: Record<string, { value: string | number; type: string }>;
-};
-
-function extractMetricsFromRequest(req: Request): MetricItem[] {
-  try {
-    const envelope = properFullEnvelopeRequestParser<Envelope>(req);
-    const items = envelope[1];
-    const metrics: MetricItem[] = [];
-    for (const item of items) {
-      const [header] = item;
-      if (header.type === 'trace_metric') {
-        const payload = item[1] as { items?: MetricItem[] };
-        if (payload.items) {
-          metrics.push(...payload.items);
-        }
-      }
-    }
-    return metrics;
-  } catch {
-    return [];
-  }
-}
-
-/**
- * Collects element timing metrics from envelope requests on the page.
- * Returns a function to get all collected metrics so far and a function
- * that waits until all expected identifiers have been seen in render_time metrics.
- */
-function createMetricCollector(page: Page) {
-  const collectedRequests: Request[] = [];
-
-  page.on('request', req => {
-    if (!req.url().includes('/api/1337/envelope/')) return;
-    const metrics = extractMetricsFromRequest(req);
-    if (metrics.some(m => m.name.startsWith('ui.element.'))) {
-      collectedRequests.push(req);
-    }
-  });
-
-  function getAll(): MetricItem[] {
-    return collectedRequests.flatMap(req => extractMetricsFromRequest(req));
-  }
+import { shouldSkipMetricsTest, shouldSkipTracingTest, waitForMetrics } from '../../../../utils/helpers';
 
-  async function waitForIdentifiers(identifiers: string[], timeout = 30_000): Promise<void> {
-    const deadline = Date.now() + timeout;
-    while (Date.now() < deadline) {
-      const all = getAll().filter(m => m.name === 'ui.element.render_time');
-      const seen = new Set(all.map(m => m.attributes['ui.element.identifier']?.value));
-      if (identifiers.every(id => seen.has(id))) {
-        return;
-      }
-      await page.waitForTimeout(500);
-    }
-    // Final check with assertion for clear error message
-    const all = getAll().filter(m => m.name === 'ui.element.render_time');
-    const seen = all.map(m => m.attributes['ui.element.identifier']?.value);
-    for (const id of identifiers) {
-      expect(seen).toContain(id);
-    }
-  }
-
-  function reset(): void {
-    collectedRequests.length = 0;
-  }
+function getIdentifier(m: SerializedMetric): unknown {
+  return m.attributes?.['ui.element.identifier']?.value;
+}
 
-  return { getAll, waitForIdentifiers, reset };
+function getPaintType(m: SerializedMetric): unknown {
+  return m.attributes?.['ui.element.paint_type']?.value;
 }
 
 sentryTest(
@@ -91,19 +22,23 @@ sentryTest(
     serveAssets(page);
 
     const url = await getLocalTestUrl({ testDir: __dirname });
-    const collector = createMetricCollector(page);
 
-    await page.goto(url);
+    const expectedIdentifiers = ['image-fast', 'text1', 'button1', 'image-slow', 'lazy-image', 'lazy-text'];
 
-    // Wait until all expected element identifiers have been flushed as metrics
-    await collector.waitForIdentifiers(['image-fast', 'text1', 'button1', 'image-slow', 'lazy-image', 'lazy-text']);
+    // Wait for all expected element identifiers to arrive as metrics
+    const [allMetrics] = await Promise.all([
+      waitForMetrics(page, metrics => {
+        const seen = new Set(metrics.filter(m => m.name === 'ui.element.render_time').map(getIdentifier));
+        return expectedIdentifiers.every(id => seen.has(id));
+      }),
+      page.goto(url),
+    ]);
 
-    const allMetrics = collector.getAll().filter(m => m.name.startsWith('ui.element.'));
     const renderTimeMetrics = allMetrics.filter(m => m.name === 'ui.element.render_time');
     const loadTimeMetrics = allMetrics.filter(m => m.name === 'ui.element.load_time');
 
-    const renderIdentifiers = renderTimeMetrics.map(m => m.attributes['ui.element.identifier']?.value);
-    const loadIdentifiers = loadTimeMetrics.map(m => m.attributes['ui.element.identifier']?.value);
+    const renderIdentifiers = renderTimeMetrics.map(getIdentifier);
+    const loadIdentifiers = loadTimeMetrics.map(getIdentifier);
 
     // All text and image elements should have render_time
     expect(renderIdentifiers).toContain('image-fast');
@@ -124,18 +59,18 @@ sentryTest(
     expect(loadIdentifiers).not.toContain('lazy-text');
 
     // Validate metric structure for image-fast
-    const imageFastRender = renderTimeMetrics.find(m => m.attributes['ui.element.identifier']?.value === 'image-fast');
+    const imageFastRender = renderTimeMetrics.find(m => getIdentifier(m) === 'image-fast');
     expect(imageFastRender).toMatchObject({
       name: 'ui.element.render_time',
       type: 'distribution',
       unit: 'millisecond',
       value: expect.any(Number),
     });
-    expect(imageFastRender!.attributes['ui.element.paint_type']?.value).toBe('image-paint');
+    expect(getPaintType(imageFastRender!)).toBe('image-paint');
 
     // Validate text-paint metric
-    const text1Render = renderTimeMetrics.find(m => m.attributes['ui.element.identifier']?.value === 'text1');
-    expect(text1Render!.attributes['ui.element.paint_type']?.value).toBe('text-paint');
+    const text1Render = renderTimeMetrics.find(m => getIdentifier(m) === 'text1');
+    expect(getPaintType(text1Render!)).toBe('text-paint');
   },
 );
 
@@ -147,25 +82,31 @@ sentryTest('emits element timing metrics after navigation', async ({ getLocalTes
   serveAssets(page);
 
   const url = await getLocalTestUrl({ testDir: __dirname });
-  const collector = createMetricCollector(page);
+
+  // Start listening before navigation to avoid missing metrics
+  const pageloadMetricsPromise = waitForMetrics(page, metrics =>
+    metrics.some(m => m.name === 'ui.element.render_time' && getIdentifier(m) === 'image-fast'),
+  );
 
   await page.goto(url);
 
   // Wait for pageload element timing metrics to arrive before navigating
-  await collector.waitForIdentifiers(['image-fast', 'text1']);
+  await pageloadMetricsPromise;
 
-  // Reset so we only capture post-navigation metrics
-  collector.reset();
+  // Start listening before click to avoid missing metrics
+  const navigationMetricsPromise = waitForMetrics(page, metrics => {
+    const seen = new Set(metrics.filter(m => m.name === 'ui.element.render_time').map(getIdentifier));
+    return seen.has('navigation-image') && seen.has('navigation-text');
+  });
 
   // Trigger navigation
   await page.locator('#button1').click();
 
   // Wait for navigation element timing metrics
-  await collector.waitForIdentifiers(['navigation-image', 'navigation-text']);
+  const navigationMetrics = await navigationMetricsPromise;
 
-  const allMetrics = collector.getAll();
-  const renderTimeMetrics = allMetrics.filter(m => m.name === 'ui.element.render_time');
-  const renderIdentifiers = renderTimeMetrics.map(m => m.attributes['ui.element.identifier']?.value);
+  const renderTimeMetrics = navigationMetrics.filter(m => m.name === 'ui.element.render_time');
+  const renderIdentifiers = renderTimeMetrics.map(getIdentifier);
 
   expect(renderIdentifiers).toContain('navigation-image');
   expect(renderIdentifiers).toContain('navigation-text');

dev-packages/browser-integration-tests/suites/tracing/request/fetch-trace-header-merging/test.ts

@@ -39,9 +39,10 @@ async function assertRequests({
 
     // No merged sentry trace headers
     expect(headers['sentry-trace']).not.toContain(',');
+    expect(headers['sentry-trace']).toBe('12312012123120121231201212312012-1121201211212012-1');
 
     // No multiple baggage entries
-    expect(headers['baggage'].match(/sentry-release/g) ?? []).toHaveLength(1);
+    expect(headers['baggage']).toBe('sentry-release=4.2.0');
   });
 }