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

Spring-kafka single record instrumentation #5904

Merged
merged 1 commit into from
Apr 21, 2022

Conversation

mateuszrzeszutek
Copy link
Member

That should fix Kafka telemetry for spring-kafka users, at least those using version >=2.7 -- earlier versions do not have the interceptor interfaces (or they're incomplete), so if we want to instrument them we'll have to modify private method code.

By the way -- I think #5826 might have introduced a regression; by disabling kafka-clients tracing in KafkaMessageListenerContainer$ListenerConsumer ALL tracing was disabled, including single record listeners. Users that were using spinrg-kafka >=2.7 with single record listeners would not get the consumer process telemetry this way <-- @open-telemetry/java-instrumentation-maintainers should we add this PR to the patch release too?

@mateuszrzeszutek mateuszrzeszutek requested a review from a team April 21, 2022 13:48
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.

nice! (and great catch)

should we add this PR to the patch release too?

the PR is a bit large, but it fixes an important regression, and is better than rolling back #5826, so I definitely think it should go into 1.13.1

Comment on lines -39 to +40
public static void onExit() {
KafkaClientsConsumerProcessTracing.enableWrapping();
public static void onExit(@Advice.Enter boolean previousValue) {
KafkaClientsConsumerProcessTracing.setEnabled(previousValue);
Copy link
Member

Choose a reason for hiding this comment

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

👍

@trask trask merged commit 2882572 into open-telemetry:main Apr 21, 2022
github-actions bot pushed a commit that referenced this pull request Apr 21, 2022
trask pushed a commit that referenced this pull request Apr 22, 2022
@mateuszrzeszutek mateuszrzeszutek deleted the spring-kafka branch April 22, 2022 08:32
RashmiRam pushed a commit to RashmiRam/opentelemetry-auto-instr-java that referenced this pull request May 23, 2022
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.

2 participants