Skip to content

Commit 189c4ea

Browse files
chore(deps): update JavaScript SDK to v7.47.0 (#2958)
Co-authored-by: Krystof Woldrich <[email protected]>
1 parent dadc233 commit 189c4ea

19 files changed

+132
-395
lines changed

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
### Dependencies
1212

13-
- Bump JavaScript SDK from v7.45.0 to v7.46.0 ([#2946](https://github.com/getsentry/sentry-react-native/pull/2946))
14-
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#7460)
15-
- [diff](https://github.com/getsentry/sentry-javascript/compare/7.45.0...7.46.0)
13+
- Bump JavaScript SDK from v7.45.0 to v7.47.0 ([#2946](https://github.com/getsentry/sentry-react-native/pull/2946), [#2958](https://github.com/getsentry/sentry-react-native/pull/2958))
14+
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#7470)
15+
- [diff](https://github.com/getsentry/sentry-javascript/compare/7.45.0...7.47.0)
1616
- Bump Android SDK from v6.16.0 to v6.17.0 ([#2948](https://github.com/getsentry/sentry-react-native/pull/2948))
1717
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6170)
1818
- [diff](https://github.com/getsentry/sentry-java/compare/6.16.0...6.17.0)

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@
4747
"react-native": ">=0.65.0"
4848
},
4949
"dependencies": {
50-
"@sentry/browser": "7.46.0",
50+
"@sentry-internal/tracing": "7.47.0",
51+
"@sentry/browser": "7.47.0",
5152
"@sentry/cli": "2.17.0",
52-
"@sentry/core": "7.46.0",
53-
"@sentry/hub": "7.46.0",
54-
"@sentry/integrations": "7.46.0",
55-
"@sentry/react": "7.46.0",
56-
"@sentry/tracing": "7.46.0",
57-
"@sentry/types": "7.46.0",
58-
"@sentry/utils": "7.46.0"
53+
"@sentry/core": "7.47.0",
54+
"@sentry/hub": "7.47.0",
55+
"@sentry/integrations": "7.47.0",
56+
"@sentry/react": "7.47.0",
57+
"@sentry/types": "7.47.0",
58+
"@sentry/utils": "7.47.0"
5959
},
6060
"devDependencies": {
61-
"@sentry-internal/eslint-config-sdk": "7.46.0",
62-
"@sentry-internal/eslint-plugin-sdk": "7.46.0",
61+
"@sentry-internal/eslint-config-sdk": "7.47.0",
62+
"@sentry-internal/eslint-plugin-sdk": "7.47.0",
6363
"@sentry/typescript": "^5.20.1",
6464
"@sentry/wizard": "2.6.1",
6565
"@types/jest": "^29.2.5",

scripts/update-javascript.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -euo pipefail
33

44
tagPrefix=''
55
repo="https://github.com/getsentry/sentry-javascript.git"
6-
packages=('@sentry/browser' '@sentry/core' '@sentry/hub' '@sentry/integrations' '@sentry/react' '@sentry/tracing' '@sentry/types' '@sentry/utils')
7-
packages+=('@sentry-internal/eslint-config-sdk' '@sentry-internal/eslint-plugin-sdk')
6+
packages=('@sentry/browser' '@sentry/core' '@sentry/hub' '@sentry/integrations' '@sentry/react' '@sentry/types' '@sentry/utils')
7+
packages+=('@sentry-internal/tracing', '@sentry-internal/eslint-config-sdk' '@sentry-internal/eslint-plugin-sdk')
88

99
. $(dirname "$0")/update-package-json.sh

src/js/index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ export {
3030
startTransaction,
3131
} from '@sentry/core';
3232

33-
// We need to import it so we patch the hub with global functions
34-
// aka. this has side effects
35-
import '@sentry/tracing';
36-
37-
// Add the React Native SDK's own tracing extensions, this needs to happen AFTER @sentry/tracing's
3833
import { _addTracingExtensions } from './measurements';
3934
_addTracingExtensions();
4035

src/js/measurements.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import type { Hub } from '@sentry/core';
2-
import { getCurrentHub, getMainCarrier } from '@sentry/core';
3-
import type { Transaction } from '@sentry/tracing';
1+
import type { Hub, Transaction } from '@sentry/core';
2+
import { addTracingExtensions, getCurrentHub, getMainCarrier } from '@sentry/core';
43
import type { CustomSamplingContext, Span, SpanContext, TransactionContext } from '@sentry/types';
54

65
import { DEFAULT, ReactNativeTracing } from './tracing';
@@ -13,9 +12,10 @@ export const STALL_TOTAL_TIME = 'stall_total_time';
1312
export const STALL_LONGEST_TIME = 'stall_longest_time';
1413

1514
/**
16-
* Adds React Native's extensions. Needs to be called after @sentry/tracing's extension methods are added
15+
* Adds React Native's extensions. Needs to be called before any transactions are created.
1716
*/
1817
export function _addTracingExtensions(): void {
18+
addTracingExtensions();
1919
const carrier = getMainCarrier();
2020
if (carrier.__SENTRY__) {
2121
carrier.__SENTRY__.extensions = carrier.__SENTRY__.extensions || {};

src/js/tracing/nativeframes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Span, Transaction } from '@sentry/tracing';
1+
import type { Span, Transaction } from '@sentry/core';
22
import type { Event, EventProcessor, Measurements, MeasurementUnit } from '@sentry/types';
33
import { logger, timestampInSeconds } from '@sentry/utils';
44

src/js/tracing/reactnativetracing.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
/* eslint-disable max-lines */
2-
import type { Hub } from '@sentry/core';
3-
import { getCurrentHub } from '@sentry/core';
4-
import type { IdleTransaction, RequestInstrumentationOptions, Transaction } from '@sentry/tracing';
5-
import {
6-
defaultRequestInstrumentationOptions,
7-
getActiveTransaction,
8-
instrumentOutgoingRequests,
9-
startIdleTransaction,
10-
} from '@sentry/tracing';
2+
import type { RequestInstrumentationOptions } from '@sentry-internal/tracing';
3+
import { instrumentOutgoingRequests } from '@sentry-internal/tracing';
4+
import { defaultRequestInstrumentationOptions } from '@sentry/browser';
5+
import type { Hub, IdleTransaction, Transaction } from '@sentry/core';
6+
import { getActiveTransaction, getCurrentHub, startIdleTransaction } from '@sentry/core';
117
import type { EventProcessor, Integration, Transaction as TransactionType, TransactionContext } from '@sentry/types';
128
import { logger } from '@sentry/utils';
139

src/js/tracing/stalltracking.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable max-lines */
2-
import type { IdleTransaction, Span, Transaction } from '@sentry/tracing';
2+
import type { IdleTransaction, Span, Transaction } from '@sentry/core';
33
import type { Measurements, MeasurementUnit } from '@sentry/types';
44
import { logger, timestampInSeconds } from '@sentry/utils';
55

src/js/tracing/transaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import type { IdleTransaction } from '@sentry/core';
12
import type { BeforeFinishCallback } from '@sentry/core/types/tracing/idletransaction';
2-
import type { IdleTransaction } from '@sentry/tracing';
33
import { logger } from '@sentry/utils';
44

55
/**

src/js/tracing/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { IdleTransaction, Span, Transaction } from '@sentry/tracing';
1+
import type { IdleTransaction, Span, Transaction } from '@sentry/core';
22
import type { TransactionContext, TransactionSource } from '@sentry/types';
33
import { timestampInSeconds } from '@sentry/utils';
44

0 commit comments

Comments
 (0)