wu-sheng commented on code in PR #12029:
URL: https://github.com/apache/skywalking/pull/12029#discussion_r1527408846
##########
apm-webapp/src/main/java/org/apache/skywalking/oap/server/webapp/ApplicationStartUp.java:
##########
@@ -16,68 +16,77 @@
*
*/
-package org.apache.skywalking.oap.server.webapp;
+ package org.apache.skywalking.oap.server.webapp;
-import static org.yaml.snakeyaml.env.EnvScalarConstructor.ENV_FORMAT;
-import static org.yaml.snakeyaml.env.EnvScalarConstructor.ENV_TAG;
-import java.util.Collections;
-import org.yaml.snakeyaml.LoaderOptions;
-import org.yaml.snakeyaml.TypeDescription;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.env.EnvScalarConstructor;
-import com.linecorp.armeria.common.SessionProtocol;
-import com.linecorp.armeria.server.HttpService;
-import com.linecorp.armeria.server.Server;
-import com.linecorp.armeria.server.file.FileService;
-import com.linecorp.armeria.server.file.HttpFile;
-import com.linecorp.armeria.server.healthcheck.HealthCheckService;
-
-public class ApplicationStartUp {
- public static void main(String[] args) throws Exception {
- final Yaml yaml = new Yaml(
- new EnvScalarConstructor(
- new TypeDescription(Configuration.class),
- Collections.emptyList(),
- new LoaderOptions()));
- yaml.addImplicitResolver(ENV_TAG, ENV_FORMAT, "$");
-
- final Configuration configuration = yaml.loadAs(
- ApplicationStartUp.class.getResourceAsStream("/application.yml"),
- Configuration.class);
-
- final int port = configuration.port();
- final String[] oapServices = configuration.oapServices();
-
- final HttpService indexPage =
- HttpFile
- .of(ApplicationStartUp.class.getClassLoader(),
"/public/index.html")
- .asService();
- final HttpService zipkinIndexPage =
- HttpFile
- .of(ApplicationStartUp.class.getClassLoader(),
"/zipkin-lens/index.html")
- .asService();
-
- final ZipkinProxyService zipkin = new
ZipkinProxyService(configuration.zipkinServices());
-
- Server
- .builder()
- .port(port, SessionProtocol.HTTP)
- .service("/graphql", new OapProxyService(oapServices))
- .service("/internal/l7check", HealthCheckService.of())
- .service("/zipkin/config.json", zipkin)
- .serviceUnder("/zipkin/api", zipkin)
- .serviceUnder("/zipkin",
- FileService.of(
- ApplicationStartUp.class.getClassLoader(),
- "/zipkin-lens")
- .orElse(zipkinIndexPage))
- .serviceUnder("/",
- FileService.of(
- ApplicationStartUp.class.getClassLoader(),
- "/public")
- .orElse(indexPage))
- .build()
- .start()
- .join();
- }
-}
+ import static org.yaml.snakeyaml.env.EnvScalarConstructor.ENV_FORMAT;
+ import static org.yaml.snakeyaml.env.EnvScalarConstructor.ENV_TAG;
+ import java.util.Collections;
+ import lombok.extern.slf4j.Slf4j;
+ import org.slf4j.Marker;
+ import org.slf4j.MarkerFactory;
+ import org.yaml.snakeyaml.LoaderOptions;
+ import org.yaml.snakeyaml.TypeDescription;
+ import org.yaml.snakeyaml.Yaml;
+ import org.yaml.snakeyaml.env.EnvScalarConstructor;
+ import com.linecorp.armeria.common.SessionProtocol;
+ import com.linecorp.armeria.server.HttpService;
+ import com.linecorp.armeria.server.Server;
+ import com.linecorp.armeria.server.file.FileService;
+ import com.linecorp.armeria.server.file.HttpFile;
+ import com.linecorp.armeria.server.healthcheck.HealthCheckService;
+
+ @Slf4j
+ public class ApplicationStartUp {
+ public static void main(String[] args) throws Exception {
+ final Marker startedMarker = MarkerFactory.getMarker("SkyWalking
booster UI is running");
+ final Yaml yaml = new Yaml(
+ new EnvScalarConstructor(
Review Comment:
Could you revert all irrelative changes in this file? It seems you reformat
the file?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
