From 3663a4ac5fa6bb88cae72091eca683cc3989b8bb Mon Sep 17 00:00:00 2001 From: zhyyu Date: Thu, 22 Dec 2022 11:22:31 +0800 Subject: [PATCH] fix ServiceMeshServiceDispatcher overwrite ServiceDispatcher debug file when open SW_OAL_ENGINE_DEBUG. (#10187) --- docs/en/changes/changes.md | 1 + .../java/org/apache/skywalking/oal/rt/OALRuntime.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 34d24bdf6e..ba5cd05006 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -55,6 +55,7 @@ * Register ValueColumn as Tag for Record in BanyanDB storage plugin. * Bump up Netty to 4.1.86. * Remove unnecessary additional columns when storage is in logical sharding mode. +* Fix ServiceMeshServiceDispatcher overwrite ServiceDispatcher debug file when open SW_OAL_ENGINE_DEBUG. #### UI diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java index 9295821ee6..26c2a876ff 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java @@ -329,7 +329,7 @@ public class OALRuntime implements OALEngine { } log.debug("Generate metrics class, " + metricsClass.getName()); - writeGeneratedFile(metricsClass, metricsClass.getSimpleName(), "metrics"); + writeGeneratedFile(metricsClass, "metrics"); return targetClass; } @@ -386,7 +386,7 @@ public class OALRuntime implements OALEngine { throw new OALCompileException(e.getMessage(), e); } - writeGeneratedFile(metricsBuilderClass, className, "metrics/builder"); + writeGeneratedFile(metricsBuilderClass, "metrics/builder"); } /** @@ -468,7 +468,7 @@ public class OALRuntime implements OALEngine { throw new OALCompileException(e.getMessage(), e); } - writeGeneratedFile(dispatcherClass, className, "dispatcher"); + writeGeneratedFile(dispatcherClass, "dispatcher"); return targetClass; } @@ -514,8 +514,9 @@ public class OALRuntime implements OALEngine { } } - private void writeGeneratedFile(CtClass metricsClass, String className, String type) throws OALCompileException { + private void writeGeneratedFile(CtClass metricsClass, String type) throws OALCompileException { if (openEngineDebug) { + String className = metricsClass.getSimpleName(); DataOutputStream printWriter = null; try { File workPath = WorkPath.getPath();