Skip to content

Commit 2319def

Browse files
authored
Fix potential unexpected current directory inclusion in Docker OAP classpath (#13844)
1 parent 8242ff6 commit 2319def

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

docker/oap/docker-entrypoint.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ if [ "$(ls -A $EXT_CONFIG_DIR)" ]; then
2727
cp -vfRL ${EXT_CONFIG_DIR}/* config/
2828
fi
2929

30-
CLASSPATH="config:$CLASSPATH"
30+
if [ -z "$CLASSPATH" ]; then
31+
CLASSPATH="config"
32+
else
33+
CLASSPATH="config:$CLASSPATH"
34+
fi
35+
3136
for i in oap-libs/*.jar
3237
do
3338
CLASSPATH="$i:$CLASSPATH"

docs/en/changes/changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
* 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 under `otel-rules/miniprogram/` with explicit `.service(...)` / `.endpoint(...)` chains (empty `expSuffix` so endpoint-scope rules aren't overridden), histogram percentile via `.histogram("le", TimeUnit.MILLISECONDS)` to keep ms bucket bounds intact, and request-cpm derived from the histogram `_count` family. LAL `layer: auto` rule produces both layers via `miniprogram.platform` dispatch and emits error-count samples consumed by per-platform log-MAL rules. Per-layer menu entries and service / instance / endpoint dashboards with Trace and Log sub-tabs.
3939
* Fix: remove `VirtualServiceAnalysisListener`'s dependency on `GenAIAnalyzerModule` if it is disabled.
4040
* 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×).
41+
* Fix: potential unexpected current directory inclusion in Docker OAP classpath.
4142

4243
#### UI
4344
* Add mobile menu icon and i18n labels for the iOS layer.

0 commit comments

Comments
 (0)