Skip to content

Commit 535932c

Browse files
authored
Merge branch 'develop' into aliu/span-flags-v2
2 parents 8085ee8 + 0635a5b commit 535932c

File tree

132 files changed

+4131
-783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+4131
-783
lines changed

.github/actions/install-playwright/action.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ runs:
3434
working-directory: ${{ inputs.cwd }}
3535

3636
- name: Install Playwright system dependencies only (cached)
37-
run: npx playwright install-deps ${{ inputs.browsers || 'chromium webkit firefox' }}
37+
env:
38+
PLAYWRIGHT_BROWSERS: ${{ inputs.browsers || 'chromium webkit firefox' }}
39+
run: npx playwright install-deps "$PLAYWRIGHT_BROWSERS"
3840
if: steps.playwright-cache.outputs.cache-hit == 'true'
3941
shell: bash
4042
working-directory: ${{ inputs.cwd }}

.size-limit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ module.exports = [
206206
import: createImport('init'),
207207
ignore: ['next/router', 'next/constants'],
208208
gzip: true,
209-
limit: '42 KB',
209+
limit: '43 KB',
210210
},
211211
// SvelteKit SDK (ESM)
212212
{

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,33 @@
44

55
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
66

7+
## 9.28.0
8+
9+
### Important Changes
10+
11+
- **feat(nestjs): Stop creating spans for `TracingInterceptor` ([#16501](https://github.com/getsentry/sentry-javascript/pull/16501))**
12+
13+
With this change we stop creating spans for `TracingInterceptor` as this interceptor only serves as an internal helper and adds noise for the user.
14+
15+
- **feat(node): Update vercel ai spans as per new conventions ([#16497](https://github.com/getsentry/sentry-javascript/pull/16497))**
16+
17+
This feature ships updates to the span names and ops to better match OpenTelemetry. This should make them more easily accessible to the new agents module view we are building.
18+
19+
### Other Changes
20+
21+
- fix(sveltekit): Export `vercelAIIntegration` from `@sentry/node` ([#16496](https://github.com/getsentry/sentry-javascript/pull/16496))
22+
23+
Work in this release was contributed by @agrattan0820. Thank you for your contribution!
24+
25+
## 9.27.0
26+
27+
- feat(node): Expand how vercel ai input/outputs can be set ([#16455](https://github.com/getsentry/sentry-javascript/pull/16455))
28+
- feat(node): Switch to new semantic conventions for Vercel AI ([#16476](https://github.com/getsentry/sentry-javascript/pull/16476))
29+
- feat(react-router): Add component annotation plugin ([#16472](https://github.com/getsentry/sentry-javascript/pull/16472))
30+
- feat(react-router): Export wrappers for server loaders and actions ([#16481](https://github.com/getsentry/sentry-javascript/pull/16481))
31+
- fix(browser): Ignore unrealistically long INP values ([#16484](https://github.com/getsentry/sentry-javascript/pull/16484))
32+
- fix(react-router): Conditionally add `ReactRouterServer` integration ([#16470](https://github.com/getsentry/sentry-javascript/pull/16470))
33+
734
## 9.26.0
835

936
- feat(react-router): Re-export functions from `@sentry/react` ([#16465](https://github.com/getsentry/sentry-javascript/pull/16465))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/browser-integration-tests",
3-
"version": "9.26.0",
3+
"version": "9.28.0",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {
@@ -42,7 +42,7 @@
4242
"@babel/preset-typescript": "^7.16.7",
4343
"@playwright/test": "~1.50.0",
4444
"@sentry-internal/rrweb": "2.34.0",
45-
"@sentry/browser": "9.26.0",
45+
"@sentry/browser": "9.28.0",
4646
"@supabase/supabase-js": "2.49.3",
4747
"axios": "1.8.2",
4848
"babel-loader": "^8.2.2",

dev-packages/bundle-analyzer-scenarios/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/bundle-analyzer-scenarios",
3-
"version": "9.26.0",
3+
"version": "9.28.0",
44
"description": "Scenarios to test bundle analysis with",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/dev-packages/bundle-analyzer-scenarios",

dev-packages/clear-cache-gh-action/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@sentry-internal/clear-cache-gh-action",
33
"description": "An internal Github Action to clear GitHub caches.",
4-
"version": "9.26.0",
4+
"version": "9.28.0",
55
"license": "MIT",
66
"engines": {
77
"node": ">=18"

dev-packages/e2e-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/e2e-tests",
3-
"version": "9.26.0",
3+
"version": "9.28.0",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts

Lines changed: 6 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -112,36 +112,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
112112
op: 'request_context.nestjs',
113113
origin: 'auto.http.otel.nestjs',
114114
},
115-
{
116-
span_id: expect.stringMatching(/[a-f0-9]{16}/),
117-
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
118-
data: {
119-
'sentry.origin': 'auto.middleware.nestjs',
120-
'sentry.op': 'middleware.nestjs',
121-
},
122-
description: 'SentryTracingInterceptor',
123-
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
124-
start_timestamp: expect.any(Number),
125-
timestamp: expect.any(Number),
126-
status: 'ok',
127-
op: 'middleware.nestjs',
128-
origin: 'auto.middleware.nestjs',
129-
},
130-
{
131-
span_id: expect.stringMatching(/[a-f0-9]{16}/),
132-
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
133-
data: {
134-
'sentry.origin': 'auto.middleware.nestjs',
135-
'sentry.op': 'middleware.nestjs',
136-
},
137-
description: 'SentryTracingInterceptor',
138-
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
139-
start_timestamp: expect.any(Number),
140-
timestamp: expect.any(Number),
141-
status: 'ok',
142-
op: 'middleware.nestjs',
143-
origin: 'auto.middleware.nestjs',
144-
},
145115
{
146116
span_id: expect.stringMatching(/[a-f0-9]{16}/),
147117
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -183,29 +153,19 @@ test('Sends an API route transaction', async ({ baseURL }) => {
183153
status: 'ok',
184154
origin: 'manual',
185155
},
186-
{
187-
span_id: expect.stringMatching(/[a-f0-9]{16}/),
188-
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
189-
data: {
190-
'sentry.origin': 'auto.middleware.nestjs',
191-
'sentry.op': 'middleware.nestjs',
192-
},
193-
description: 'Interceptors - After Route',
194-
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
195-
start_timestamp: expect.any(Number),
196-
timestamp: expect.any(Number),
197-
status: 'ok',
198-
op: 'middleware.nestjs',
199-
origin: 'auto.middleware.nestjs',
200-
},
201156
]),
157+
start_timestamp: expect.any(Number),
158+
timestamp: expect.any(Number),
202159
transaction: 'GET /test-transaction',
203-
type: 'transaction',
204160
transaction_info: {
205161
source: 'route',
206162
},
163+
type: 'transaction',
207164
}),
208165
);
166+
167+
const spanDescriptions = transactionEvent.spans.map(span => span.description);
168+
expect(spanDescriptions).not.toContain('SentryTracingInterceptor');
209169
});
210170

211171
test('API route transaction includes nest middleware span. Spans created in and after middleware are nested correctly', async ({

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ const DEPENDENTS: Dependent[] = [
5050
ignoreExports: [
5151
// not supported in bun:
5252
'NodeClient',
53+
'NODE_VERSION',
5354
'childProcessIntegration',
5455
],
5556
},
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# dependencies
4+
/node_modules
5+
/.pnp
6+
.pnp.js
7+
8+
# testing
9+
/coverage
10+
11+
# production
12+
/build
13+
14+
# misc
15+
.DS_Store
16+
.env.local
17+
.env.development.local
18+
.env.test.local
19+
.env.production.local
20+
21+
npm-debug.log*
22+
yarn-debug.log*
23+
yarn-error.log*
24+
25+
/test-results/
26+
/playwright-report/
27+
/playwright/.cache/
28+
29+
!*.d.ts
30+
31+
# react router
32+
.react-router

0 commit comments

Comments
 (0)