Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/env
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ SW_UI_IMAGE_TAG="latest"
# BanyanDB
##############################################################################
SW_BANYANDB_IMAGE_REPO="ghcr.io/apache/skywalking-banyandb"
SW_BANYANDB_IMAGE_TAG="88245d3965b6a28c329d1c9ef36aaafecec6144f"
SW_BANYANDB_IMAGE_TAG="8efdf0ca7cc4879b88e4e7818fad5690eb1bbe59"

##############################################################################
# SkyWalking Helm Chart
Expand Down
2 changes: 1 addition & 1 deletion docker/.env
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
# docker compose up

ELASTICSEARCH_IMAGE=docker.elastic.co/elasticsearch/elasticsearch-oss:7.4.2
BANYANDB_IMAGE=ghcr.io/apache/skywalking-banyandb:88245d3965b6a28c329d1c9ef36aaafecec6144f
BANYANDB_IMAGE=ghcr.io/apache/skywalking-banyandb:8efdf0ca7cc4879b88e4e7818fad5690eb1bbe59
OAP_IMAGE=ghcr.io/apache/skywalking/oap:latest
UI_IMAGE=ghcr.io/apache/skywalking-horizon-ui:latest
1 change: 1 addition & 0 deletions docs/en/changes/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Make a failed integration test fail the build. Failsafe's `verify` goal, which fails the build, ran in the `verify` phase that `./mvnw integration-test` (the CI command) never reaches, so the Integration test job stayed green while ITs failed: 22 did on master, the 20 BanyanDB client ITs above, `JDBCHistoryDeleteDAOIT` (stale since `ModelColumn` requires a BanyanDB extension) and the Apollo one below. `verify` now runs in the `integration-test` phase, after the ITs.
* Fix the flaky Elasticsearch client IT (`ElasticSearchIT`), whose failures stayed hidden until a failed IT failed the build (above). OpenSearch 1.0.0 moves to 1.3.20 and Elasticsearch 8.1.0 to 8.19.25, the latest of each line. On 8 of the 19 nightly runs since 2026-10-20 an OpenSearch 1.0.0 container never started, and the test waited out its five-minute startup timeout; every failed container's only output is its start script stopping OpenSearch. The same output was reported upstream on 1.0.1, and its reporter saw it go away with the 1.1 image (opensearch-project/opensearch-build#504). Elasticsearch 8.1.0's bundled JDK 17.0.2 crashed at startup on the runner's cgroup v2 setup (`NullPointerException` in `CgroupV2Subsystem`) on 11 of the 13 nightly runs from 2026-10-07 to 2026-10-27, failing all eight of its tests each time. The OpenSearch 1.3.20 and 2.8.0 containers now run without the Performance Analyzer agent: the image starts its JVM beside the launcher's, a JVM that starts beside another can print an hsperfdata lock warning, and the launcher takes that warning into its JVM options, so OpenSearch fails with `Could not find or load main class Cannot` (opensearch-project/opensearch-build#3821). The tested OpenSearch 1.x version in the storage docs is now 1.3.20.
* Test Zipkin and the span-attached events of eBPF profiling on Elasticsearch and OpenSearch, and the DAOs of the BanyanDB storage. The Zipkin e2e case on OpenSearch runs in CI again, now on OpenSearch 3.0.0: it pinned OpenSearch 1.2.0, so it lost its CI job when #13715 dropped the OpenSearch 1.x e2e tests, and had not run in CI since. New slow ITs write through OAP's own write path and read back through the Elasticsearch storage's DAOs and the trace and Zipkin query services, on Elasticsearch 8.18.8 and 9.3.0 and OpenSearch 2.8.0 and 3.0.0 with OAP's default storage settings, and on Elasticsearch 9.3.0 and OpenSearch 3.0.0 with logic sharding and custom routing. For Zipkin they check every search filter against a near miss, spans on and just outside each time bound, traces spread over two daily indices, the traces a limit keeps, reads by trace ID, and the service, remote service and span name lists; for span-attached events, every event of the traces asked for across scroll pages, in start-time order, and each event on its own span in the trace and Zipkin query results. The BanyanDB storage ITs now cover every DAO the plugin registers except the history delete, a no-op because BanyanDB applies its own TTL, with new ITs for the span-attached event query, traces read with their events (through the DAOs and the trace and Zipkin query services), the batch DAO that routes each write to its bulk, and dropping a measure, an index-mode measure, a stream, a trace and a property, and a unit test for the TTL status query.
* Move the BanyanDB that the e2e and integration tests run on to `8efdf0ca`, which carries apache/skywalking-banyandb#1479 and apache/skywalking-banyandb#1481, and run the three BanyanDB ITs that waited for them again. Before it, an index-mode measure ordered by time came back in index order, so `findEndpoint` with a limit did not return the newest endpoints (#14218), and a pre-built TopN query applied `AGGREGATE BY` after keeping one value per entity, so the `MEAN` OAP asks for returned each entity's best value in the range instead of its mean (#14217).

#### OAP Server
* Fix the Cilium fetcher dropping or double-reading Cilium nodes. The Peer notify stream, the cluster watcher and the 10-second refresh timer rebuilt the shared node list without a lock, which could open two flow streams for one node or keep a closed node as in use. A node closed when this OAP's share of nodes moved away was reused, still closed, when the share moved back (e.g. after scaling the OAP cluster out and back in), so that node went unread while the assignment lasted. A `Receiver`-role OAP on a ZooKeeper, Consul, Nacos or etcd coordinator never finds itself in the cluster list and, when Cilium nodes and other OAPs were listed, threw on every refresh; it now skips Cilium fetching quietly, as the `Mixed` and `Aggregator` OAPs share all Cilium nodes among themselves.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import org.apache.skywalking.oap.server.core.storage.annotation.ValueColumnMetadata;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.junit.jupiter.Container;
Expand Down Expand Up @@ -149,8 +148,6 @@ public void filtersByAnAttribute() throws IOException {
}

@Test
@Disabled("BanyanDB's pre-built TopN keeps one value per entity before it applies AGGREGATE BY, so MEAN over "
+ "more than one window is not the mean: apache/skywalking#14217")
public void ranksThroughThePreBuiltTopNOfAService() throws IOException {
final List<String> expected = Arrays.asList(endpoint(1, 60), endpoint(0, 50), endpoint(2, 10));
final List<KeyValue> ofService = Collections.singletonList(new KeyValue("service_id", SERVICE_ID));
Expand All @@ -162,8 +159,6 @@ public void ranksThroughThePreBuiltTopNOfAService() throws IOException {
}

@Test
@Disabled("BanyanDB's pre-built TopN keeps one value per entity before it applies AGGREGATE BY, so MEAN over "
+ "more than one window is not the mean: apache/skywalking#14217")
public void ranksThroughThePreBuiltTopNOfALayer() throws IOException {
final TopNCondition general = top(ENDPOINT_CPM, Scope.Endpoint, 10, Order.DES);
general.setAttributes(Collections.singletonList(new AttrCondition("attr0", "GENERAL", true)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import org.apache.skywalking.oap.server.storage.plugin.banyandb.measure.BanyanDBMetadataQueryDAO;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.junit.jupiter.Container;
Expand Down Expand Up @@ -181,7 +180,6 @@ public void findsEndpointsByKeyword() throws IOException {
}

@Test
@Disabled("BanyanDB ignores timestamp ORDER BY on an index-mode measure: apache/skywalking#14218")
public void findsTheNewestEndpointsUpToTheLimit() throws IOException {
assertEquals(Arrays.asList("GET:/api/users", "POST:/api/orders"),
endpointNames(QUERY_DAO.findEndpoint(null, SERVICE_ID, 2, minutes(90, 110))));
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-v2/script/env
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SW_AGENT_CLIENT_JS_COMMIT=f08776d909eb1d9bc79c600e493030651b97e491
SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
SW_KUBERNETES_COMMIT_SHA=da0e267f877b9b8e5f7728ae4ea7dc7723a2a073
SW_ROVER_COMMIT=79292fe07f17f98f486e0c4471213e1961fb2d1d
SW_BANYANDB_COMMIT=88245d3965b6a28c329d1c9ef36aaafecec6144f
SW_BANYANDB_COMMIT=8efdf0ca7cc4879b88e4e7818fad5690eb1bbe59
SW_AI_SESSIONIZER_COMMIT=aa67971da10c82ef5b840524c9349c6a9510fbe3
SW_AGENT_PHP_COMMIT=de311c9cd084e21becade0742cd289bc0f43181d
SW_PREDICTOR_COMMIT=54a0197654a3781a6f73ce35146c712af297c994
Expand Down
Loading