Skip to content

Commit 6a7badd

Browse files
authored
Update to ASM 7.1 in logger usage check (#52742)
The logger usage check uses its own version of ASM to inspect class files for logging usages. Master was updated to support java 11 compilation in #40754. However, 7.x still used ASM 5, which could not read newer java bytecode versions. This commit bumps ASM in 7.x used in the logger usage check. closes #52408
1 parent 8c96112 commit 6a7badd

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

test/logger-usage/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
*/
1919

2020
dependencies {
21-
compile 'org.ow2.asm:asm-debug-all:5.0.4' // use asm-debug-all as asm-all is broken
21+
compile 'org.ow2.asm:asm:7.1'
22+
compile 'org.ow2.asm:asm-tree:7.1'
23+
compile 'org.ow2.asm:asm-analysis:7.1'
2224
compile "org.apache.logging.log4j:log4j-api:${versions.log4j}"
2325
testCompile project(":test:framework")
2426
}

test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ private static class ClassChecker extends ClassVisitor {
188188
private final Predicate<String> methodsToCheck;
189189

190190
ClassChecker(Consumer<WrongLoggerUsage> wrongUsageCallback, Predicate<String> methodsToCheck) {
191-
super(Opcodes.ASM5);
191+
super(Opcodes.ASM7);
192192
this.wrongUsageCallback = wrongUsageCallback;
193193
this.methodsToCheck = methodsToCheck;
194194
}
@@ -222,7 +222,7 @@ private static class MethodChecker extends MethodVisitor {
222222
private boolean ignoreChecks;
223223

224224
MethodChecker(String className, int access, String name, String desc, Consumer<WrongLoggerUsage> wrongUsageCallback) {
225-
super(Opcodes.ASM5, new MethodNode(access, name, desc, null, null));
225+
super(Opcodes.ASM7, new MethodNode(access, name, desc, null, null));
226226
this.className = className;
227227
this.wrongUsageCallback = wrongUsageCallback;
228228
}
@@ -503,6 +503,10 @@ private static final class IntegerConstantBasicValue extends IntMinMaxTrackingBa
503503
}
504504

505505
private static final class PlaceHolderStringInterpreter extends BasicInterpreter {
506+
PlaceHolderStringInterpreter() {
507+
super(Opcodes.ASM7);
508+
}
509+
506510
@Override
507511
public BasicValue newOperation(AbstractInsnNode insnNode) throws AnalyzerException {
508512
if (insnNode.getOpcode() == Opcodes.LDC) {
@@ -527,6 +531,10 @@ public BasicValue merge(BasicValue value1, BasicValue value2) {
527531
}
528532

529533
private static final class ArraySizeInterpreter extends BasicInterpreter {
534+
ArraySizeInterpreter() {
535+
super(Opcodes.ASM7);
536+
}
537+
530538
@Override
531539
public BasicValue newOperation(AbstractInsnNode insnNode) throws AnalyzerException {
532540
switch (insnNode.getOpcode()) {

0 commit comments

Comments
 (0)