(skywalking) branch master updated: Fix potential unexpected current directory inclusion in Docker OAP classpath (#13844)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wu-sheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 2319def4a9 Fix potential unexpected current directory inclusion in Docker OAP classpath (#13844)
2319def4a9 is described below

commit 2319def4a905862aca21edf7703e36549335e3ea
Author: weixiang1862 <65...@qq.com>
AuthorDate: Thu Apr 23 16:16:02 2026 +0800

    Fix potential unexpected current directory inclusion in Docker OAP classpath (#13844)
---
 docker/oap/docker-entrypoint.sh | 7 ++++++-
 docs/en/changes/changes.md      | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docker/oap/docker-entrypoint.sh b/docker/oap/docker-entrypoint.sh
index de60e3d087..9e7a2784ea 100755
--- a/docker/oap/docker-entrypoint.sh
+++ b/docker/oap/docker-entrypoint.sh
@@ -27,7 +27,12 @@ if [ "$(ls -A $EXT_CONFIG_DIR)" ]; then
   cp -vfRL ${EXT_CONFIG_DIR}/* config/
 fi
 
-CLASSPATH="config:$CLASSPATH"
+if [ -z "$CLASSPATH" ]; then
+  CLASSPATH="config"
+else
+  CLASSPATH="config:$CLASSPATH"
+fi
+
 for i in oap-libs/*.jar
 do
     CLASSPATH="$i:$CLASSPATH"
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 5ca2ad79ef..6236bb99a9 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -38,6 +38,7 @@
 * Add WeChat and Alipay Mini Program monitoring via the SkyAPM mini-program-monitor SDK (SWIP-12). Two new layers (`WECHAT_MINI_PROGRAM`, `ALIPAY_MINI_PROGRAM`); two new JavaScript componentIds (`WeChat-MiniProgram: 10002`, `AliPay-MiniProgram: 10003`). Service / instance / endpoint entities are produced by MAL + LAL, not trace analysis — mini-programs are client-side (exit-only) so `RPCAnalysisListener` stays unchanged (same pattern as browser and iOS). MAL rules per platform × scope un [...]
 * Fix: remove `VirtualServiceAnalysisListener`'s dependency on `GenAIAnalyzerModule` if it is disabled.
 * MAL: register `TimeUnit` in `MALCodegenHelper.ENUM_FQCN` so rule YAML can write `.histogram("le", TimeUnit.MILLISECONDS)` for SDKs that emit histogram bucket bounds in ms (default `SECONDS` unit applies a ×1000 rescale that would otherwise inflate stored `le` labels 1000×).
+* Fix: potential unexpected current directory inclusion in Docker OAP classpath.
 
 #### UI
 * Add mobile menu icon and i18n labels for the iOS layer.