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.

Sign up for GitHub

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

Jump to bottom

[cherrypick for 4.2] Update java allocation instrumentation library to fix issues with JDK11+ #13735

Merged
merged 4 commits into from
Jul 26, 2021
Merged

[cherrypick for 4.2] Update java allocation instrumentation library to fix issues with JDK11+ #13735

merged 4 commits into from
Jul 26, 2021

Conversation

meisterT
Copy link
Member

@meisterT meisterT commented Jul 23, 2021 •
edited by katre
Loading

Cherrypick request for 4.2.0 (#13558).

Fixes #13726.

@google-cla google-cla bot added the cla: yes label Jul 23, 2021
@meisterT meisterT requested a review from katre July 23, 2021 11:58
@katre
Copy link
Member

katre commented Jul 23, 2021

Rebased onto the target branch for easier merging.

@katre
Copy link
Member

katre commented Jul 23, 2021

Put it back, because I can't figure out the merge conflicts that github is reporting.

Please rebase to the latest version of release-4.2.0-patches and update.

@google-cla
Copy link

google-cla bot commented Jul 23, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@google-cla google-cla bot added cla: no and removed cla: yes labels Jul 23, 2021
@google-cla
Copy link

google-cla bot commented Jul 26, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

meisterT added 4 commits July 26, 2021 11:53
@meisterT
Increase allowed size of the install_base.
c9d2677 
This is in preparation of importing bazelbuild#13728 which increases the size the of jar file by 2MB.

PiperOrigin-RevId: 386191612
@meisterT
Increase allowed size for install base again.
ca031e4 
It happens to be larger on Mac than on Linux.

PiperOrigin-RevId: 386403013
@meisterT
Bump version of java allocation instrumenter.
16e91d3 
Part of bazelbuild#13726.

Partial commit for third_party/*, see bazelbuild#13728.

Signed-off-by: Yun Peng <pcloudy@google.com>
@meisterT
Reference the correct version of the java allocation instrumenter.
7efabba 
It was updated in bazelbuild@affc27f

Part of bazelbuild#13726.

Closes bazelbuild#13734.

PiperOrigin-RevId: 386415693
@google-cla google-cla bot added cla: yes and removed cla: no labels Jul 26, 2021
@google-cla
Copy link

google-cla bot commented Jul 26, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@google-cla google-cla bot added cla: no and removed cla: yes labels Jul 26, 2021
@meisterT
Copy link
Member Author

@katre I must have been doing something wrong before, sorry for the mess. It should now work.

@katre katre merged commit 7efabba into bazelbuild:release-4.2.0-patches Jul 26, 2021
@katre katre mentioned this pull request Jul 26, 2021
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aiuto aiuto Awaiting requested review from aiuto

@floriographygoth floriographygoth Awaiting requested review from floriographygoth

@gregestren gregestren Awaiting requested review from gregestren

@jin jin Awaiting requested review from jin

@katre katre Awaiting requested review from katre

@ahumesky ahumesky Awaiting requested review from ahumesky

@allevato allevato Awaiting requested review from allevato

@brandjon brandjon Awaiting requested review from brandjon

@DavidGoldman DavidGoldman Awaiting requested review from DavidGoldman

@dmaclach dmaclach Awaiting requested review from dmaclach

@kevin1e100 kevin1e100 Awaiting requested review from kevin1e100

@lberki lberki Awaiting requested review from lberki

@oquenchil oquenchil Awaiting requested review from oquenchil

@thomasvl thomasvl Awaiting requested review from thomasvl

Assignees
No one assigned
Labels
cla: no
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@meisterT @katre