Skip to content

Avoid to extract symbols for static final fields #9596

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

Closed
jpbempel wants to merge 1 commit into from
Closed

Avoid to extract symbols for static final fields #9596

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
9 changes: 7 additions & 2 deletions dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,13 @@ private static Collection<String> extractInterfaces(ClassNode classNode) {
private static List<Symbol> extractFields(ClassNode classNode) {
List<Symbol> fields = new ArrayList<>();
for (FieldNode fieldNode : classNode.fields) {
SymbolType symbolType =
ASMHelper.isStaticField(fieldNode) ? SymbolType.STATIC_FIELD : SymbolType.FIELD;
boolean isStatic = ASMHelper.isStaticField(fieldNode);
boolean isFinal = ASMHelper.isFinalField(fieldNode);
if (isFinal && isStatic) {
// skip final static fields, considered as constant and not captured by context probes
continue;
}
SymbolType symbolType = isStatic ? SymbolType.STATIC_FIELD : SymbolType.FIELD;
LanguageSpecifics fieldSpecifics =
new LanguageSpecifics.Builder()
.addModifiers(extractFieldModifiers(fieldNode.access))
Expand Down
19 changes: 2 additions & 17 deletions ...t-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,23 +837,8 @@ public void symbolExtraction14() throws IOException, URISyntaxException {
Enum.class.getTypeName(),
null,
null);
assertEquals(4, myEnumClassScope.getSymbols().size());
Symbol oneField = myEnumClassScope.getSymbols().get(0);
assertLangSpecifics(
oneField.getLanguageSpecifics(),
asList("public", "static", "final", "enum"),
null,
null,
null,
null);
Symbol valuesField = myEnumClassScope.getSymbols().get(3);
assertLangSpecifics(
valuesField.getLanguageSpecifics(),
asList("private", "static", "final", "synthetic"),
null,
null,
null,
null);
// enum constants are static final fields and therefore not extracted
assertEquals(0, myEnumClassScope.getSymbols().size());
}

@Test
Expand Down