From 6be4409fde51e6a234af8bbc8d693e0af460cd96 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 7 Sep 2020 18:04:42 +0200 Subject: [PATCH] Add mainApplicationClass tag to startup step This commit adds a new tag to the `"spring.boot.application.starting"` startup step. Closes gh-23162 --- .../java/org/springframework/boot/SpringApplication.java | 2 +- .../boot/SpringApplicationRunListeners.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index 84b5eaeb797..908d10ac3ba 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -312,7 +312,7 @@ public class SpringApplication { Collection exceptionReporters = new ArrayList<>(); configureHeadlessProperty(); SpringApplicationRunListeners listeners = getRunListeners(args); - listeners.starting(); + listeners.starting(this.mainApplicationClass); try { ApplicationArguments applicationArguments = new DefaultApplicationArguments(args); ConfigurableEnvironment environment = prepareEnvironment(listeners, applicationArguments); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListeners.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListeners.java index faea9acf241..4acb1a92706 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListeners.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListeners.java @@ -49,8 +49,12 @@ class SpringApplicationRunListeners { this.applicationStartup = applicationStartup; } - void starting() { - doWithListeners("spring.boot.application.starting", SpringApplicationRunListener::starting); + void starting(Class mainApplicationClass) { + doWithListeners("spring.boot.application.starting", SpringApplicationRunListener::starting, (step) -> { + if (mainApplicationClass != null) { + step.tag("mainApplicationClass", mainApplicationClass.getName()); + } + }); } void environmentPrepared(ConfigurableEnvironment environment) {