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 okhttp dependency clash #326

Merged
merged 1 commit into from
Jun 15, 2021
Merged

Fix okhttp dependency clash #326

merged 1 commit into from
Jun 15, 2021

Conversation

meiao
Copy link
Contributor

@meiao meiao commented Jun 15, 2021

Overview

On the 7.0.0 release, an indirect dependency to okhttp (4.8) was introduced to the agent.
This dependency was not shadowed, so it shared the same namespace of any customers' dependencies to older versions of okhttp, which caused errors on their end.

This commit instructs the shadower to change those classes so they are in a different namespace (package).
As an added bonus, this will also prevent the weaver to change these classes.

Related Github Issue

Resolves #324

Testing

This change cannot be tested in this project, as it requires different versions of the same dependency to be loaded at the same time.

Checks

[Y] Are your contributions backwards compatible with relevant frameworks and APIs?
[N] Does your code contain any breaking changes? Please describe.
[N] Does your code introduce any new dependencies? Please describe.

so they don't clash with customers' dependencies
@meiao meiao changed the title Adding more transitive dependencies to be shadowed Fix okhttp dependency clash Jun 15, 2021
@meiao meiao merged commit 89067cf into main Jun 15, 2021
@meiao meiao deleted the okhttp-conflict branch June 15, 2021 15:06
meiao added a commit that referenced this pull request Jun 15, 2021
so they don't clash with customers' dependencies
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.

java agent Instrumentation breaks OKhttp3
2 participants