Skip to content
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

fix(gradle): Dynamically resolve collectModulesScript path #3092

Merged
merged 5 commits into from
Jun 12, 2023

Conversation

krystofwoldrich
Copy link
Member

@krystofwoldrich krystofwoldrich commented May 30, 2023

📢 Type of change

  • Enhancement

📜 Description

Thank @mccraveiro for the original PR, I've opened this one for the e2e CI to run to see that the change is working.

Current script path resolution expects the files to be located in the project root in node_modules which doesn't work for monorepo setups. This PR adds dynamic resolve of the sentry package dir to work with monorepos.

💡 Motivation and Context

When using Sentry on monorepos we need to manually set the collectModulesScript path
Original PR #3070
Closes #2740

💚 How did you test it?

CI - Both Android RN 0.65 and 0.71 are sending events with modules.

📝 Checklist

  • I reviewed submitted code
  • I added tests to verify changes
  • No new PII added or SDK only sends newly added PII if sendDefaultPII is enabled
  • All tests passing
  • No breaking changes

🔮 Next steps

@krystofwoldrich krystofwoldrich changed the title fix(gradle): add resolved sentry package for monorepos !TMP fix(gradle): add resolved sentry package for monorepos May 30, 2023
@krystofwoldrich krystofwoldrich marked this pull request as draft May 30, 2023 07:56
@github-actions
Copy link
Contributor

github-actions bot commented May 30, 2023

Android (legacy) Performance metrics 🚀

  Plain With Sentry Diff
Startup time 344.35 ms 363.26 ms 18.91 ms
Size 17.73 MiB 19.80 MiB 2.07 MiB

Baseline results on branch: main

Startup times

Revision Plain With Sentry Diff
86d6d2c+dirty 332.90 ms 352.45 ms 19.55 ms
ad6c299 375.94 ms 382.02 ms 6.08 ms
e73f4ed+dirty 332.96 ms 354.33 ms 21.37 ms
8900e1a+dirty 430.68 ms 456.13 ms 25.44 ms
d0bf494+dirty 375.37 ms 395.14 ms 19.77 ms
76d1baf+dirty 335.72 ms 355.52 ms 19.80 ms
34aba08 328.10 ms 342.84 ms 14.74 ms
80b2ce3 385.02 ms 387.36 ms 2.34 ms
b1e8712 462.11 ms 465.71 ms 3.60 ms
dadc233+dirty 333.78 ms 343.94 ms 10.16 ms

App size

Revision Plain With Sentry Diff
86d6d2c+dirty 17.73 MiB 20.04 MiB 2.31 MiB
ad6c299 17.73 MiB 19.75 MiB 2.02 MiB
e73f4ed+dirty 17.73 MiB 20.04 MiB 2.31 MiB
8900e1a+dirty 17.73 MiB 19.75 MiB 2.01 MiB
d0bf494+dirty 17.73 MiB 19.75 MiB 2.02 MiB
76d1baf+dirty 17.73 MiB 20.04 MiB 2.31 MiB
34aba08 17.73 MiB 19.80 MiB 2.07 MiB
80b2ce3 17.73 MiB 19.75 MiB 2.02 MiB
b1e8712 17.73 MiB 19.75 MiB 2.02 MiB
dadc233+dirty 17.73 MiB 19.75 MiB 2.02 MiB

Previous results on branch: kw-monorepo-gradle-modules-fix

Startup times

Revision Plain With Sentry Diff
c9bea84 338.04 ms 346.74 ms 8.70 ms

App size

Revision Plain With Sentry Diff
c9bea84 17.73 MiB 19.80 MiB 2.07 MiB

@krystofwoldrich krystofwoldrich changed the title !TMP fix(gradle): add resolved sentry package for monorepos CI for #3070 May 30, 2023
@github-actions
Copy link
Contributor

github-actions bot commented May 30, 2023

iOS (legacy) Performance metrics 🚀

  Plain With Sentry Diff
Startup time 1221.84 ms 1225.12 ms 3.28 ms
Size 2.36 MiB 2.85 MiB 495.50 KiB

