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

Fixed TracingKafkaClientSupplier to properly override getAdmin #1312

Merged
merged 5 commits into from
Dec 22, 2021

Conversation

TYsewyn
Copy link
Contributor

@TYsewyn TYsewyn commented Dec 13, 2021

getAdminClient has been deprecated in favor of getAdmin.
Calls to getAdminClient are throwing an UnsupportedOperationException in kafka-streams version < 3.0.0, while calls to getAdmin are also throwing an UnsupportedOperationException in kafka-streams version >= 3.0.0

Fixes #1316

getAdminClient has been deprecated in favor of getAdmin.
Calls to getAdminClient are throwing an UnsupportedOperationException in kafka-streams version < 3.0.0,
while calls to getAdmin are also throwing an UnsupportedOperationException in kafka-streams version >= 3.0.0
Copy link
Member

@jeqo jeqo left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @TYsewyn

@jeqo
Copy link
Member

jeqo commented Dec 13, 2021

@TYsewyn could you update the license headers and push again?

@jcchavezs
Copy link
Contributor

@TYsewyn I think jeqo meant to do so on the modified file only. Could you please drop the last too commits and update only the header of the modified file?

@TYsewyn
Copy link
Contributor Author

TYsewyn commented Dec 13, 2021

Sure, I can do that. Can any of you fix the other license headers in the main branch?
None of the PRs are actually going to build right now, see https://github.com/openzipkin/brave/runs/4510741287?check_suite_focus=true#step:4:110

@jcchavezs
Copy link
Contributor

@TYsewyn could you please open a PR with header updates for the POMs?

@jcchavezs
Copy link
Contributor

@TYsewyn this PR address the license issue #1315

@jcchavezs
Copy link
Contributor

@TYsewyn do you mind rebasing?

@jcchavezs
Copy link
Contributor

Could we exhibit a failing test case?

@TYsewyn
Copy link
Contributor Author

TYsewyn commented Dec 22, 2021

Just following up. Do we know when this is going to be merged (and eventually released)?

@jcchavezs
Copy link
Contributor

Somehow this comment got through:

Quick question: will this work with both <3.0.0 and >=3.0.0?

@TYsewyn
Copy link
Contributor Author

TYsewyn commented Dec 22, 2021

Yes, it should. getAdminClient was deprecated in <3.0.0, and getAdmin was added for >=3.0.0.
<3.0.0 calls getAdminClient, and >=3.0.0 calls getAdmin.

TracingKafkaClientSupplier still implements getAdminClient. This implementation calls getAdmin which returns an instance of AdminClient.

@jcchavezs
Copy link
Contributor

Ideally I'd like to exhibit a test case where we use <3.0.0 and >3.0.0 (just to make sure we don't break the implementation in further changes) but I guess that can backfilled later. I will merge as it is. If you fill so, a unit test as I described would be good.

@jcchavezs jcchavezs merged commit c883124 into openzipkin:master Dec 22, 2021
@TYsewyn
Copy link
Contributor Author

TYsewyn commented Dec 22, 2021

I believe that would be quite difficult to achieve since you would need to have both versions on your classpath at the same time. Unless you create separate submodules for Kafka integration tests.

@TYsewyn TYsewyn deleted the fix/kafka-streams-tracing branch December 22, 2021 09:37
@jcchavezs
Copy link
Contributor

New release is out: https://github.com/openzipkin/brave/releases/tag/5.13.6

Unless you create separate submodules for Kafka integration tests.

That sounds reasonable. Any input @jeqo?

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.

Kafka Streams instrumentation not compatible with kafka-streams 3.0.0
3 participants