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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
- Navigation Span should have no parent by default ([#4326](https://github.com/getsentry/sentry-react-native/pull/4326))
- Disable HTTP Client Errors on iOS ([#4347](https://github.com/getsentry/sentry-react-native/pull/4347))

### Changes

- Falsy values of `options.environment` (empty string, undefined...) default to `production`

### Dependencies

- Bump CLI from v2.38.2 to v2.39.1 ([#4305](https://github.com/getsentry/sentry-react-native/pull/4305), [#4316](https://github.com/getsentry/sentry-react-native/pull/4316))
Expand All @@ -50,6 +54,9 @@
- Bump Android SDK from v7.18.0 to v7.18.1 ([#4329](https://github.com/getsentry/sentry-react-native/pull/4329))
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7181)
- [diff](https://github.com/getsentry/sentry-java/compare/7.18.0...7.18.1)
- Bump JavaScript SDK from v8.40.0 to v8.41.0 ([#4351](https://github.com/getsentry/sentry-react-native/pull/4351))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add small ### Changes section and add - Falsy values of options.environment(empty string, undefined...) default toproduction``

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point 👍
thank you for catching this and adding a changelog @krystofwoldrich 🙇

- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8410)
- [diff](https://github.com/getsentry/sentry-javascript/compare/8.40.0...8.41.0)

## 6.4.0

Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@babel/preset-env": "^7.25.3",
"@babel/preset-typescript": "^7.18.6",
"@sentry/react-native": "6.4.0",
"@sentry/utils": "8.40.0",
"@sentry/utils": "8.41.0",
"@types/node": "^20.9.3",
"@types/react": "^18.2.64",
"appium": "2.4.1",
Expand Down
16 changes: 8 additions & 8 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,21 @@
},
"dependencies": {
"@sentry/babel-plugin-component-annotate": "2.20.1",
"@sentry/browser": "8.40.0",
"@sentry/browser": "8.41.0",
"@sentry/cli": "2.39.1",
"@sentry/core": "8.40.0",
"@sentry/react": "8.40.0",
"@sentry/types": "8.40.0",
"@sentry/utils": "8.40.0"
"@sentry/core": "8.41.0",
"@sentry/react": "8.41.0",
"@sentry/types": "8.41.0",
"@sentry/utils": "8.41.0"
},
"devDependencies": {
"@babel/core": "^7.25.2",
"@expo/metro-config": "0.19.5",
"@mswjs/interceptors": "^0.25.15",
"@react-native/babel-preset": "0.76.3",
"@sentry-internal/eslint-config-sdk": "8.40.0",
"@sentry-internal/eslint-plugin-sdk": "8.40.0",
"@sentry-internal/typescript": "8.40.0",
"@sentry-internal/eslint-config-sdk": "8.41.0",
"@sentry-internal/eslint-plugin-sdk": "8.41.0",
"@sentry-internal/typescript": "8.41.0",
"@sentry/wizard": "3.36.0",
"@testing-library/react-native": "^12.7.2",
"@types/jest": "^29.5.3",
Expand Down
19 changes: 6 additions & 13 deletions packages/core/test/profiling/integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { getClient, spanToJSON } from '@sentry/core';
import type { Envelope, Event, Integration, Profile, Span, ThreadCpuProfile, Transport } from '@sentry/types';

import * as Sentry from '../../src/js';
import type { NativeDeviceContextsResponse } from '../../src/js/NativeRNSentry';
import { getDebugMetadata } from '../../src/js/profiling/debugid';
import type { HermesProfilingOptions } from '../../src/js/profiling/integration';
import { hermesProfilingIntegration } from '../../src/js/profiling/integration';
Expand Down Expand Up @@ -79,9 +78,6 @@ describe('profiling integration', () => {
describe('environment', () => {
beforeEach(() => {
(getDefaultEnvironment as jest.Mock).mockReturnValue('mocked');
mockWrapper.NATIVE.fetchNativeDeviceContexts.mockResolvedValue(<NativeDeviceContextsResponse>{
environment: 'native',
});
});

const expectTransactionWithEnvironment = (envelope: Envelope | undefined, env: string | undefined) => {
Expand Down Expand Up @@ -114,31 +110,28 @@ describe('profiling integration', () => {
expectProfileWithEnvironment(envelope, 'mocked');
});

test('should use native environment for transaction and profile if user value is nullish', () => {
test('should use production environment (default JS) for transaction and profile if user value is nullish', () => {
mock = initTestClient({ withProfiling: true, environment: '' });

Sentry.startSpan({ name: 'test-name' }, () => {});

jest.runAllTimers();

const envelope: Envelope | undefined = mock.transportSendMock.mock.lastCall?.[0];
expectTransactionWithEnvironment(envelope, 'native');
expectProfileWithEnvironment(envelope, 'native');
expectTransactionWithEnvironment(envelope, 'production');
expectProfileWithEnvironment(envelope, 'production');
});

test('should keep nullish for transaction and profile uses default', () => {
mockWrapper.NATIVE.fetchNativeDeviceContexts.mockResolvedValue(<NativeDeviceContextsResponse>{
environment: undefined,
});
test('should use production environment (default JS) for transaction and profile if user value is undefined', () => {
mock = initTestClient({ withProfiling: true, environment: undefined });

Sentry.startSpan({ name: 'test-name' }, () => {});

jest.runAllTimers();

const envelope: Envelope | undefined = mock.transportSendMock.mock.lastCall?.[0];
expectTransactionWithEnvironment(envelope, undefined);
expectProfileWithEnvironment(envelope, 'mocked');
expectTransactionWithEnvironment(envelope, 'production');
expectProfileWithEnvironment(envelope, 'production');
});

test('should keep custom environment for transaction and profile', () => {
Expand Down
6 changes: 3 additions & 3 deletions samples/react-native-macos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"@react-navigation/bottom-tabs": "^6.5.12",
"@react-navigation/native": "^6.1.9",
"@react-navigation/stack": "^6.3.20",
"@sentry/react": "8.40.0",
"@sentry/react": "8.41.0",
"@sentry/react-native": "6.4.0",
"@sentry/types": "8.40.0",
"@sentry/utils": "8.40.0",
"@sentry/types": "8.41.0",
"@sentry/utils": "8.41.0",
"delay": "^6.0.0",
"react": "18.2.0",
"react-native": "0.73.9",
Expand Down
Loading
Loading