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

Remove unshaded javax.annotation classes from bootstrap class loader #4454

Merged
merged 12 commits into from
Oct 21, 2021
Merged

Remove unshaded javax.annotation classes from bootstrap class loader #4454

merged 12 commits into from
Oct 21, 2021

Conversation

trask
Copy link
Member

@trask trask commented Oct 20, 2021

This probably deserves a 1.7.1 patch unless there's reason to believe that since they're just annotations they shouldn't cause problems.

Created issue #4455 to add a test to guard against this.

@anuraaga
Copy link
Contributor

Did this come in with a transitive? I know we did our migration recently but thought it was compileOnly

@trask
Copy link
Member Author

trask commented Oct 21, 2021

Did this come in with a transitive? I know we did our migration recently but thought it was compileOnly

oh good point, i see it's compileOnly in sdk repo, i can fix that in this repo instead of shading

@anuraaga
Copy link
Contributor

@trask At the same time you can move it into java-conventions where it was supposed to be :P

@trask
Copy link
Member Author

trask commented Oct 21, 2021

@trask At the same time you can move it into java-conventions where it was supposed to be :P

yup, fixing that now

@trask trask changed the title Fix shading Make javax.annotations (jsr305) compileOnly Oct 21, 2021
@trask trask changed the title Make javax.annotations (jsr305) compileOnly Remove unshaded javax.annotation classes from bootstrap class loader Oct 21, 2021
@@ -22,6 +22,7 @@

package io.opentelemetry.instrumentation.rxjava2;

import io.opentelemetry.api.internal.GuardedBy;
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you copy this into instrumentation api instead?

@trask trask merged commit e9022da into open-telemetry:main Oct 21, 2021
@trask trask deleted the fix-shading branch October 21, 2021 21:47
RashmiRam pushed a commit to RashmiRam/opentelemetry-auto-instr-java that referenced this pull request May 23, 2022
…pen-telemetry#4454)

* Fix shading

* Revert "Fix shading"

This reverts commit 2aad3cf.

* Make javax.annotations compileOnly

* Replace checker GuardedBy with otel api internal GuardedBy

* Fix build

* Fix errorprone failures

* Remove extra newline

* Move internal GuardedBy to instrumentation-api

* empty commit

* empty commit
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.

5 participants