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

Instrumentation for rxjava3.1.1 #4954

Merged
merged 4 commits into from
Jan 4, 2022
Merged

Instrumentation for rxjava3.1.1 #4954

merged 4 commits into from
Jan 4, 2022

Conversation

laurit
Copy link
Contributor

@laurit laurit commented Dec 20, 2021

Resolves #4023

trask
trask approved these changes Jan 4, 2022
View reviewed changes
Copy link
Member

@trask trask left a comment

Choose a reason for hiding this comment

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

we finally got rid of our one "patch release" base version (log4j 2.13.2) only to get a new one 😢

mateuszrzeszutek
mateuszrzeszutek reviewed Jan 4, 2022
View reviewed changes
...va-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingAssembly.java Outdated
*
* <p>Instrumentation can be disabled by calling the {@link TracingAssembly#disable()} method.
*/
public final class TracingAssembly {
Copy link
Member

Choose a reason for hiding this comment

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

This class has exactly the same name & package as the 3.0 one - won't they conflict inside the agent?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, renamed 3.1.1 classes.

@laurit
Copy link
Contributor Author

laurit commented Jan 4, 2022

we finally got rid of our one "patch release" base version (log4j 2.13.2) only to get a new one 😢

I don't like it either. What alternatives do we have? The whole problem stems from rxjava moving ConditionalSubscriber and QueueSubscription interfaces to a different package. For QueueSubscription we could use reflection to invoke requestFusion method. With ConditionalSubscriber it is more troublesome because we have TracingConditionalSubscriber extends BasicFuseableSubscriber where BasicFuseableSubscriber takes ConditionalSubscriber as constructor argument. I guess we could use a jdk proxy that implements the same interfaces as BasicFuseableSubscriber and copy all the code from TracingConditionalSubscriber and BasicFuseableSubscriber into proxies invocation handler.

@trask
Copy link
Member

trask commented Jan 4, 2022

ya, no worries, I think it's a lost cause trying too hard to limit our version splitting...

@trask trask merged commit 97f1104 into open-telemetry:main Jan 4, 2022
RashmiRam pushed a commit to RashmiRam/opentelemetry-auto-instr-java that referenced this pull request May 23, 2022
@laurit @RashmiRam
Instrumentation for rxjava3.1.1 (open-telemetry#4954)
b14308d 
* Instrumentation for rxjava3.1.1

* Move common test classes

* spotless

* move rxjava 3.1.1 classes to separate package
@laurit laurit deleted the rxjava3.1.1 branch July 6, 2023 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mateuszrzeszutek mateuszrzeszutek mateuszrzeszutek left review comments

@anuraaga anuraaga anuraaga approved these changes

@trask trask trask approved these changes

@iNikem iNikem iNikem approved these changes

@jkwatson jkwatson Awaiting requested review from jkwatson

@pavolloffay pavolloffay Awaiting requested review from pavolloffay

@tylerbenson tylerbenson Awaiting requested review from tylerbenson

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Instrument RxJava 3.1.1+
5 participants
@laurit @trask @anuraaga @iNikem @mateuszrzeszutek