Skip to content

Use WithTypeStructure to check declaresField #10307

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

Merged
amarziali merged 1 commit into from
Jan 7, 2026
Merged

Use WithTypeStructure to check declaresField #10307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .../java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
*/
@AutoService(InstrumenterModule.class)
public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.Tracing
implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
implements Instrumenter.ForTypeHierarchy,
Instrumenter.HasMethodAdvice,
Instrumenter.WithTypeStructure {

public KafkaConsumerInfoInstrumentation() {
super("kafka", "kafka-3.8");
Expand Down Expand Up @@ -60,8 +62,12 @@ public String hierarchyMarkerType() {

@Override
public ElementMatcher<TypeDescription> hierarchyMatcher() {
return implementsInterface(named(hierarchyMarkerType()))
.and(declaresField(named("offsetCommitCallbackInvoker")));
return implementsInterface(named(hierarchyMarkerType()));
}

@Override
public ElementMatcher<TypeDescription> structureMatcher() {
return declaresField(named("offsetCommitCallbackInvoker"));
}

@Override
Expand Down
12 changes: 9 additions & 3 deletions ...datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
*/
@AutoService(InstrumenterModule.class)
public final class LegacyKafkaConsumerInfoInstrumentation extends InstrumenterModule.Tracing
implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
implements Instrumenter.ForTypeHierarchy,
Instrumenter.HasMethodAdvice,
Instrumenter.WithTypeStructure {

public LegacyKafkaConsumerInfoInstrumentation() {
super("kafka", "kafka-3.8");
Expand Down Expand Up @@ -60,8 +62,12 @@ public String hierarchyMarkerType() {
// new - we are instrumenting the ConsumerDelegate class instead of the KafkaConsumer class
@Override
public ElementMatcher<TypeDescription> hierarchyMatcher() {
return implementsInterface(named(hierarchyMarkerType()))
.and(declaresField(named("coordinator")));
return implementsInterface(named(hierarchyMarkerType()));
}

@Override
public ElementMatcher<TypeDescription> structureMatcher() {
return declaresField(named("coordinator"));
}

@Override
Expand Down