[#12868] Use property pinpoint.modules.*.systemmetric.enabled instead of profile metric

Author: ga-ram

collector-starter/src/main/java/com/navercorp/pinpoint/collector/starter/multi/application/PinpointCollectorStarter.java

@@ -9,7 +9,6 @@
 import com.navercorp.pinpoint.collector.starter.multi.application.type.ShellCollectorTypeParser;
 import com.navercorp.pinpoint.collector.starter.multi.application.type.SimpleCollectorTypeParser;
 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;
@@ -81,7 +80,6 @@ public static void main(String[] args) {
                     AgentStatisticsCollectorConfig.class,
                     InspectorCollectorConfig.class
             );
-            collectorAppBuilder.listeners(new AdditionalProfileListener("metric"));
             collectorAppBuilder.build().run(args);
         }
 
@@ -90,7 +88,6 @@ public static void main(String[] args) {
             SpringApplicationBuilder metricAppBuilder = createAppBuilder(builder, 9995,
                     MetricCollectorApp.class,
                     OtlpMetricCollectorConfig.class);
-            metricAppBuilder.listeners(new AdditionalProfileListener("metric"));
             metricAppBuilder.build().run(args);
         }
 

collector-starter/src/main/resources/application.yml

@@ -23,5 +23,7 @@ pinpoint:
         enabled: true
       uristat:
         enabled: true
+      systemmetric:
+        enabled: true
     realtime:
       enabled: true

metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/collector/MetricCollectorApp.java

@@ -1,45 +1,34 @@
+/*
+ * Copyright 2025 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package com.navercorp.pinpoint.metric.collector;
 
-import com.navercorp.pinpoint.metric.collector.cache.MetricCacheConfiguration;
-import com.navercorp.pinpoint.metric.collector.config.MetricCollectorProperties;
-import com.navercorp.pinpoint.metric.collector.config.MetricKafkaConfiguration;
-import com.navercorp.pinpoint.metric.common.config.MetricCollectorPinotDaoConfiguration;
-import com.navercorp.pinpoint.pinot.config.PinotConfiguration;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration;
-import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Profile;
 
 @SpringBootConfiguration
-@EnableAutoConfiguration(exclude = {
-        DataSourceAutoConfiguration.class,
-        DataSourceTransactionManagerAutoConfiguration.class,
-        TransactionAutoConfiguration.class,
-        KafkaAutoConfiguration.class
-})
-@ComponentScan(basePackages = {
-        "com.navercorp.pinpoint.metric.collector.dao",
-        "com.navercorp.pinpoint.metric.collector.service",
-        "com.navercorp.pinpoint.metric.common.model",
-        "com.navercorp.pinpoint.metric.common",
-        "com.navercorp.pinpoint.common.server.util",
-        "com.navercorp.pinpoint.metric.collector.controller"
-})
 @Import({
-        MetricAppPropertySources.class,
-        MetricCacheConfiguration.class,
-        PinotConfiguration.class,
-        MetricCollectorPinotDaoConfiguration.class,
-        MetricKafkaConfiguration.class,
-        MetricCollectorProperties.class,
         MetricCollectorConfig.class
 })
-@Profile("metric")
+@EnableAutoConfiguration(exclude = {
+        DataSourceAutoConfiguration.class
+})
 public class MetricCollectorApp {
 
 }

metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/collector/MetricCollectorConfig.java

@@ -1,14 +1,38 @@
 package com.navercorp.pinpoint.metric.collector;
 
 import com.navercorp.pinpoint.common.server.metric.dao.TopicNameManager;
+import com.navercorp.pinpoint.metric.collector.cache.MetricCacheConfiguration;
 import com.navercorp.pinpoint.metric.collector.config.MetricCollectorProperties;
+import com.navercorp.pinpoint.metric.collector.config.MetricKafkaConfiguration;
+import com.navercorp.pinpoint.metric.common.config.MetricCollectorPinotDaoConfiguration;
+import com.navercorp.pinpoint.pinot.config.PinotConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Configuration
+@ComponentScan(basePackages = {
+        "com.navercorp.pinpoint.metric.collector.dao",
+        "com.navercorp.pinpoint.metric.collector.service",
+        "com.navercorp.pinpoint.metric.common.model",
+        "com.navercorp.pinpoint.metric.common",
+        "com.navercorp.pinpoint.common.server.util",
+        "com.navercorp.pinpoint.metric.collector.controller"
+})
+@Import({
+        MetricAppPropertySources.class,
+        MetricCacheConfiguration.class,
+        PinotConfiguration.class,
+        MetricCollectorPinotDaoConfiguration.class,
+        MetricKafkaConfiguration.class,
+        MetricCollectorProperties.class
+})
+@ConditionalOnProperty(value = "pinpoint.modules.collector.systemmetric.enabled", havingValue = "true")
 public class MetricCollectorConfig {
 
     @Bean("systemMetricTopicNameManagers")

metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/MetricWebApp.java

@@ -16,16 +16,33 @@
 
 package com.navercorp.pinpoint.metric.web;
 
+import com.navercorp.pinpoint.common.server.config.YamlConfiguration;
 import com.navercorp.pinpoint.common.server.metric.dao.TableNameManager;
+import com.navercorp.pinpoint.metric.web.config.MetricWebPinotDaoConfiguration;
 import com.navercorp.pinpoint.metric.web.config.SystemMetricProperties;
 import com.navercorp.pinpoint.metric.web.frontend.export.SystemMetricPropertiesExporter;
+import com.navercorp.pinpoint.pinot.config.PinotConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
 /**
  * @author minwoo-jung
  */
 @Configuration
