Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-utils/sentry-instrumentation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ class SentryInstrumentation {
environment: IS_CI ? 'ci' : 'local',
tracesSampleRate: 1.0,
integrations: [nodeProfilingIntegration()],
profilesSampler: ({transactionContext}) => {
if (transactionContext.name === INCREMENTAL_BUILD_TXN) {
profilesSampler: samplingContext => {
if (samplingContext.name === INCREMENTAL_BUILD_TXN) {
return 0;
}
return 1;
Expand Down
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,11 @@
"@sentry-internal/rrweb": "2.26.0",
"@sentry-internal/rrweb-player": "2.26.0",
"@sentry-internal/rrweb-snapshot": "2.26.0",
"@sentry/core": "8.48.0",
"@sentry/node": "8.48.0",
"@sentry/react": "8.48.0",
"@sentry/core": "9.0.0-alpha.1",
"@sentry/node": "9.0.0-alpha.1",
"@sentry/react": "9.0.0-alpha.1",
"@sentry/release-parser": "^1.3.1",
"@sentry/status-page-list": "^0.6.0",
"@sentry/types": "8.48.0",
"@sentry/utils": "8.48.0",
"@sentry/webpack-plugin": "^3.1.1",
"@spotlightjs/spotlight": "^2.0.0-alpha.1",
"@tanstack/react-query": "^5.64.1",
Expand Down Expand Up @@ -180,7 +178,7 @@
"@eslint/js": "^9.17.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
"@sentry/jest-environment": "6.0.0",
"@sentry/profiling-node": "8.48.0",
"@sentry/profiling-node": "9.0.0-alpha.1",
"@styled/typescript-styled-plugin": "^1.0.1",
"@testing-library/dom": "10.1.0",
"@testing-library/jest-dom": "6.4.5",
Expand Down
4 changes: 2 additions & 2 deletions static/app/main.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {useState} from 'react';
import {createBrowserRouter, RouterProvider} from 'react-router-dom';
import {wrapCreateBrowserRouter} from '@sentry/react';
import {wrapCreateBrowserRouterV6} from '@sentry/react';
import {ReactQueryDevtools} from '@tanstack/react-query-devtools';

import DemoHeader from 'sentry/components/demo/demoHeader';
Expand All @@ -20,7 +20,7 @@ import {buildReactRouter6Routes} from './utils/reactRouter6Compat/router';
const queryClient = new QueryClient(DEFAULT_QUERY_CLIENT_CONFIG);

function buildRouter() {
const sentryCreateBrowserRouter = wrapCreateBrowserRouter(createBrowserRouter);
const sentryCreateBrowserRouter = wrapCreateBrowserRouterV6(createBrowserRouter);
const router = sentryCreateBrowserRouter(buildReactRouter6Routes(routes()));
DANGEROUS_SET_REACT_ROUTER_6_HISTORY(router);

Expand Down
7 changes: 4 additions & 3 deletions static/app/utils/performanceForSentry/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type {ProfilerOnRenderCallback, ReactNode} from 'react';
import {Fragment, Profiler, useEffect, useRef} from 'react';
import type {MeasurementUnit, Span, TransactionEvent} from '@sentry/core';
import {browserPerformanceTimeOrigin, timestampInSeconds} from '@sentry/core';
import * as Sentry from '@sentry/react';
import {browserPerformanceTimeOrigin, timestampInSeconds} from '@sentry/utils';

import {useLocation} from 'sentry/utils/useLocation';
import usePrevious from 'sentry/utils/usePrevious';
Expand Down Expand Up @@ -333,7 +333,8 @@ const addAssetMeasurements = (transaction: TransactionEvent) => {
};

const addCustomMeasurements = (transaction: TransactionEvent) => {
if (!browserPerformanceTimeOrigin || !transaction.start_timestamp) {
const browserTimeOrigin = browserPerformanceTimeOrigin();
if (!browserTimeOrigin || !transaction.start_timestamp) {
return;
}

Expand All @@ -348,7 +349,7 @@ const addCustomMeasurements = (transaction: TransactionEvent) => {
const context: MeasurementContext = {
transaction,
ttfb: ttfbValue,
browserTimeOrigin: browserPerformanceTimeOrigin,
browserTimeOrigin,
transactionStart: transaction.start_timestamp,
transactionOp: (transaction.contexts?.trace?.op as string) ?? 'pageload',
};
Expand Down
2 changes: 1 addition & 1 deletion tests/js/fixtures/team.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {uuid4} from '@sentry/utils';
import {uuid4} from '@sentry/core';

import type {DetailedTeam} from 'sentry/types/organization';

Expand Down
2 changes: 1 addition & 1 deletion tests/js/instrumentedEnv/userEventIntegration.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {fill, isThenable, loadModule} from '@sentry/core';
import * as Sentry from '@sentry/react';
import {fill, isThenable, loadModule} from '@sentry/utils';

export function instrumentUserEvent(): void {
const pkg = loadModule<any>('@testing-library/user-event');
Expand Down
Loading
Loading