Baseline results on branch: main

Startup times

Revision Plain With Sentry Diff
b1e8712+dirty 1256.02 ms 1265.14 ms 9.12 ms
86d6d2c+dirty 1267.55 ms 1286.21 ms 18.66 ms
e73f4ed+dirty 1243.27 ms 1244.52 ms 1.25 ms
8900e1a+dirty 1210.27 ms 1218.66 ms 8.39 ms
d0bf494+dirty 1289.40 ms 1298.40 ms 9.00 ms
0db0c72+dirty 1275.02 ms 1285.84 ms 10.82 ms
76d1baf+dirty 1244.10 ms 1268.52 ms 24.42 ms
34aba08+dirty 1276.78 ms 1308.52 ms 31.74 ms
ad6c299+dirty 1244.76 ms 1260.10 ms 15.34 ms
dadc233+dirty 1223.20 ms 1236.88 ms 13.68 ms

App size

Revision Plain With Sentry Diff
b1e8712+dirty 2.36 MiB 2.84 MiB 488.84 KiB
86d6d2c+dirty 2.36 MiB 2.82 MiB 462.82 KiB
e73f4ed+dirty 2.36 MiB 2.82 MiB 469.44 KiB
8900e1a+dirty 2.36 MiB 2.83 MiB 479.25 KiB
d0bf494+dirty 2.36 MiB 2.83 MiB 481.15 KiB
0db0c72+dirty 2.36 MiB 2.84 MiB 487.01 KiB
76d1baf+dirty 2.36 MiB 2.82 MiB 469.45 KiB
34aba08+dirty 2.36 MiB 2.85 MiB 495.32 KiB
ad6c299+dirty 2.36 MiB 2.84 MiB 488.85 KiB
dadc233+dirty 2.36 MiB 2.84 MiB 486.85 KiB

Previous results on branch: kw-monorepo-gradle-modules-fix

Startup times

Revision Plain With Sentry Diff
c9bea84+dirty 1245.35 ms 1261.36 ms 16.01 ms

App size

Revision Plain With Sentry Diff
c9bea84+dirty 2.36 MiB 2.85 MiB 495.38 KiB

@github-actions
Copy link
Contributor

github-actions bot commented May 30, 2023

iOS (new) Performance metrics 🚀

  Plain With Sentry Diff
Startup time 1249.61 ms 1251.98 ms 2.37 ms
Size 2.92 MiB 3.41 MiB 499.66 KiB

Baseline results on branch: main

Startup times

Revision Plain With Sentry Diff
b1e8712+dirty 1284.11 ms 1297.82 ms 13.71 ms
86d6d2c+dirty 1291.62 ms 1296.80 ms 5.18 ms
e73f4ed+dirty 1282.90 ms 1309.30 ms 26.40 ms
8900e1a+dirty 1268.36 ms 1273.04 ms 4.68 ms
d0bf494+dirty 1266.20 ms 1267.52 ms 1.32 ms
0db0c72+dirty 1258.88 ms 1262.52 ms 3.64 ms
76d1baf+dirty 1245.00 ms 1257.76 ms 12.76 ms
34aba08+dirty 1268.58 ms 1276.80 ms 8.22 ms
ad6c299+dirty 1248.50 ms 1248.88 ms 0.38 ms
dadc233+dirty 1266.52 ms 1282.55 ms 16.03 ms

App size

Revision Plain With Sentry Diff
b1e8712+dirty 2.92 MiB 3.40 MiB 494.15 KiB
86d6d2c+dirty 2.92 MiB 3.37 MiB 464.31 KiB
e73f4ed+dirty 2.92 MiB 3.38 MiB 475.71 KiB
8900e1a+dirty 2.92 MiB 3.39 MiB 485.96 KiB
d0bf494+dirty 2.92 MiB 3.40 MiB 488.08 KiB
0db0c72+dirty 2.92 MiB 3.40 MiB 492.71 KiB
76d1baf+dirty 2.92 MiB 3.38 MiB 475.74 KiB
34aba08+dirty 2.92 MiB 3.41 MiB 499.03 KiB
ad6c299+dirty 2.92 MiB 3.40 MiB 494.12 KiB
dadc233+dirty 2.92 MiB 3.40 MiB 492.53 KiB

