Skip to content

Commit 838de36

Browse files
committed
Merge branch 'develop' into feat/remix-fastify-adapter
2 parents fb15ad8 + 7eb000c commit 838de36

File tree

117 files changed

+1049
-670
lines changed

Some content is hidden

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

117 files changed

+1049
-670
lines changed

.size-limit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ module.exports = [
208208
'tls',
209209
],
210210
gzip: true,
211-
limit: '160 KB',
211+
limit: '180 KB',
212212
},
213213
];
214214

CHANGELOG.md

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

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

7+
## 8.0.0-beta.3
8+
9+
### Important Changes
10+
11+
- **feat(opentelemetry): Add `addOpenTelemetryInstrumentation` (#11667)**
12+
13+
A utility function `addOpenTelemetryInstrumentation` was added that allows for the registration of instrumentations that
14+
conform to the OpenTelemetry JS API without having to specify `@opentelemetry/instrumentation` as a dependency.
15+
16+
- **ref(core): Don't start transaction for trpc middleware (#11697)**
17+
18+
Going forward, the Sentry `trpcMiddleware` will only create spans. Previously it used to always create a transaction.
19+
This change was made to integrate more nicely with the HTTP instrumentation added in earlier versions to avoid creating
20+
unnecessary transactions.
21+
22+
### Other Changes
23+
24+
- feat(nextjs): Instrument outgoing http requests (#11685)
25+
- feat(opentelemetry): Remove setupGlobalHub (#11668)
26+
- fix: Missing ErrorEvent export are added to node, browser, bun, deno, vercel-edge sub-packages (#11649)
27+
- fix(nextjs): Do not sample next spans if they have remote parent (#11680)
28+
- fix(nextjs): Re-enable OTEL fetch instrumentation and disable Next.js fetch instrumentation (#11686)
29+
- fix(node): Ensure DSC on envelope header uses root span (#11683)
30+
- ref(browser): Streamline pageload span creation and scope handling (#11679)
31+
- ref(core): Directly use endSession (#11669)
32+
733
## 8.0.0-beta.2
834

935
### Important Changes
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Sentry.addBreadcrumb({
2+
category: 'auth',
3+
message: 'testing loader',
4+
level: 'error',
5+
});
6+
Sentry.captureMessage('test');
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { expect } from '@playwright/test';
2+
3+
import { sentryTest } from '../../../../utils/fixtures';
4+
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
5+
6+
sentryTest('should add breadcrumb to message', async ({ getLocalTestUrl, page }) => {
7+
const url = await getLocalTestUrl({ testDir: __dirname });
8+
const req = await waitForErrorRequestOnUrl(page, url);
9+
10+
const eventData = envelopeRequestParser(req);
11+
12+
expect(eventData.message).toBe('test');
13+
expect(eventData.breadcrumbs?.length).toBe(1);
14+
expect(eventData.breadcrumbs).toEqual([
15+
{
16+
category: 'auth',
17+
level: 'error',
18+
message: 'testing loader',
19+
timestamp: expect.any(Number),
20+
},
21+
]);
22+
});
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Sentry.onLoad(function () {
2+
Sentry.init({});
3+
Sentry.addBreadcrumb({
4+
category: 'auth',
5+
message: 'testing loader',
6+
level: 'error',
7+
});
8+
});
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Sentry.captureMessage('test');
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { expect } from '@playwright/test';
2+
3+
import { sentryTest } from '../../../../utils/fixtures';
4+
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
5+
6+
sentryTest('should add breadcrumb from onLoad callback to message', async ({ getLocalTestUrl, page }) => {
7+
const url = await getLocalTestUrl({ testDir: __dirname });
8+
const req = await waitForErrorRequestOnUrl(page, url);
9+
10+
const eventData = envelopeRequestParser(req);
11+
12+
expect(eventData.message).toBe('test');
13+
expect(eventData.breadcrumbs?.length).toBe(1);
14+
expect(eventData.breadcrumbs).toEqual([
15+
{
16+
category: 'auth',
17+
level: 'error',
18+
message: 'testing loader',
19+
timestamp: expect.any(Number),
20+
},
21+
]);
22+
});

dev-packages/browser-integration-tests/loader-suites/loader/onLoad/captureException/test.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,12 @@ sentryTest('captureException works', async ({ getLocalTestUrl, page }) => {
1111

1212
expect(eventData.message).toBe('Test exception');
1313
});
14+
15+
sentryTest('should set SENTRY_SDK_SOURCE value', async ({ getLocalTestUrl, page }) => {
16+
const url = await getLocalTestUrl({ testDir: __dirname });
17+
const req = await waitForErrorRequestOnUrl(page, url);
18+
19+
const eventData = envelopeRequestParser(req);
20+
21+
expect(eventData.sdk?.packages?.[0].name).toBe('loader:@sentry/browser');
22+
});

dev-packages/browser-integration-tests/loader-suites/loader/onLoad/captureExceptionInOnLoad/test.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,20 @@ sentryTest('captureException works inside of onLoad', async ({ getLocalTestUrl,
1919

2020
expect(eventData.message).toBe('Test exception');
2121
});
22+
23+
sentryTest('should set SENTRY_SDK_SOURCE value', async ({ getLocalTestUrl, page }) => {
24+
await page.route('https://dsn.ingest.sentry.io/**/*', route => {
25+
return route.fulfill({
26+
status: 200,
27+
contentType: 'application/json',
28+
body: JSON.stringify({ id: 'test-id' }),
29+
});
30+
});
31+
32+
const url = await getLocalTestUrl({ testDir: __dirname });
33+
const req = await waitForErrorRequestOnUrl(page, url);
34+
35+
const eventData = envelopeRequestParser(req);
36+
37+
expect(eventData.sdk?.packages?.[0].name).toBe('loader:@sentry/browser');
38+
});

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": "8.0.0-beta.2",
3+
"version": "8.0.0-beta.3",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {
@@ -42,7 +42,7 @@
4242
"@babel/preset-typescript": "^7.16.7",
4343
"@playwright/test": "^1.40.1",
4444
"@sentry-internal/rrweb": "2.11.0",
45-
"@sentry/browser": "8.0.0-beta.2",
45+
"@sentry/browser": "8.0.0-beta.3",
4646
"axios": "1.6.7",
4747
"babel-loader": "^8.2.2",
4848
"html-webpack-plugin": "^5.5.0",

0 commit comments

Comments
 (0)