From eb4f92804feef28715755ddc9e499a87412eba66 Mon Sep 17 00:00:00 2001
From: mrproliu <741550557@qq.com>
Date: Sat, 13 Jun 2026 11:32:23 +0800
Subject: [PATCH 1/2] Fix wrong banyanDB resource options in record data

---
 docs/en/changes/changes.md                                      | 1 +
 .../oap/server/storage/plugin/banyandb/MetadataRegistry.java    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index b29883c663f8..81b6b0a637a2 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -291,6 +291,7 @@
 * Add `@Stream(allowBootReshape = true)` opt-in for additive boot-time reshape of BanyanDB streams / measures. Code-defined stream classes (e.g. `AlarmRecord`) can now annotate their schema as eligible for in-place additive update at OAP boot — a new `@Column` is appended to the live tag-family / fields via `client.update` instead of being silently rejected with `SKIPPED_SHAPE_MISMATCH` (which previously forced operators to drop the measure / stream and lose historical rows). Additive includes both new tags / fields **and** relocating an existing tag between families when a `@Column`'s `storageOnly` flag flips (e.g. `id1` moving from `storage-only` → `searchable` when it becomes indexed). The opt-in is per-stream and gated by an `isPurelyAdditive` shape diff: tag type changes, tag drops, kind flips (tag↔field), entity / interval / sharding-key changes, and field re-typing still skip with `SKIPPED_SHAPE_MISMATCH`, so identity-breaking edits remain explicit operator actions. Only the init / standalone OAP performs the reshape; non-init peers continue through the existing poll-and-wait loop so a single node drives DDL. When a `check*` records `SKIPPED_SHAPE_MISMATCH` the dependent `IndexRule` / `IndexRuleBinding` reconciliation is also skipped — preventing the previous gap where the binding silently updated to a tag list that diverged from the live tag-family layout. `AlarmRecord` is opted in. Default remains `false` for all other models — boot-time reshape stays off unless the annotation is explicitly set. **Operator caveat:** BanyanDB does not physically migrate existing rows when a tag's family changes; pre-existing data stays in its original on-disk location while new writes go to the declared family — expect a backfill window for queries that route through new IndexRules on relocated tags.
 * Mask keywords `trustStorePass`, `keyStorePass` by default.
 * Bump up dependencies to clear CVE alerts on shipped OAP jars: log4j `2.25.3` → `2.25.4`, jackson `2.18.5` → `2.18.6`, kafka-clients `3.4.0` → `3.9.2`, postgresql `42.4.4` → `42.7.11`, commons-compress `1.21` → `1.26.2`.
+* Fix wrong banyanDB resource options in record data. 
 
 #### UI
 * Add mobile menu icon and i18n labels for the iOS layer.
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
index 09e4affc5aa4..958b4c615101 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
@@ -721,7 +721,7 @@ public SchemaMetadata parseMetadata(Model model, BanyanDBStorageConfig config, D
                             model.getName(),
                             Kind.STREAM,
                             model.getDownsampling(),
-                            config.getRecordsBrowserErrorLog()
+                            config.getRecordsNormal()
                         );
                     default:
                         throw new IllegalStateException("unknown stream group " + streamGroup);

From 68e0915321f8f48b34827712cc9fb73ac40c1768 Mon Sep 17 00:00:00 2001
From: mrproliu <741550557@qq.com>
Date: Sat, 13 Jun 2026 11:37:58 +0800
Subject: [PATCH 2/2] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 docs/en/changes/changes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 68fd17bf666d..bffa0e8405e4 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -294,7 +294,7 @@
 * Mask keywords `trustStorePass`, `keyStorePass` by default.
 * Bump up dependencies to clear CVE alerts on shipped OAP jars: log4j `2.25.3` → `2.25.4`, jackson `2.18.5` → `2.18.6`, kafka-clients `3.4.0` → `3.9.2`, postgresql `42.4.4` → `42.7.11`, commons-compress `1.21` → `1.26.2`.
 * Fix: continuous profiling policy validation now rejects a threshold / count of `0` to match the error messages and rover's `value >= threshold` trigger semantics (a `0` threshold would always trigger). CPU percent and HTTP error rate are tightened from `[0-100]` to `(0-100]`.
-* Fix wrong banyanDB resource options in record data. 
+* Fix wrong BanyanDB resource options in record data.
 
 #### UI
 * Add Airflow layer dashboards and menu i18n under Workflow Scheduler in Horizon UI (SWIP-7).