Skip to content

fix: share OAP proxy servies for different endpoins and use health checked endpoints group #13452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-sheng merged 3 commits into from
Sep 1, 2025
Merged

fix: share OAP proxy servies for different endpoins and use health checked endpoints group #13452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46465e6
fix: share OAP proxy servies for different endpoins and use health ch…
kezhenxu94 Sep 1, 2025
31aab1f
test: enable healthchecker in tests
kezhenxu94 Sep 1, 2025
7b9285c
enable hc
kezhenxu94 Sep 1, 2025
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
11 changes: 6 additions & 5 deletions apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/ApplicationStartUp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,16 @@ public static void main(String[] args) throws Exception {
.of(ApplicationStartUp.class.getClassLoader(), "/zipkin-lens/index.html")
.asService();

final ZipkinProxyService zipkin = new ZipkinProxyService(configuration.zipkinServices());
final var zipkin = new ZipkinProxyService(configuration.zipkinServices());
final var oap = new OapProxyService(oapServices);

Server
.builder()
.port(port, SessionProtocol.HTTP)
.service("/graphql", new OapProxyService(oapServices))
.service("/debugging/config/dump", new OapProxyService(oapServices))
.service("/status/config/ttl", new OapProxyService(oapServices))
.service("/status/cluster/nodes", new OapProxyService(oapServices))
.service("/graphql", oap)
.service("/debugging/config/dump", oap)
.service("/status/config/ttl", oap)
.service("/status/cluster/nodes", oap)
.service("/internal/l7check", HealthCheckService.of())
.service("/zipkin/config.json", zipkin)
.serviceUnder("/zipkin/api", zipkin)
Expand Down
2 changes: 1 addition & 1 deletion apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/OapProxyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private static WebClient newLoadBalancingClient(EndpointGroup oapGroup) {
healthCheckedGroup.whenReady().get();

return WebClient
.builder(SessionProtocol.HTTP, oapGroup)
.builder(SessionProtocol.HTTP, healthCheckedGroup)
.decorator(LoggingClient.newDecorator())
.build();
}
Expand Down
1 change: 1 addition & 0 deletions docs/en/changes/changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
* fix: optimize appearing the wrong prompt by pop-up for the HTTP environments in copy function.
* refactor the configuration view and implement the optional config for displaying timestamp in Log widget.
* test: implement unit tests for hooks and refactor some types.
* fix: share OAP proxy servies for different endpoins and use health checked endpoints group.

#### Documentation

Expand Down
1 change: 1 addition & 0 deletions test/e2e-v2/cases/cilium/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ setup:
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=elasticsearch \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/cilium/values.yaml
wait:
- namespace: kube-system
Expand Down
1 change: 1 addition & 0 deletions test/e2e-v2/cases/istio/als/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ setup:
--set oap.env.SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS=$ALS_ANALYZER \
--set oap.env.SW_ENVOY_METRIC_ALS_TCP_ANALYSIS=$ALS_ANALYZER \
--set oap.env.K8S_SERVICE_NAME_RULE='e2e::${service.metadata.name}' \
--set oap.env.SW_HEALTH_CHECKER=default \
Copy link
Member Author

@kezhenxu94 kezhenxu94 Sep 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should enable the healthchecker by default since the web app depends on it, what do you think? @wu-sheng

--set oap.envoy.als.enabled=true \
--set oap.replicas=1 \
--set ui.image.repository=skywalking/ui \
Expand Down
1 change: 1 addition & 0 deletions test/e2e-v2/cases/istio/ambient-als/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ setup:
--set oap.env.SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS=$ALS_ANALYZER \
--set oap.env.SW_ENVOY_METRIC_ALS_TCP_ANALYSIS=$ALS_ANALYZER \
--set oap.env.K8S_SERVICE_NAME_RULE='e2e::${service.metadata.name}' \
--set oap.env.SW_HEALTH_CHECKER=default \
--set oap.envoy.als.enabled=true \
--set oap.replicas=1 \
--set ui.image.repository=skywalking/ui \
Expand Down
1 change: 1 addition & 0 deletions test/e2e-v2/cases/istio/metrics/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ setup:
--set oap.env.SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS=$ALS_ANALYZER \
--set oap.env.SW_ENVOY_METRIC_ALS_TCP_ANALYSIS=$ALS_ANALYZER \
--set oap.env.K8S_SERVICE_NAME_RULE='e2e::${service.metadata.name}' \
--set oap.env.SW_HEALTH_CHECKER=default \
--set oap.envoy.als.enabled=true \
--set oap.replicas=1 \
--set ui.image.repository=skywalking/ui \
Expand Down
1 change: 1 addition & 0 deletions test/e2e-v2/cases/profiling/ebpf/access_log/banyandb/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ setup:
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=banyandb \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand Down
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/access_log/es/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ setup:
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=elasticsearch \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand Down Expand Up @@ -82,4 +83,4 @@ verify:
interval: 10s
cases:
- includes:
- ../accesslog-cases.yaml
- ../accesslog-cases.yaml
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/access_log/es/es-sharding/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ setup:
--set oap.image.repository=skywalking/oap \
--set oap.storageType=elasticsearch \
--set oap.env.SW_STORAGE_ES_LOGIC_SHARDING=true \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand Down Expand Up @@ -83,4 +84,4 @@ verify:
interval: 10s
cases:
- includes:
- ../../accesslog-cases.yaml
- ../../accesslog-cases.yaml
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/continuous/banyandb/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ setup:
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=banyandb \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand All @@ -82,4 +83,4 @@ verify:
interval: 10s
cases:
- includes:
- ../profiling-cases.yaml
- ../profiling-cases.yaml
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/continuous/es/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ setup:
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=elasticsearch \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand All @@ -80,4 +81,4 @@ verify:
interval: 10s
cases:
- includes:
- ../profiling-cases.yaml
- ../profiling-cases.yaml
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/continuous/es/es-sharding/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ setup:
--set oap.image.repository=skywalking/oap \
--set oap.storageType=elasticsearch \
--set oap.env.SW_STORAGE_ES_LOGIC_SHARDING=true \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand All @@ -81,4 +82,4 @@ verify:
interval: 10s
cases:
- includes:
- ../../profiling-cases.yaml
- ../../profiling-cases.yaml
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/continuous/postgres/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ setup:
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=banyandb \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand All @@ -82,4 +83,4 @@ verify:
interval: 10s
cases:
- includes:
- ../profiling-cases.yaml
- ../profiling-cases.yaml
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/network/banyandb/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ setup:
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=banyandb \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/network/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand Down Expand Up @@ -92,4 +93,4 @@ verify:
interval: 10s
cases:
- includes:
- ../network-cases.yaml
- ../network-cases.yaml
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/network/es/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ setup:
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=elasticsearch \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/network/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand Down Expand Up @@ -91,4 +92,4 @@ verify:
interval: 10s
cases:
- includes:
- ../network-cases.yaml
- ../network-cases.yaml
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/network/es/es-sharding/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ setup:
--set oap.image.repository=skywalking/oap \
--set oap.storageType=elasticsearch \
--set oap.env.SW_STORAGE_ES_LOGIC_SHARDING=true \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/network/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand Down Expand Up @@ -91,4 +92,4 @@ verify:
interval: 10s
cases:
- includes:
- ../../network-cases.yaml
- ../../network-cases.yaml
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/offcpu/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ setup:
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=banyandb \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand Down Expand Up @@ -113,4 +114,4 @@ verify:
start=$(swctl --base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql --display yaml profiling ebpf schedules --task-id=$taskid | yq e '.[0].starttime' -)
end=$(swctl --base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql --display yaml profiling ebpf schedules --task-id=$taskid | yq e '.[0].endtime' -)
swctl --base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql --display yaml profiling ebpf analysis --schedule-id=$scheduleid --time-ranges=$start-$end --aggregate=DURATION
expected: expected/profiling-analysis.yml
expected: expected/profiling-analysis.yml
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/oncpu/banyandb/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ setup:
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=banyandb \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand All @@ -82,4 +83,4 @@ verify:
interval: 10s
cases:
- includes:
- ../profiling-cases.yaml
- ../profiling-cases.yaml
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/oncpu/es/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ setup:
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=elasticsearch \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand All @@ -80,4 +81,4 @@ verify:
interval: 10s
cases:
- includes:
- ../profiling-cases.yaml
- ../profiling-cases.yaml
3 changes: 2 additions & 1 deletion test/e2e-v2/cases/profiling/ebpf/oncpu/es/es-sharding/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ setup:
--set oap.image.repository=skywalking/oap \
--set oap.storageType=elasticsearch \
--set oap.env.SW_STORAGE_ES_LOGIC_SHARDING=true \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/profiling/ebpf/kubernetes-values.yaml
wait:
- namespace: istio-system
Expand All @@ -81,4 +82,4 @@ verify:
interval: 10s
cases:
- includes:
- ../../profiling-cases.yaml
- ../../profiling-cases.yaml
1 change: 1 addition & 0 deletions test/e2e-v2/cases/rover/process/istio/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ setup:
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=elasticsearch \
--set oap.env.SW_HEALTH_CHECKER=default \
-f test/e2e-v2/cases/rover/process/istio/values.yaml
wait:
- namespace: istio-system
Expand Down
1 change: 1 addition & 0 deletions test/e2e-v2/script/docker-compose/base-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ services:
- ./../prepare/setup-oap/download-mysql.sh:/download-mysql.sh
- ./../prepare/setup-oap/log4j2.xml:/skywalking/config/log4j2.xml
environment:
SW_HEALTH_CHECKER: default
SW_CLUSTER_ZK_HOST_PORT: zk:2181
SW_STORAGE_ES_CLUSTER_NODES: es:9200
SW_JDBC_URL: jdbc:mysql://mysql:3306/swtest?allowMultiQueries=true
Expand Down
Loading