[#9744] Fix collector starter behaviors by arguments

Author: youngjin.kim2

commons-server/src/main/java/com/navercorp/pinpoint/common/server/env/AdditionalProfileListener.java

@@ -39,6 +39,11 @@ public AdditionalProfileListener(String... profiles) {
         this.profiles = List.of(profiles);
     }
 
+    public AdditionalProfileListener(List<String> profiles) {
+        Objects.requireNonNull(profiles, "profiles");
+        this.profiles = new ArrayList<>(profiles);
+    }
+
     @Override
     public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
         logger.info(String.format("onApplicationEvent(%s)", event.getClass().getSimpleName()));

commons-server/src/main/java/com/navercorp/pinpoint/common/server/starter/BasicStarter.java

@@ -17,6 +17,7 @@
 package com.navercorp.pinpoint.common.server.starter;
 
 import com.navercorp.pinpoint.common.server.banner.PinpointSpringBanner;
+import com.navercorp.pinpoint.common.server.env.AdditionalProfileListener;
 import com.navercorp.pinpoint.common.server.env.EnvironmentLoggingListener;
 import com.navercorp.pinpoint.common.server.env.ExternalEnvironmentListener;
 import com.navercorp.pinpoint.common.server.env.ProfileResolveListener;
@@ -25,25 +26,33 @@
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 public class BasicStarter {
     protected String externalPropertySourceName;
     protected String externalConfigurationKey;
+    protected List<String> externalProfiles = new ArrayList<>();
 
     private final Class<?>[] sources;
 
     public BasicStarter(Class<?>... sources) {
         this.sources = Objects.requireNonNull(sources, "sources");
     }
 
+    public void addProfiles(String ...profiles) {
+        externalProfiles.addAll(List.of(profiles));
+    }
+
     public void start(String[] args) {
         SpringApplicationBuilder builder = new SpringApplicationBuilder();
 
         builder.sources(sources);
         builder.web(WebApplicationType.SERVLET);
         builder.bannerMode(Banner.Mode.OFF);
 
+        builder.listeners(new AdditionalProfileListener(externalProfiles));
         builder.listeners(new ProfileResolveListener());
         builder.listeners(new EnvironmentLoggingListener());
         builder.listeners(new ExternalEnvironmentListener(externalPropertySourceName, externalConfigurationKey));

metric-module/collector-starter/src/main/java/com/navercorp/pinpoint/collector/starter/multi/application/MultiApplication.java

@@ -45,6 +45,8 @@ public static void main(String[] args) {
         if (types.hasType(CollectorType.BASIC)) {
             logger.info(String.format("Start %s collector", CollectorType.BASIC));
             SpringApplicationBuilder collectorAppBuilder = createAppBuilder(builder, 15400, BasicCollectorApp.class, UriStatCollectorConfig.class);
+            collectorAppBuilder.listeners(new AdditionalProfileListener("metric"));
+            collectorAppBuilder.listeners(new AdditionalProfileListener("uri"));
             collectorAppBuilder.build().run(args);
         }
 

metric-module/web-starter/src/main/java/com/navercorp/pinpoint/web/starter/multi/MetricAndWebApp.java

@@ -19,13 +19,13 @@
 import com.navercorp.pinpoint.common.server.util.ServerBootLogger;
 import com.navercorp.pinpoint.metric.web.MetricWebApp;
 import com.navercorp.pinpoint.uristat.web.UriStatWebConfig;
+import com.navercorp.pinpoint.web.AuthorizationConfig;
 import com.navercorp.pinpoint.web.PinpointBasicLoginConfig;
 import com.navercorp.pinpoint.web.WebApp;
 import com.navercorp.pinpoint.web.WebAppPropertySources;
 import com.navercorp.pinpoint.web.WebMvcConfig;
 import com.navercorp.pinpoint.web.WebServerConfig;
 import com.navercorp.pinpoint.web.WebStarter;
-import com.navercorp.pinpoint.web.AuthorizationConfig;
 import com.navercorp.pinpoint.web.cache.CacheConfiguration;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -48,6 +48,7 @@ public class MetricAndWebApp {
     public static void main(String[] args) {
         try {
             WebStarter starter = new WebStarter(MetricAndWebApp.class, PinpointBasicLoginConfig.class, AuthorizationConfig.class, MetricWebApp.class, UriStatWebConfig.class);
+            starter.addProfiles("uri", "metric");
             starter.start(args);
         } catch (Exception exception) {
             logger.error("[WebApp] could not launch app.", exception);

uristat/uristat-collector/src/main/java/com/navercorp/pinpoint/uristat/collector/UriStatCollectorConfig.java

@@ -7,7 +7,7 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.context.annotation.PropertySource;
 
-@Profile("metric")
+@Profile("uri")
 @Configuration
 @ImportResource({"classpath*:**/applicationContext-collector-metric-namespace.xml", "classpath:applicationContext-collector-uristat-pinot-kafka.xml"})
 @ComponentScan({"com.navercorp.pinpoint.uristat.collector.service", "com.navercorp.pinpoint.uristat.collector.dao"})

uristat/uristat-collector/src/main/java/com/navercorp/pinpoint/uristat/collector/service/PinotAgentUriStatService.java

@@ -33,7 +33,7 @@
 import java.util.Objects;
 
 @Service
-@Profile("metric")
+@Profile("uri")
 public class PinotAgentUriStatService implements AgentUriStatService {
     private final Logger logger = LogManager.getLogger(this.getClass());
 

uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/UriStatWebConfig.java

@@ -8,6 +8,6 @@
 @Configuration
 @ImportResource({"classpath:applicationContext-web-uristat.xml"})
 @Import(UriStatWebPropertySources.class)
-@Profile("metric")
+@Profile("uri")
 public class UriStatWebConfig {
 }