From 1dc39f6f264a3720605c89e5f288774a537716eb Mon Sep 17 00:00:00 2001 From: Wan Kai Date: Tue, 3 Jun 2025 20:55:30 +0800 Subject: [PATCH] Fix `disable.oal` does not work. (#13290) --- docs/en/changes/changes.md | 1 + .../skywalking/oap/server/core/CoreModuleProvider.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 49a0e63834..a3b9963db3 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -28,6 +28,7 @@ * Refactor: simplify the `Accept` http header process. * [Break Change]Storage: Move `event` from metrics to recods. * Remove string limitation in Jackson deserializer for ElasticSearch client. +* Fix `disable.oal` does not work. #### UI diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java index a9cc8901e1..a9963f6545 100755 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java @@ -405,6 +405,9 @@ public class CoreModuleProvider extends ModuleProvider { moduleConfig.getMaxHttpUrisNumberPerService() ); + // Disable OAL script has higher priority + oalEngineLoaderService.load(DisableOALDefine.INSTANCE); + try { receiver.scan(); annotationScan.scan(); @@ -412,9 +415,6 @@ public class CoreModuleProvider extends ModuleProvider { throw new ModuleStartException(e.getMessage(), e); } - // Disable OAL script has higher priority - oalEngineLoaderService.load(DisableOALDefine.INSTANCE); - Address gRPCServerInstanceAddress = new Address(moduleConfig.getGRPCHost(), moduleConfig.getGRPCPort(), true); TelemetryRelatedContext.INSTANCE.setId(gRPCServerInstanceAddress.toString()); ClusterCoordinator coordinator = this.getManager()