kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support BanyanDB internal stream query execution tracing (#12439)

This commit is contained in:
Wan Kai 2024-07-15 18:36:57 +08:00 committed by GitHub
parent 5a7c53b1b8
commit 0949e5a425
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/en/changes/changes.md
View File

@ -24,7 +24,7 @@
* Fix BanyanDB metrics query: used the wrong `Downsampling` type to find the schema. * Fix BanyanDB metrics query: used the wrong `Downsampling` type to find the schema.
* Support fetch cilium flow to monitoring network traffic between cilium services. * Support fetch cilium flow to monitoring network traffic between cilium services.
* Support `labelCount` function in the OAL engine. * Support `labelCount` function in the OAL engine.
* Support BanyanDB internal metrics query execution tracing. * Support BanyanDB internal measure query execution tracing.
* BanyanDB client config: rise the default `maxBulkSize` to 10000, add `flushTimeout` and set default to 10s. * BanyanDB client config: rise the default `maxBulkSize` to 10000, add `flushTimeout` and set default to 10s.
* Polish BanyanDB group and schema creation logic to fix the schema creation failure issue in distributed race conditions. * Polish BanyanDB group and schema creation logic to fix the schema creation failure issue in distributed race conditions.
* Support tracing topology query for debugging. * Support tracing topology query for debugging.
@ -33,6 +33,7 @@
* BanyanDB: fix Tag autocomplete data storage and query. * BanyanDB: fix Tag autocomplete data storage and query.
* Support aggregation operators in PromQL query. * Support aggregation operators in PromQL query.
* Update the kubernetes HTTP latency related metrics source unit from `ns` to `ms`. * Update the kubernetes HTTP latency related metrics source unit from `ns` to `ms`.
* Support BanyanDB internal stream query execution tracing.
#### UI #### UI
* Highlight search log keywords. * Highlight search log keywords.

6
oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/AbstractBanyanDBDAO.java
View File

@ -74,7 +74,10 @@ public abstract class AbstractBanyanDBDAO extends AbstractDAO<BanyanDBStorageCli
} }
builder.apply(query); builder.apply(query);
DebuggingTraceContext traceContext = DebuggingTraceContext.TRACE_CONTEXT.get();
if (traceContext != null && traceContext.isDebug()) {
query.enableTrace();
}
return getClient().query(query); return getClient().query(query);
} }
@ -103,6 +106,7 @@ public abstract class AbstractBanyanDBDAO extends AbstractDAO<BanyanDBStorageCli
builder.append("\n").append(" Response: ").append(new Gson().toJson(response.getElements())); builder.append("\n").append(" Response: ").append(new Gson().toJson(response.getElements()));
span.setMsg(builder.toString()); span.setMsg(builder.toString());
} }
addDBTrace2DebuggingTrace(response.getTrace(), traceContext, span);
return response; return response;
} finally { } finally {
if (traceContext != null && span != null) { if (traceContext != null && span != null) {

2
test/e2e-v2/script/env
View File

@ -23,7 +23,7 @@ SW_AGENT_CLIENT_JS_COMMIT=af0565a67d382b683c1dbd94c379b7080db61449
SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016 SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
SW_KUBERNETES_COMMIT_SHA=1335f15bf821a40a7cd71448fa805f0be265afcc SW_KUBERNETES_COMMIT_SHA=1335f15bf821a40a7cd71448fa805f0be265afcc
SW_ROVER_COMMIT=6bbd39aa701984482330d9dfb4dbaaff0527d55c SW_ROVER_COMMIT=6bbd39aa701984482330d9dfb4dbaaff0527d55c
SW_BANYANDB_COMMIT=e7210733022566cd0cee7ea2dc12cfb2f30fa8f3 SW_BANYANDB_COMMIT=285db188e633c6b95b8c5c354e043db79658c147
SW_AGENT_PHP_COMMIT=3192c553002707d344bd6774cfab5bc61f67a1d3 SW_AGENT_PHP_COMMIT=3192c553002707d344bd6774cfab5bc61f67a1d3
SW_CTL_COMMIT=d5f3597733aa5217373986d776a3ee5ee8b3c468 SW_CTL_COMMIT=d5f3597733aa5217373986d776a3ee5ee8b3c468