Skip to content

Update datadog.trace.agent.tooling.bytebuddy.outline.TypeOutline to work with ByteBuddy 1.17.6 #9457

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
merged 3 commits into from
Sep 4, 2025
Merged

Update datadog.trace.agent.tooling.bytebuddy.outline.TypeOutline to work with ByteBuddy 1.17.6 #9457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f744f0
Update datadog.trace.agent.tooling.bytebuddy.outline.TypeOutline#isIn…
nikita-tkachenko-datadog Sep 3, 2025
f52d854
Fix the other methods modified in 1.17.6
nikita-tkachenko-datadog Sep 3, 2025
ca28c79
Add unit tests
nikita-tkachenko-datadog Sep 3, 2025
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
25 changes: 25 additions & 0 deletions ...gent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeOutline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import net.bytebuddy.description.method.MethodList;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.description.type.TypeList;
import net.bytebuddy.jar.asm.Opcodes;

/** Provides an outline of a type; i.e. the named elements making up its structure. */
final class TypeOutline extends WithName {
Expand Down Expand Up @@ -89,6 +90,30 @@ public int getModifiers() {
return modifiers;
}

@Override
public boolean isAbstract() {
return matchesMask(Opcodes.ACC_ABSTRACT);
}

@Override
public boolean isEnum() {
return matchesMask(Opcodes.ACC_ENUM);
}

@Override
public boolean isInterface() {
return matchesMask(Opcodes.ACC_INTERFACE);
}

@Override
public boolean isAnnotation() {
return matchesMask(Opcodes.ACC_ANNOTATION);
}

private boolean matchesMask(int mask) {
return (this.getModifiers() & mask) == mask;
}

@Override
public ClassFileVersion getClassFileVersion() {
return ClassFileVersion.ofMinorMajor(classFileVersion);
Expand Down
26 changes: 17 additions & 9 deletions ...rc/test/groovy/datadog/trace/agent/tooling/bytebuddy/outline/OutlineTypeParserTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import spock.lang.Specification

class OutlineTypeParserTest extends Specification {

void 'test anonymous classes are detected'() {
void 'test modifiers are correct and anonymous classes are detected'() {
setup:
final parser = new OutlineTypeParser()
final locator = ClassFileLocators.classFileLocator(Thread.currentThread().contextClassLoader)
Expand All @@ -16,15 +16,23 @@ class OutlineTypeParserTest extends Specification {

then:
outline.anonymousType == anonymous
outline.interface == isinterface
outline.abstract == isabstract
outline.annotation == annotation
outline.enum == isenum

where:
clazz | anonymous
'datadog.trace.agent.test.EnclosedClasses' | false
'datadog.trace.agent.test.EnclosedClasses$Inner' | false
'datadog.trace.agent.test.EnclosedClasses$InnerStatic' | false
'datadog.trace.agent.test.EnclosedClasses$1' | true
'datadog.trace.agent.test.EnclosedClasses$2' | true
'datadog.trace.agent.test.EnclosedClasses$Inner$1' | true
'datadog.trace.agent.test.EnclosedClasses$InnerStatic$1' | true
clazz | anonymous | isinterface | isabstract | annotation | isenum
'datadog.trace.agent.test.EnclosedClasses' | false | false | false | false | false
'datadog.trace.agent.test.EnclosedClasses$Inner' | false | false | false | false | false
'datadog.trace.agent.test.EnclosedClasses$InnerStatic' | false | false | false | false | false
'datadog.trace.agent.test.EnclosedClasses$1' | true | false | false | false | false
'datadog.trace.agent.test.EnclosedClasses$2' | true | false | false | false | false
'datadog.trace.agent.test.EnclosedClasses$Inner$1' | true | false | false | false | false
'datadog.trace.agent.test.EnclosedClasses$InnerStatic$1' | true | false | false | false | false
'datadog.trace.agent.test.EnclosedClasses$Interface' | false | true | true | false | false
'datadog.trace.agent.test.EnclosedClasses$Abstract' | false | false | true | false | false
'datadog.trace.agent.test.EnclosedClasses$Annotation' | false | true | true | true | false
'datadog.trace.agent.test.EnclosedClasses$Enum' | false | false | false | false | true
}
}
8 changes: 8 additions & 0 deletions dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/EnclosedClasses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,12 @@ public String get() {
}.get();
}
}

public interface Interface {}

public abstract static class Abstract {}

public @interface Annotation {}

public enum Enum {}
}