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

Author: kezhenxu94

apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/ApplicationStartUp.java

@@ -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)

apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/OapProxyService.java

@@ -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();
     }

docs/en/changes/changes.md

@@ -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
 

test/e2e-v2/cases/cilium/e2e.yaml

@@ -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

test/e2e-v2/cases/istio/als/e2e.yaml

@@ -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 \
           --set oap.envoy.als.enabled=true \
           --set oap.replicas=1 \
           --set ui.image.repository=skywalking/ui \

test/e2e-v2/cases/istio/ambient-als/e2e.yaml

@@ -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 \

test/e2e-v2/cases/istio/metrics/e2e.yaml

@@ -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 \

test/e2e-v2/cases/profiling/ebpf/access_log/banyandb/e2e.yaml

@@ -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

test/e2e-v2/cases/profiling/ebpf/access_log/es/e2e.yaml

@@ -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
@@ -82,4 +83,4 @@ verify:
     interval: 10s
   cases:
     - includes:
-        - ../accesslog-cases.yaml
+        - ../accesslog-cases.yaml

test/e2e-v2/cases/profiling/ebpf/access_log/es/es-sharding/e2e.yaml

@@ -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
@@ -83,4 +84,4 @@ verify:
     interval: 10s
   cases:
     - includes:
-        - ../../accesslog-cases.yaml
+        - ../../accesslog-cases.yaml