Skip to content

Commit f523a4a

Browse files
Ref(Logs): Move it outside of Experimental (#5122)
* move to upper level * Update samples/react-native/src/App.tsx * no references to experiments * changelog update: * whitespace fix
1 parent d208734 commit f523a4a

File tree

6 files changed

+35
-12
lines changed

6 files changed

+35
-12
lines changed

CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,32 @@
66
> make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
77
<!-- prettier-ignore-end -->
88
9+
## Unreleased
10+
11+
### Important Changes
12+
13+
- The `_experiments.enableLogs` and `_experiments.beforeSendLog` options were removed, use the top-level `enableLogs` and `beforeSendLog` options instead. ([#5122](https://github.com/getsentry/sentry-react-native/pull/5122))
14+
15+
```js
16+
// before
17+
Sentry.init({
18+
_experiments: {
19+
enableLogs: true,
20+
beforeSendLog: log => {
21+
return log;
22+
},
23+
},
24+
});
25+
26+
// after
27+
Sentry.init({
28+
enableLogs: true,
29+
beforeSendLog: log => {
30+
return log;
31+
},
32+
});
33+
```
34+
935
## 7.0.0-rc.2
1036

1137
### Important Changes

packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,11 +283,8 @@ protected void getSentryAndroidOptions(
283283
if (rnOptions.hasKey("enableNdk")) {
284284
options.setEnableNdk(rnOptions.getBoolean("enableNdk"));
285285
}
286-
if (rnOptions.hasKey("_experiments")) {
287-
ReadableMap experiments = rnOptions.getMap("_experiments");
288-
if (experiments.hasKey("enableLogs")) {
289-
options.getLogs().setEnabled(experiments.getBoolean("enableLogs"));
290-
}
286+
if (rnOptions.hasKey("enableLogs")) {
287+
options.getLogs().setEnabled(rnOptions.getBoolean("enableLogs"));
291288
}
292289
if (rnOptions.hasKey("spotlight")) {
293290
if (rnOptions.getType("spotlight") == ReadableType.Boolean) {

packages/core/src/js/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export class ReactNativeClient extends Client<ReactNativeClientOptions> {
6464
this.on('beforeSendSession', addAutoIpAddressToSession);
6565
}
6666

67-
if (options._experiments?.enableLogs) {
67+
if (options.enableLogs) {
6868
this.on('flush', () => {
6969
_INTERNAL_flushLogsBuffer(this);
7070
});

packages/core/src/js/integrations/default.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export function getDefaultIntegrations(options: ReactNativeClientOptions): Integ
8585
if (options.enableNative) {
8686
integrations.push(deviceContextIntegration());
8787
integrations.push(modulesLoaderIntegration());
88-
if (options._experiments?.enableLogs) {
88+
if (options.enableLogs) {
8989
integrations.push(logEnricherIntegration());
9090
}
9191
if (options.attachScreenshot) {

packages/core/src/js/options.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type ProfilerProps = React.ComponentProps<typeof Profiler>;
1010
type BrowserTransportOptions = Parameters<typeof makeFetchTransport>[0];
1111

1212
type BrowserExperiments = NonNullable<BrowserOptions['_experiments']>;
13-
type SharedExperimentsSubset = Pick<BrowserExperiments, 'enableLogs' | 'beforeSendLog'>;
13+
type SharedExperimentsSubset = BrowserExperiments;
1414

1515
export interface BaseReactNativeOptions {
1616
/**

samples/react-native/src/App.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ Sentry.init({
8282
);
8383
},
8484
_experiments: {
85-
enableLogs: true,
86-
beforeSendLog: (log) => {
87-
return log;
88-
},
8985
enableUnhandledCPPExceptionsV2: true,
9086
},
87+
enableLogs: true,
88+
beforeSendLog: (log) => {
89+
return log;
90+
},
9191
enableUserInteractionTracing: true,
9292
integrations(integrations) {
9393
integrations.push(

0 commit comments

Comments
 (0)