-
-
Notifications
You must be signed in to change notification settings - Fork 357
ref(e2e): Consolidate Android build scripts per review feedback #5593
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
antonis
wants to merge
79
commits into
v8
Choose a base branch
from
antonis/test-capture-app-start-errors-android-optimise
base: v8
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+50
−3
Open
Changes from all commits
Commits
Show all changes
79 commits
Select commit
Hold shift + click to select a range
00e9040
ref(ios): Extract Cocoa SDK init into standalone file (#4442)
krystofwoldrich 4c0b8f4
Merge branch 'main' into capture-app-start-errors
krystofwoldrich 2cb7eb2
ref(android): Extracts Android native initialization to standalone st…
antonis 7144a64
feat(experimental): Add native `startWithConfigureOptions` for Apple …
krystofwoldrich 7850677
feat: Read `sentry.options.json` during cocoa init (#4447)
krystofwoldrich 1e5dbde
Adds utility class for converting `JsonObject` to `WritableMap` (#4479)
antonis 22a5f81
feat: Automatically load `sentry.options.json` file (#4476)
krystofwoldrich a1cb36d
feat(experimental): Initialize Android SDK from json configuration (#…
antonis 95c36ef
Merge branch 'main' into capture-app-start-errors
krystofwoldrich 14fe05d
misc: Add `sentry.options.json` example to the changelog (#4509)
krystofwoldrich 15a7e6d
feat(init): Load options from `sentry.options.json` in JS (#4510)
krystofwoldrich b9ec093
release: 6.7.0-alpha.0
getsentry-bot dbdd4b5
Merge branch 'release/6.7.0-alpha.0' into capture-app-start-errors
b947d7f
misc(sample): Change RN Sample to use native file init by default (#4…
krystofwoldrich 6b08b9a
chore(sample-rn): Remove duplicate init options from code (#4532)
krystofwoldrich a7ffa1f
chore(sample-rn): Always use fhe file option (including auto init) (#…
krystofwoldrich 28cf7b4
internal(sample-rn): Add Detox for integration/e2e tests of the rn sa…
krystofwoldrich cf00d4d
internal(sample-rn): Add header and message envelope tests (#4536)
krystofwoldrich b754aa3
Merge remote-tracking branch 'origin/main' into capture-app-start-errors
krystofwoldrich 0bf6636
fix(sample-e2e): Fix type errors missing sentry/core and afterAll (#4…
krystofwoldrich 0f5cd7d
Merge remote-tracking branch 'origin/main' into capture-app-start-errors
krystofwoldrich e935360
chore(samples): Add package scripts for native builds, dsn and testin…
krystofwoldrich 952dd05
Merge branch 'main' into capture-app-start-errors
krystofwoldrich ae342a3
test(e2e): Verify captured Errors Screen transaction (#4584)
krystofwoldrich 770f9fb
test(e2e): Add auto init from JS tests (#4588)
krystofwoldrich cbb85b2
test(e2e): Add app start crash test for iOS (#4593)
krystofwoldrich b4ee16b
test(e2e): Avoid race conditions when waiting for captured message (#…
krystofwoldrich ee11f58
chore(sample-e2e): Move Detox related files to e2e-detox dir
krystofwoldrich 588ba6d
Merge branch 'main' into capture-app-start-errors
krystofwoldrich cc98f49
Merge main (v7) into capture-app-start-errors-v7
antonis 1e01928
fix: remove unused SentryPackage import
antonis 50ff76a
fix: update RNSentryStartTest for Sentry Android SDK v7 API changes
antonis 0efb3bf
fix: remove unused addPackages method to fix PMD lint error
antonis 013f560
fix: update RNSentrySDKTest for Sentry Android SDK v7 API changes
antonis d93c1b9
fix: use relative path for RNSentrySDK+Test.h import in bridging header
antonis b25688f
fix: remove deprecated enableTracing property in iOS RNSentryStart
antonis 86d2829
fix: remove enableTracing assertions from iOS tests
antonis d0f1987
Update Podspec
antonis 032f74a
Fix lint issue
antonis 23c6824
Merge branch 'main' into capture-app-start-errors-v7
antonis 37325ad
Merge branch 'main' into capture-app-start-errors-v7
antonis 232bf39
Merge branch 'main' into capture-app-start-errors-v7
antonis f1e4ec4
Merge branch 'main' into capture-app-start-errors-v7
antonis db91022
Merge branch 'main' into capture-app-start-errors-v7
antonis 84390fb
Merge branch 'main' into capture-app-start-errors-v7
antonis 33d1129
ref(sample-e2e): v7: Migrate from Detox to Maestro (#5473)
antonis 410ff43
Merge branch 'main' into capture-app-start-errors-v7
antonis 1e2baca
Merge branch 'main' into capture-app-start-errors-v7
antonis 093a889
Merge branch 'main' into capture-app-start-errors-v7
antonis fe4edc7
chore: Merge Android UI profiling on the capture startup crashes bran…
antonis 3662a66
Merge branch 'main' into capture-app-start-errors-v7
antonis 7c7a53e
Merge branch 'main' into capture-app-start-errors-v7
antonis ad19701
fix SR iOS issue (#5560)
antonis 72546e6
Remove duplicate changelog entry
antonis db88ae9
Merge branch 'main' into capture-app-start-errors-v7
antonis db7585c
feat(expo): Add RNSentrySDK APIs support to @sentry/react-native/expo…
antonis 67dec90
Merge branch 'main' into capture-app-start-errors-v7
antonis bcf3fb6
Merge remote-tracking branch 'origin/capture-app-start-errors-v7' int…
antonis e6505b7
Fix native ios tests
antonis 40f0d2f
test(e2e): Add auto init from JS tests for Android
antonis 5bf59f4
fix(e2e): Add scrolling to find crash control buttons in Android test
antonis 9870761
fix(e2e): Make Android crash flag auto-expire after one crash
antonis f4584c5
Mark area
antonis 181c4ba
fix(e2e): Handle wrapped exceptions in Android crash test
antonis 8db2547
Merge branch 'antonis/capture-app-start-errors-v8' into antonis/test-…
antonis 44282b5
Merge branch 'v8' into antonis/capture-app-start-errors-v8
antonis be3fb84
Merge branch 'antonis/capture-app-start-errors-v8' into antonis/test-…
antonis 25331c7
Clean up notes for now
antonis 35aae51
fix(android): Fix ConcurrentModificationException (#5588)
antonis 28b4cb0
Merge branch 'antonis/capture-app-start-errors-v8' into antonis/test-…
antonis ed126ab
fix(android): Fix crash when spotlight is enabled without defaultSide…
antonis 112bfc6
Merge branch 'antonis/capture-app-start-errors-v8' into antonis/test-…
antonis 39391a8
refactor(e2e): Consolidate Android build scripts per review feedback
antonis 1ad8373
test(e2e): Add auto init from JS tests for Android (#5583)
antonis 8e730e8
Merge branch 'antonis/capture-app-start-errors-v8' into antonis/test-…
antonis 8aa1902
Merge branch 'v8' into antonis/capture-app-start-errors-v8
antonis ea4c613
fix(android): Fix crash when dsn or devServerUrl are missing from opt…
antonis 18e013c
Merge branch 'antonis/capture-app-start-errors-v8' into antonis/test-…
antonis 9b4d37f
Merge branch 'v8' into antonis/test-capture-app-start-errors-android-…
antonis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,4 +8,4 @@ | |
| "performance-tests/*" | ||
| ], | ||
| "npmClient": "yarn" | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Exit on error | ||
| set -e | ||
|
|
||
| thisFilePath=$(dirname "$0") | ||
|
|
||
| # Validate SENTRY_DISABLE_NATIVE_START is set | ||
| if [ -z "${SENTRY_DISABLE_NATIVE_START}" ]; then | ||
| echo "Error: SENTRY_DISABLE_NATIVE_START environment variable is not set." | ||
| echo "Usage: SENTRY_DISABLE_NATIVE_START=true|false $0" | ||
| echo "" | ||
| echo " true - Build for auto init from JS (native SDK disabled)" | ||
| echo " false - Build for manual native init (native SDK enabled)" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Map SENTRY_DISABLE_NATIVE_START to build mode | ||
| if [ "${SENTRY_DISABLE_NATIVE_START}" = "true" ]; then | ||
| BUILD_MODE="auto" | ||
| INIT_DESCRIPTION="initialize Sentry from JavaScript (auto init)" | ||
| elif [ "${SENTRY_DISABLE_NATIVE_START}" = "false" ]; then | ||
| BUILD_MODE="manual" | ||
| INIT_DESCRIPTION="initialize Sentry natively before JS (manual init)" | ||
| else | ||
| echo "Error: Invalid value for SENTRY_DISABLE_NATIVE_START: '${SENTRY_DISABLE_NATIVE_START}'" | ||
| echo "Expected 'true' or 'false'" | ||
| exit 1 | ||
| fi | ||
|
|
||
| export RN_ARCHITECTURE="new" | ||
| export CONFIG="debug" | ||
|
|
||
| echo "Building Android with SENTRY_DISABLE_NATIVE_START=${SENTRY_DISABLE_NATIVE_START}" | ||
| echo "This build will ${INIT_DESCRIPTION}" | ||
|
|
||
| "${thisFilePath}/build-android.sh" | ||
|
|
||
| # Rename the output APK based on build mode | ||
| cd "${thisFilePath}/.." | ||
| if [ -f "app.apk" ]; then | ||
| mv app.apk "app-${BUILD_MODE}.apk" | ||
| echo "Build complete: app-${BUILD_MODE}.apk" | ||
| else | ||
| echo "Error: Expected output file 'app.apk' not found" | ||
| exit 1 | ||
| fi | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: The build script doesn't
exporttheSENTRY_DISABLE_NATIVE_STARTvariable, so the Gradle daemon may use a stale value from a previous build, leading to an incorrect build configuration.Severity: MEDIUM
Suggested Fix
In
build-android-debug-init.sh, addexport SENTRY_DISABLE_NATIVE_STARTafter the variable is validated and before thebuild-android.shscript is invoked. This will ensure the environment variable is correctly propagated to the Gradle daemon process.Prompt for AI Agent
Did we get this right? 👍 / 👎 to inform future reviews.