+@ComponentScan(basePackages = {
+        "com.navercorp.pinpoint.metric.web",
+        "com.navercorp.pinpoint.common.server.util"
+})
+@Import({
+        WebMetricPropertySources.class,
+        MetricWebPinotDaoConfiguration.class,
+        PinotConfiguration.class,
+        YamlConfiguration.class
+})
+@ConditionalOnProperty(value = "pinpoint.modules.web.systemmetric.enabled", havingValue = "true")
 public class MetricWebConfig {
 
     @Bean

metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/MetricWebConfig.java

@@ -1,5 +1,3 @@
-config.show.systemMetric=true
-
 pinot.systemmetric.double.table.mode=single
 pinot.systemmetric.double.single.table.name=systemMetricDouble
 pinot.systemmetric.double.table.prefix=systemMetricDouble

metric-module/metric/src/main/resources/pinot-web/profiles/local/pinpoint-web-metric.properties

@@ -1,5 +1,3 @@
-config.show.systemMetric=true
-
 pinot.systemmetric.double.table.mode=single
 pinot.systemmetric.double.single.table.name=systemMetricDouble
 pinot.systemmetric.double.table.prefix=systemMetricDouble

metric-module/metric/src/main/resources/pinot-web/profiles/release/pinpoint-web-metric.properties

@@ -22,7 +22,7 @@
 import com.navercorp.pinpoint.inspector.web.InspectorWebConfig;
 import com.navercorp.pinpoint.log.web.LogWebModule;
 import com.navercorp.pinpoint.login.basic.PinpointBasicLoginConfig;
-import com.navercorp.pinpoint.metric.web.MetricWebApp;
+import com.navercorp.pinpoint.metric.web.MetricWebConfig;
 import com.navercorp.pinpoint.otlp.web.OtlpMetricWebConfig;
 import com.navercorp.pinpoint.redis.RedisPropertySources;
 import com.navercorp.pinpoint.uristat.web.UriStatWebConfig;
@@ -65,14 +65,13 @@ public static void main(String[] args) {
                     PinpointWebStarter.class,
                     PinpointBasicLoginConfig.class,
                     AuthorizationConfig.class,
-                    MetricWebApp.class,
+                    MetricWebConfig.class,
                     UriStatWebConfig.class,
                     InspectorWebConfig.class,
                     LogWebModule.class,
                     ExceptionTraceWebConfig.class,
                     OtlpMetricWebConfig.class
             );
-            starter.addProfiles("metric");
             starter.start(args);
         } catch (Exception exception) {
             logger.error("[WebApp] could not launch app.", exception);

web-starter/src/main/java/com/navercorp/pinpoint/web/starter/multi/PinpointWebStarter.java

@@ -63,7 +63,7 @@ public class ConfigProperties {
     @Value("${config.show.stackTraceOnError:true}")
     private boolean showStackTraceOnError;
 
-    @Value("${config.show.systemMetric:false}")
+    @Value("${pinpoint.modules.web.systemmetric.enabled:false}")
     private boolean showSystemMetric;
 
     @Value("${pinpoint.modules.web.uristat.enabled:false}")