Skip to content

Commit 0592b2b

Browse files
Merge branch 'v7' of github.com:getsentry/sentry-javascript into egou/v7/feat/add-exclusive-time-and-measurements-to-spans
2 parents 7a019ea + a09781f commit 0592b2b

File tree

70 files changed

+692
-306
lines changed

Some content is hidden

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

70 files changed

+692
-306
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,9 +1055,8 @@ jobs:
10551055
'node-express-app',
10561056
'create-react-app',
10571057
'create-next-app',
1058-
# disabling remix e2e tests because of flakes
1059-
# 'create-remix-app',
1060-
# 'create-remix-app-v2',
1058+
'create-remix-app',
1059+
'create-remix-app-v2',
10611060
'debug-id-sourcemaps',
10621061
'nextjs-app-dir',
10631062
'nextjs-14',

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+
## 7.103.0
8+
9+
### Important Changes
10+
11+
- **feat(core): Allow to pass `forceTransaction` to `startSpan()` APIs (#10819)**
12+
13+
You can now pass `forceTransaction: true` to `startSpan()`, `startSpanManual()` and `startInactiveSpan()`. This allows
14+
you to start a span that you want to be a transaction, if possible. Under the hood, the SDK will connect this span to
15+
the running active span (if there is one), but still send the new span as a transaction to the Sentry backend, if
16+
possible, ensuring it shows up as a transaction throughout the system.
17+
18+
Please note that setting this to `true` does not _guarantee_ that this will be sent as a transaction, but that the SDK
19+
will try to do so. You can enable this flag if this span is important to you and you want to ensure that you can see it
20+
in the Sentry UI.
21+
22+
### Other Changes
23+
24+
- fix: Make breadcrumbs option optional in WinterCGFetch integration (#10792)
25+
26+
## 7.102.1
27+
28+
- fix(performance): Fixes latest route name and source for interactions not updating properly on navigation (#10702)
29+
- fix(tracing): Guard against missing `window.location` (#10659)
30+
- ref: Make span types more robust (#10660)
31+
- ref(remix): Make `@remix-run/router` a dependency (v7) (#10779)
32+
733
## 7.102.0
834

935
- fix: Export session API (#10712)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/browser-integration-tests",
3-
"version": "7.102.0",
3+
"version": "7.103.0",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {
@@ -47,8 +47,8 @@
4747
"@babel/preset-typescript": "^7.16.7",
4848
"@playwright/test": "^1.40.1",
4949
"@sentry-internal/rrweb": "2.11.0",
50-
"@sentry/browser": "7.102.0",
51-
"@sentry/tracing": "7.102.0",
50+
"@sentry/browser": "7.103.0",
51+
"@sentry/tracing": "7.103.0",
5252
"axios": "1.6.0",
5353
"babel-loader": "^8.2.2",
5454
"html-webpack-plugin": "^5.5.0",

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": "7.102.0",
3+
"version": "7.103.0",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.client.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { StrictMode, startTransition, useEffect } from 'react';
1010
import { hydrateRoot } from 'react-dom/client';
1111

1212
Sentry.init({
13+
environment: 'qa', // dynamic sampling bias to keep transactions
1314
dsn: window.ENV.SENTRY_DSN,
1415
integrations: [
1516
new Sentry.BrowserTracing({

dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.server.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ installGlobals();
1919
const ABORT_DELAY = 5_000;
2020

2121
Sentry.init({
22+
environment: 'qa', // dynamic sampling bias to keep transactions
2223
dsn: process.env.E2E_TEST_DSN,
2324
// Performance Monitoring
2425
tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!

dev-packages/e2e-tests/test-applications/create-remix-app-v2/remix.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ module.exports = {
66
// serverBuildPath: 'build/index.js',
77
// publicPath: '/build/',
88
serverModuleFormat: 'cjs',
9-
entry,
109
};

dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/behaviour-client.test.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ test('Sends a client-side exception to Sentry', async ({ page }) => {
4747
.toBe(200);
4848
});
4949

50-
// Skipping test because of flake
51-
test.skip('Sends a pageload transaction to Sentry', async ({ page }) => {
50+
test('Sends a pageload transaction to Sentry', async ({ page }) => {
5251
await page.goto('/');
5352

5453
const recordedTransactionsHandle = await page.waitForFunction(() => {
@@ -107,8 +106,7 @@ test.skip('Sends a pageload transaction to Sentry', async ({ page }) => {
107106
expect(hadPageLoadTransaction).toBe(true);
108107
});
109108

110-
// Skipped because of test flake
111-
test.skip('Sends a navigation transaction to Sentry', async ({ page }) => {
109+
test('Sends a navigation transaction to Sentry', async ({ page }) => {
112110
await page.goto('/');
113111

114112
// Give pageload transaction time to finish

dev-packages/e2e-tests/test-applications/create-remix-app/app/entry.client.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { StrictMode, startTransition, useEffect } from 'react';
1010
import { hydrateRoot } from 'react-dom/client';
1111

1212
Sentry.init({
13+
environment: 'qa', // dynamic sampling bias to keep transactions
1314
dsn: window.ENV.SENTRY_DSN,
1415
integrations: [
1516
new Sentry.BrowserTracing({

dev-packages/e2e-tests/test-applications/create-remix-app/app/entry.server.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { renderToPipeableStream } from 'react-dom/server';
1616
const ABORT_DELAY = 5_000;
1717

1818
Sentry.init({
19+
environment: 'qa', // dynamic sampling bias to keep transactions
1920
dsn: process.env.E2E_TEST_DSN,
2021
// Performance Monitoring
2122
tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!

0 commit comments

Comments
 (0)