Skip to content

Commit 1242db7

Browse files
antonisantonis
committed
Merge branch 'main' into v7
# Conflicts: # CHANGELOG.md # dev-packages/e2e-tests/package.json # dev-packages/type-check/package.json # dev-packages/utils/package.json # lerna.json # packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java # packages/core/ios/RNSentryVersion.m # packages/core/package.json # packages/core/src/js/options.ts # packages/core/src/js/tracing/span.ts # packages/core/src/js/version.ts # performance-tests/TestAppPlain/package.json # performance-tests/TestAppSentry/package.json # samples/expo/app.json # samples/expo/package.json # samples/react-native-macos/package.json # samples/react-native/android/app/build.gradle # samples/react-native/ios/sentryreactnativesample/Info.plist # samples/react-native/ios/sentryreactnativesampleTests/Info.plist # samples/react-native/package.json # samples/react-native/src/App.tsx # yarn.lock
2 parents f934944 + d43b056 commit 1242db7

Some content is hidden

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

43 files changed

+628
-168
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # [email protected].2
47+
uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # [email protected].4
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
5555
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5656
# If this step fails, then you should remove it and run the build manually (see below)
5757
- name: Autobuild
58-
uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # [email protected].2
58+
uses: github/codeql-action/autobuild@4e828ff8d448a8a6e532957b1811f387a63867e8 # [email protected].4
5959

6060
# ℹ️ Command-line programs to run using the OS shell.
6161
# 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -66,4 +66,4 @@ jobs:
6666
# make bootstrap
6767
# make release
6868
- name: Perform CodeQL Analysis
69-
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # [email protected].2
69+
uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # [email protected].4

‎.github/workflows/e2e-v2.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,15 @@ jobs:
163163
strategy:
164164
fail-fast: false # keeps matrix running if one fails
165165
matrix:
166-
rn-version: ['0.65.3', '0.80.1']
166+
rn-version: ['0.65.3', '0.80.2']
167167
rn-architecture: ['legacy', 'new']
168168
platform: ['android', 'ios']
169169
build-type: ['production']
170170
ios-use-frameworks: ['no', 'static', 'dynamic']
171171
engine: ['hermes', 'jsc']
172172
include:
173173
- platform: ios
174-
rn-version: '0.80.1'
174+
rn-version: '0.80.2'
175175
xcode-version: '16.2'
176176
runs-on: macos-15
177177
- platform: ios
@@ -182,7 +182,7 @@ jobs:
182182
runs-on: ubuntu-latest
183183
exclude:
184184
# exclude JSC for new RN versions (keeping the matrix manageable)
185-
- rn-version: '0.80.1'
185+
- rn-version: '0.80.2'
186186
engine: 'jsc'
187187
# exclude all rn versions lower than 0.70.0 for new architecture
188188
- rn-version: '0.65.3'
@@ -301,15 +301,15 @@ jobs:
301301
strategy:
302302
fail-fast: false # keeps matrix running if one fails
303303
matrix:
304-
rn-version: ['0.65.3', '0.80.1']
304+
rn-version: ['0.65.3', '0.80.2']
305305
rn-architecture: ['legacy', 'new']
306306
platform: ['android', 'ios']
307307
build-type: ['production']
308308
ios-use-frameworks: ['no'] # test only no framworks
309309
engine: ['hermes', 'jsc']
310310
include:
311311
- platform: ios
312-
rn-version: '0.80.1'
312+
rn-version: '0.80.2'
313313
runs-on: macos-15
314314
- platform: ios
315315
rn-version: '0.65.3'
@@ -323,7 +323,7 @@ jobs:
323323
# e2e test only the default combinations
324324
- rn-version: '0.65.3'
325325
engine: 'hermes'
326-
- rn-version: '0.80.1'
326+
- rn-version: '0.80.2'
327327
engine: 'jsc'
328328

329329
steps:

‎.github/workflows/native-tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
xcodebuild -workspace *.xcworkspace \
5151
-scheme $SCHEME -configuration $CONFIGURATION \
5252
-destination "$DESTINATION" \
53+
-quiet \
5354
test
5455
5556
test-android:

‎CHANGELOG.md‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,69 @@ Version 7 of the SDK is compatible with Sentry self-hosted versions 24.4.2 or hi
192192
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8132)
193193
- [diff](https://github.com/getsentry/sentry-java/compare/7.20.1...8.13.2)
194194

195+
## 6.19.0
196+
197+
### Fixes
198+
199+
- Warnings when .env.sentry-build-plugin is not set on Sentry/CLI ([#5029](https://github.com/getsentry/sentry-react-native/pull/5029))
200+
- Fix for `sentry-cli` path discovery not working on Android ([#5009](https://github.com/getsentry/sentry-react-native/pull/5009))
201+
- Export `addIntegration` from `@sentry/core` ([#5020](https://github.com/getsentry/sentry-react-native/pull/5020))
202+
203+
### Features
204+
205+
- Adds `replaysSessionQuality` Session Replay option to control replay quality and performance overhead on mobile ([#5001](https://github.com/getsentry/sentry-react-native/pull/5001))
206+
207+
```js
208+
import * as Sentry from '@sentry/react-native';
209+
210+
Sentry.init({
211+
replaysSessionSampleRate: 1.0,
212+
replaysSessionQuality: 'low', // possible values: low, medium (default), high
213+
integrations: [Sentry.mobileReplayIntegration()],
214+
});
215+
```
216+
217+
### Dependencies
218+
219+
- Bump CLI from v2.50.0 to v2.50.2 ([#5007](https://github.com/getsentry/sentry-react-native/pull/5007))
220+
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2502)
221+
- [diff](https://github.com/getsentry/sentry-cli/compare/2.50.0...2.50.2)
222+
- Bump Bundler Plugins from v3.6.1 to v4.0.2 ([#5000](https://github.com/getsentry/sentry-react-native/pull/5000), [#5021](https://github.com/getsentry/sentry-react-native/pull/5021), [#5030](https://github.com/getsentry/sentry-react-native/pull/5030))
223+
- [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#402)
224+
- [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/3.6.1...4.0.2)
225+
226+
## 6.18.1
227+
228+
### Fixes
229+
230+
- Fixed Sentry CLI executable path resolution that was causing iOS build script failures ([#5003](https://github.com/getsentry/sentry-react-native/pull/5003))
231+
232+
## 6.18.0
233+
234+
> [!WARNING]
235+
> This release contains an issue where Sentry-CLI may not be found on iOS builds if not defined by environment variable.
236+
> See PR [#5003](github.com/getsentry/sentry-react-native/pull/5003) for more details.
237+
238+
### Fixes
239+
240+
- SDK now Builds when using PnPM ([#4977](https://github.com/getsentry/sentry-react-native/pull/4977))
241+
- Skip idle span creation when app is in background ([#4995](https://github.com/getsentry/sentry-react-native/pull/4995))
242+
243+
### Dependencies
244+
245+
- Bump JavaScript SDK from v8.54.0 to v8.55.0 ([#4981](https://github.com/getsentry/sentry-react-native/pull/4981))
246+
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8550)
247+
- [diff](https://github.com/getsentry/sentry-javascript/compare/8.54.0...8.55.0)
248+
- Bump Cocoa SDK from v8.53.1 to v8.53.2 ([#4986](https://github.com/getsentry/sentry-react-native/pull/4986))
249+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8532)
250+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.53.1...8.53.2)
251+
- Bump CLI from v2.47.0 to v2.50.0 ([#4993](https://github.com/getsentry/sentry-react-native/pull/4993), [#4999](https://github.com/getsentry/sentry-react-native/pull/4999))
252+
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2500)
253+
- [diff](https://github.com/getsentry/sentry-cli/compare/2.47.0...2.50.0)
254+
- Bump Bundler Plugins from v3.5.0 to v3.6.1 ([#4994](https://github.com/getsentry/sentry-react-native/pull/4994), [#4998](https://github.com/getsentry/sentry-react-native/pull/4998))
255+
- [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#361)
256+
- [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/3.5.0...3.6.1)
257+
195258
## 6.17.0
196259

197260
### Features

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
"performance-tests/*"
99
],
1010
"npmClient": "yarn"
11-
}
11+
}

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"devDependencies": {
3131
"@expo/swiftlint": "^0.57.1",
3232
"@naturalcycles/ktlint": "^1.13.0",
33-
"@sentry/cli": "2.47.0",
33+
"@sentry/cli": "2.50.2",
3434
"clang-format": "^1.8.0",
3535
"downlevel-dts": "^0.11.0",
3636
"google-java-format": "^1.4.0",
@@ -57,7 +57,8 @@
5757
"See: https://github.com/appium/appium-chromedriver/pull/424"
5858
],
5959
"resolutions": {
60-
"appium-chromedriver@npm:5.6.73/@xmldom/xmldom": "0.8.10"
60+
"appium-chromedriver@npm:5.6.73/@xmldom/xmldom": "0.8.10",
61+
"form-data": "4.0.4"
6162
},
6263
"version": "0.0.0",
6364
"name": "sentry-react-native",

‎packages/core/RNSentry.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Pod::Spec.new do |s|
4444

4545
s.compiler_flags = other_cflags
4646

47-
s.dependency 'Sentry/HybridSDK', '8.53.1'
47+
s.dependency 'Sentry/HybridSDK', '8.53.2'
4848

4949
if defined? install_modules_dependencies
5050
# Default React Native dependencies for 0.71 and above (new and legacy architecture)

‎packages/core/RNSentryCocoaTester/RNSentryCocoaTester.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
/* Begin PBXBuildFile section */
1010
332D33472CDBDBB600547D76 /* RNSentryReplayOptionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 332D33462CDBDBB600547D76 /* RNSentryReplayOptionsTests.swift */; };
11-
3339C4812D6625570088EB3A /* RNSentryUserTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3339C4802D6625570088EB3A /* RNSentryUserTests.mm */; };
11+
3339C4812D6625570088EB3A /* RNSentryUserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3339C4802D6625570088EB3A /* RNSentryUserTests.m */; };
1212
336084392C32E382008CC412 /* RNSentryReplayBreadcrumbConverterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336084382C32E382008CC412 /* RNSentryReplayBreadcrumbConverterTests.swift */; };
1313
3380C6C42CE25ECA0018B9B6 /* RNSentryReplayPostInitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3380C6C32CE25ECA0018B9B6 /* RNSentryReplayPostInitTests.swift */; };
1414
33AFDFED2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 33AFDFEC2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m */; };
1515
33AFDFF12B8D15E500AAB120 /* RNSentryDependencyContainerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 33AFDFF02B8D15E500AAB120 /* RNSentryDependencyContainerTests.m */; };
1616
33DEDFEA2D8DBE67006066E4 /* RNSentryOnDrawReporterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33DEDFE92D8DBE5B006066E4 /* RNSentryOnDrawReporterTests.swift */; };
1717
33DEDFED2D8DC825006066E4 /* RNSentryOnDrawReporter+Test.mm in Sources */ = {isa = PBXBuildFile; fileRef = 33DEDFEC2D8DC820006066E4 /* RNSentryOnDrawReporter+Test.mm */; };
1818
33DEDFF02D9185EB006066E4 /* RNSentryTimeToDisplayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33DEDFEF2D9185E3006066E4 /* RNSentryTimeToDisplayTests.swift */; };
19-
33F58AD02977037D008F60EA /* RNSentryTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 33F58ACF2977037D008F60EA /* RNSentryTests.mm */; };
19+
33F58AD02977037D008F60EA /* RNSentryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 33F58ACF2977037D008F60EA /* RNSentryTests.m */; };
2020
AEFB00422CC90C4B00EC8A9A /* RNSentryBreadcrumbTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3360843C2C340C76008CC412 /* RNSentryBreadcrumbTests.swift */; };
2121
B5859A50A3E865EF5E61465A /* libPods-RNSentryCocoaTesterTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 650CB718ACFBD05609BF2126 /* libPods-RNSentryCocoaTesterTests.a */; };
2222
/* End PBXBuildFile section */
@@ -29,7 +29,7 @@
2929
332D33492CDCC8E100547D76 /* RNSentryTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNSentryTests.h; sourceTree = "<group>"; };
3030
332D334A2CDCC8EB00547D76 /* RNSentryCocoaTesterTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RNSentryCocoaTesterTests-Bridging-Header.h"; sourceTree = "<group>"; };
3131
3339C47F2D6625260088EB3A /* RNSentry+Test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RNSentry+Test.h"; sourceTree = "<group>"; };
32-
3339C4802D6625570088EB3A /* RNSentryUserTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNSentryUserTests.mm; sourceTree = "<group>"; };
32+
3339C4802D6625570088EB3A /* RNSentryUserTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNSentryUserTests.m; sourceTree = "<group>"; };
3333
336084382C32E382008CC412 /* RNSentryReplayBreadcrumbConverterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RNSentryReplayBreadcrumbConverterTests.swift; sourceTree = "<group>"; };
3434
3360843A2C32E3A8008CC412 /* RNSentryReplayBreadcrumbConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNSentryReplayBreadcrumbConverter.h; path = ../ios/RNSentryReplayBreadcrumbConverter.h; sourceTree = "<group>"; };
3535
3360843C2C340C76008CC412 /* RNSentryBreadcrumbTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNSentryBreadcrumbTests.swift; sourceTree = "<group>"; };
@@ -49,7 +49,7 @@
4949
33DEDFEC2D8DC820006066E4 /* RNSentryOnDrawReporter+Test.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "RNSentryOnDrawReporter+Test.mm"; sourceTree = "<group>"; };
5050
33DEDFEE2D8DD431006066E4 /* RNSentryTimeToDisplay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNSentryTimeToDisplay.h; path = ../ios/RNSentryTimeToDisplay.h; sourceTree = SOURCE_ROOT; };
5151
33DEDFEF2D9185E3006066E4 /* RNSentryTimeToDisplayTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNSentryTimeToDisplayTests.swift; sourceTree = "<group>"; };
52-
33F58ACF2977037D008F60EA /* RNSentryTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RNSentryTests.mm; sourceTree = "<group>"; };
52+
33F58ACF2977037D008F60EA /* RNSentryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNSentryTests.m; sourceTree = "<group>"; };
5353
650CB718ACFBD05609BF2126 /* libPods-RNSentryCocoaTesterTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNSentryCocoaTesterTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5454
E2321E7CFA55AB617247098E /* Pods-RNSentryCocoaTesterTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNSentryCocoaTesterTests.debug.xcconfig"; path = "Target Support Files/Pods-RNSentryCocoaTesterTests/Pods-RNSentryCocoaTesterTests.debug.xcconfig"; sourceTree = "<group>"; };
5555
/* End PBXFileReference section */
@@ -105,8 +105,8 @@
105105
332D334A2CDCC8EB00547D76 /* RNSentryCocoaTesterTests-Bridging-Header.h */,
106106
332D33492CDCC8E100547D76 /* RNSentryTests.h */,
107107
336084382C32E382008CC412 /* RNSentryReplayBreadcrumbConverterTests.swift */,
108-
33F58ACF2977037D008F60EA /* RNSentryTests.mm */,
109-
3339C4802D6625570088EB3A /* RNSentryUserTests.mm */,
108+
33F58ACF2977037D008F60EA /* RNSentryTests.m */,
109+
3339C4802D6625570088EB3A /* RNSentryUserTests.m */,
110110
33AFDFEC2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m */,
111111
33AFDFEE2B8D14C200AAB120 /* RNSentryFramesTrackerListenerTests.h */,
112112
33AFDFF02B8D15E500AAB120 /* RNSentryDependencyContainerTests.m */,
@@ -258,8 +258,8 @@
258258
33AFDFF12B8D15E500AAB120 /* RNSentryDependencyContainerTests.m in Sources */,
259259
336084392C32E382008CC412 /* RNSentryReplayBreadcrumbConverterTests.swift in Sources */,
260260
33DEDFED2D8DC825006066E4 /* RNSentryOnDrawReporter+Test.mm in Sources */,
261-
33F58AD02977037D008F60EA /* RNSentryTests.mm in Sources */,
262-
3339C4812D6625570088EB3A /* RNSentryUserTests.mm in Sources */,
261+
33F58AD02977037D008F60EA /* RNSentryTests.m in Sources */,
262+
3339C4812D6625570088EB3A /* RNSentryUserTests.m in Sources */,
263263
33DEDFF02D9185EB006066E4 /* RNSentryTimeToDisplayTests.swift in Sources */,
264264
3380C6C42CE25ECA0018B9B6 /* RNSentryReplayPostInitTests.swift in Sources */,
265265
33AFDFED2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m in Sources */,

‎packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryDependencyContainerTests.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
#import <Foundation/Foundation.h>
33
#import <RNSentry/RNSentry.h>
44

5-
@interface
6-
SentrySDK (PrivateTests)
7-
- (nullable SentryOptions *)options;
8-
@end
9-
105
@interface SentryDependencyContainer : NSObject
116
+ (instancetype)sharedInstance;
127
@property (nonatomic, strong) SentryFramesTracker *framesTracker;

‎packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryFramesTrackerListenerTests.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
#import <Foundation/Foundation.h>
33
#import <RNSentry/RNSentry.h>
44

5-
@interface
6-
SentrySDK (PrivateTests)
7-
- (nullable SentryOptions *)options;
8-
@end
9-
105
@interface SentryDependencyContainer : NSObject
116
+ (instancetype)sharedInstance;
127
@property (nonatomic, strong) SentryFramesTracker *framesTracker;

0 commit comments

Comments
 (0)