Skip to content

Commit ae0f123

Browse files
wu-shengclaude
andcommitted
Remove JDK 8 compatibility code from OAL V2
OAP server requires JDK 11+, so JDK 8 compatibility code is unnecessary. - Remove SystemUtils.isJavaVersionAtMost checks in OALClassGeneratorV2 - Remove unused currentClassLoader field and setter - Update OALEngineV2 and tests to remove setCurrentClassLoader calls - Remove JavaVersion and SystemUtils imports Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 1f2f838 commit ae0f123

File tree

4 files changed

+3
-25
lines changed

4 files changed

+3
-25
lines changed

oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/v2/OALEngineV2.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ public void start(ClassLoader currentClassLoader) throws ModuleStartException, O
9292

9393
// Prepare temp folder for generated classes
9494
classGeneratorV2.prepareRTTempFolder();
95-
classGeneratorV2.setCurrentClassLoader(currentClassLoader);
9695

9796
// Load OAL script, parse, and generate classes with proper resource management
9897
try (Reader reader = ResourceUtils.read(oalDefine.getConfigFile())) {

oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/v2/generator/OALClassGeneratorV2.java

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
import javassist.bytecode.annotation.StringMemberValue;
4848
import lombok.extern.slf4j.Slf4j;
4949
import org.apache.commons.io.FileUtils;
50-
import org.apache.commons.lang3.JavaVersion;
51-
import org.apache.commons.lang3.SystemUtils;
5250
import org.apache.skywalking.oap.server.core.WorkPath;
5351
import org.apache.skywalking.oap.server.core.analysis.DisableRegister;
5452
import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher;
@@ -100,7 +98,6 @@ public class OALClassGeneratorV2 {
10098
private final ClassPool classPool;
10199
private final OALDefine oalDefine;
102100
private Configuration configuration;
103-
private ClassLoader currentClassLoader;
104101
private StorageBuilderFactory storageBuilderFactory;
105102
private static String GENERATED_FILE_PATH;
106103

@@ -282,11 +279,7 @@ private Class generateMetricsClass(CodeGenModel model) throws OALCompileExceptio
282279

283280
Class targetClass;
284281
try {
285-
if (SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_1_8)) {
286-
targetClass = metricsClass.toClass(currentClassLoader, null);
287-
} else {
288-
targetClass = metricsClass.toClass(MetricClassPackageHolder.class);
289-
}
282+
targetClass = metricsClass.toClass(MetricClassPackageHolder.class);
290283
} catch (CannotCompileException e) {
291284
log.error("Can't compile/load " + className + ".", e);
292285
throw new OALCompileException(e.getMessage(), e);
@@ -337,11 +330,7 @@ private void generateMetricsBuilderClass(CodeGenModel model) throws OALCompileEx
337330
}
338331

339332
try {
340-
if (SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_1_8)) {
341-
metricsBuilderClass.toClass(currentClassLoader, null);
342-
} else {
343-
metricsBuilderClass.toClass(MetricBuilderClassPackageHolder.class);
344-
}
333+
metricsBuilderClass.toClass(MetricBuilderClassPackageHolder.class);
345334
} catch (CannotCompileException e) {
346335
log.error("Can't compile/load " + className + ".", e);
347336
throw new OALCompileException(e.getMessage(), e);
@@ -408,11 +397,7 @@ private Class generateDispatcherClass(String scopeName, DispatcherContextV2 disp
408397

409398
Class targetClass;
410399
try {
411-
if (SystemUtils.isJavaVersionAtMost(JavaVersion.JAVA_1_8)) {
412-
targetClass = dispatcherClass.toClass(currentClassLoader, null);
413-
} else {
414-
targetClass = dispatcherClass.toClass(DispatcherClassPackageHolder.class);
415-
}
400+
targetClass = dispatcherClass.toClass(DispatcherClassPackageHolder.class);
416401
} catch (CannotCompileException e) {
417402
log.error("Can't compile/load " + className + ".", e);
418403
throw new OALCompileException(e.getMessage(), e);
@@ -488,10 +473,6 @@ private void writeGeneratedFile(CtClass ctClass, String type) throws OALCompileE
488473
}
489474
}
490475

491-
public void setCurrentClassLoader(ClassLoader currentClassLoader) {
492-
this.currentClassLoader = currentClassLoader;
493-
}
494-
495476
public void setStorageBuilderFactory(StorageBuilderFactory storageBuilderFactory) {
496477
this.storageBuilderFactory = storageBuilderFactory;
497478
}

oap-server/oal-rt/src/test/java/org/apache/skywalking/oal/v2/generator/OALClassGeneratorV2Test.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,6 @@ public void testInFilterOperatorGeneration() throws Exception {
420420
private OALClassGeneratorV2 createGenerator() {
421421
TestOALDefine oalDefine = new TestOALDefine();
422422
OALClassGeneratorV2 generator = new OALClassGeneratorV2(oalDefine);
423-
generator.setCurrentClassLoader(OALClassGeneratorV2Test.class.getClassLoader());
424423
generator.setStorageBuilderFactory(new StorageBuilderFactory.Default());
425424
generator.prepareRTTempFolder();
426425
return generator;

oap-server/oal-rt/src/test/java/org/apache/skywalking/oal/v2/generator/RuntimeOALGenerationTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ public void testGenerateAllRuntimeOALScripts() throws Exception {
278278
OALClassGeneratorV2 generator = new OALClassGeneratorV2(define, classPool);
279279
generator.setOpenEngineDebug(true);
280280
generator.setStorageBuilderFactory(new StorageBuilderFactory.Default());
281-
generator.setCurrentClassLoader(this.getClass().getClassLoader());
282281

283282
// Generate classes
284283
List<Class> metricsClasses = new ArrayList<>();

0 commit comments

Comments
 (0)