Skip to content

Commit ec12855

Browse files
committed
fix: share OAP proxy servies for different endpoins and use health checked endpoints group
1 parent 3934b1d commit ec12855

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,16 @@ public static void main(String[] args) throws Exception {
6262
.of(ApplicationStartUp.class.getClassLoader(), "/zipkin-lens/index.html")
6363
.asService();
6464

65-
final ZipkinProxyService zipkin = new ZipkinProxyService(configuration.zipkinServices());
65+
final var zipkin = new ZipkinProxyService(configuration.zipkinServices());
66+
final var oap = new OapProxyService(oapServices);
6667

6768
Server
6869
.builder()
6970
.port(port, SessionProtocol.HTTP)
70-
.service("/graphql", new OapProxyService(oapServices))
71-
.service("/debugging/config/dump", new OapProxyService(oapServices))
72-
.service("/status/config/ttl", new OapProxyService(oapServices))
73-
.service("/status/cluster/nodes", new OapProxyService(oapServices))
71+
.service("/graphql", oap)
72+
.service("/debugging/config/dump", oap)
73+
.service("/status/config/ttl", oap)
74+
.service("/status/cluster/nodes", oap)
7475
.service("/internal/l7check", HealthCheckService.of())
7576
.service("/zipkin/config.json", zipkin)
7677
.serviceUnder("/zipkin/api", zipkin)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private static WebClient newLoadBalancingClient(EndpointGroup oapGroup) {
6767
healthCheckedGroup.whenReady().get();
6868

6969
return WebClient
70-
.builder(SessionProtocol.HTTP, oapGroup)
70+
.builder(SessionProtocol.HTTP, healthCheckedGroup)
7171
.decorator(LoggingClient.newDecorator())
7272
.build();
7373
}

docs/en/changes/changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
* fix: optimize appearing the wrong prompt by pop-up for the HTTP environments in copy function.
9191
* refactor the configuration view and implement the optional config for displaying timestamp in Log widget.
9292
* test: implement unit tests for hooks and refactor some types.
93+
* fix: share OAP proxy servies for different endpoins and use health checked endpoints group.
9394

9495
#### Documentation
9596

0 commit comments

Comments
 (0)