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

removed user segment #3512

Merged
merged 6 commits into from
Jul 5, 2024
Merged

removed user segment #3512

merged 6 commits into from
Jul 5, 2024

Conversation

stefanosiano
Copy link
Member

📜 Description

💡 Motivation and Context

Closes #3497

💚 How did you test it?

📝 Checklist

  • I reviewed the submitted code.
  • I added tests to verify the changes.
  • No new PII added or SDK only sends newly added PII if sendDefaultPII is enabled.
  • I updated the docs if needed.
  • Review from the native team if needed.
  • No breaking change or entry added to the changelog.
  • No breaking change for hybrid SDKs or communicated to hybrid SDKs.

🔮 Next steps

@stefanosiano stefanosiano marked this pull request as ready for review June 25, 2024 10:15
@kahest kahest added this to the 8.0.0 milestone Jun 25, 2024
Copy link
Member

@markushi markushi left a comment

Choose a reason for hiding this comment

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

LGTM! Maybe we should re-target this PR to be on top of #3497, otherwise the 8.x.x branch will be in merge hell. cc @adinauer

@adinauer
Copy link
Member

adinauer commented Jul 1, 2024

@markushi I'm confused, where's the problems with merging?

@markushi
Copy link
Member

markushi commented Jul 1, 2024

@markushi I'm confused, where's the problems with merging?

We have two PRs:

  1. deprecated User.segment #3511 adds the deprecate annotation
  2. This one, completely removing user.segment

But since 2. isn't built on top of 1., all the changes in this PR will cause a merge conflict once 1. is merged into main and 8.x.x

@stefanosiano
Copy link
Member Author

@markushi I'm confused, where's the problems with merging?

We have two PRs:

  1. deprecated User.segment #3511 adds the deprecate annotation
  2. This one, completely removing user.segment

But since 2. isn't built on top of 1., all the changes in this PR will cause a merge conflict once 1. is merged into main and 8.x.x

I see what you mean. To me it's fine to wait a while before merging it.
We can wait until v8 is "stable" and we merge main back in v8, as it's not an urgent change

@adinauer
Copy link
Member

adinauer commented Jul 1, 2024

Should be fine to merge, just watch out when merging main into 8.x.x.

# Conflicts:
#	sentry/src/main/java/io/sentry/Baggage.java
#	sentry/src/main/java/io/sentry/TraceContext.java
#	sentry/src/main/java/io/sentry/protocol/User.java
@stefanosiano stefanosiano requested a review from markushi July 2, 2024 09:10
@stefanosiano
Copy link
Member Author

i updated this PR after merging master into v8 branch.
Would you take another look now?

Copy link
Contributor

github-actions bot commented Jul 2, 2024

Performance metrics 🚀

  Plain With Sentry Diff
Startup time 366.24 ms 457.38 ms 91.14 ms
Size 1.70 MiB 2.29 MiB 599.21 KiB

Baseline results on branch: 8.x.x

Startup times

Revision Plain With Sentry Diff
57732e8 435.66 ms 510.50 ms 74.84 ms
a0f7731 357.02 ms 433.40 ms 76.38 ms
41e496a 408.90 ms 491.32 ms 82.42 ms
a59fca2 560.08 ms 658.80 ms 98.71 ms

App size

Revision Plain With Sentry Diff
57732e8 1.70 MiB 2.29 MiB 599.77 KiB
a0f7731 1.70 MiB 2.29 MiB 599.77 KiB
41e496a 1.70 MiB 2.29 MiB 599.77 KiB
a59fca2 1.70 MiB 2.29 MiB 599.77 KiB

@stefanosiano stefanosiano merged commit db61a7b into 8.x.x Jul 5, 2024
21 of 22 checks passed
@stefanosiano stefanosiano deleted the fix/remove-user-segment branch July 5, 2024 13:00
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.

4 participants