Previous results on branch: kw-monorepo-gradle-modules-fix

Startup times

Revision Plain With Sentry Diff
c9bea84+dirty 1250.71 ms 1286.74 ms 36.03 ms

App size

Revision Plain With Sentry Diff
c9bea84+dirty 2.92 MiB 3.41 MiB 499.04 KiB

@github-actions
Copy link
Contributor

github-actions bot commented May 30, 2023

Android (new) Performance metrics 🚀

  Plain With Sentry Diff
Startup time 265.39 ms 338.17 ms 72.78 ms
Size 7.15 MiB 8.07 MiB 946.50 KiB

Baseline results on branch: main

Startup times

Revision Plain With Sentry Diff
b1e8712+dirty 322.55 ms 331.84 ms 9.29 ms
86d6d2c+dirty 267.21 ms 325.24 ms 58.04 ms
e73f4ed+dirty 262.98 ms 311.02 ms 48.04 ms
8900e1a+dirty 371.40 ms 377.70 ms 6.31 ms
d0bf494+dirty 253.73 ms 308.23 ms 54.49 ms
0db0c72+dirty 335.20 ms 351.06 ms 15.86 ms
76d1baf+dirty 339.02 ms 408.65 ms 69.63 ms
34aba08+dirty 331.79 ms 376.69 ms 44.91 ms
ad6c299+dirty 336.47 ms 362.89 ms 26.42 ms
dadc233+dirty 363.19 ms 370.37 ms 7.18 ms

App size

Revision Plain With Sentry Diff
b1e8712+dirty 7.15 MiB 8.04 MiB 912.27 KiB
86d6d2c+dirty 7.15 MiB 8.09 MiB 962.69 KiB
e73f4ed+dirty 7.15 MiB 8.09 MiB 965.94 KiB
8900e1a+dirty 7.15 MiB 8.03 MiB 901.79 KiB
d0bf494+dirty 7.15 MiB 8.04 MiB 910.85 KiB
0db0c72+dirty 7.15 MiB 8.04 MiB 911.02 KiB
76d1baf+dirty 7.15 MiB 8.09 MiB 964.41 KiB
34aba08+dirty 7.15 MiB 8.07 MiB 946.13 KiB
ad6c299+dirty 7.15 MiB 8.04 MiB 912.17 KiB
dadc233+dirty 7.15 MiB 8.04 MiB 910.84 KiB

Previous results on branch: kw-monorepo-gradle-modules-fix

Startup times

Revision Plain With Sentry Diff
c9bea84+dirty 261.46 ms 310.38 ms 48.92 ms

App size

Revision Plain With Sentry Diff
c9bea84+dirty 7.15 MiB 8.07 MiB 946.13 KiB

@krystofwoldrich
Copy link
Member Author

krystofwoldrich commented May 30, 2023

Both Android RN 0.65 and 0.71 are sending events with modules.

Before merging wait for 0.71 New Arch ci.

@krystofwoldrich krystofwoldrich changed the title CI for #3070 feat(gradle): Dynamically resolve collectModulesScript path May 30, 2023
@krystofwoldrich krystofwoldrich marked this pull request as ready for review May 30, 2023 12:15
sentry.gradle Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@krystofwoldrich krystofwoldrich changed the title feat(gradle): Dynamically resolve collectModulesScript path fix(gradle): Dynamically resolve collectModulesScript path Jun 2, 2023
@krystofwoldrich krystofwoldrich merged commit 8236a9e into main Jun 12, 2023
@krystofwoldrich krystofwoldrich deleted the kw-monorepo-gradle-modules-fix branch June 12, 2023 15:05
@taylorkline
Copy link

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make collecting modules on Android mono repo friendly
4 participants