[pinpoint-apm#10232] Separated redis property sources

smilu97 · Aug 22, 2023 · 9a9560e · 9a9560e
1 parent 370005a
commit 9a9560e
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 6 deletions.
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/CollectorApp.java b/collector/src/main/java/com/navercorp/pinpoint/collector/CollectorApp.java
@@ -1,6 +1,7 @@
 package com.navercorp.pinpoint.collector;
 
 import com.navercorp.pinpoint.common.server.util.ServerBootLogger;
+import com.navercorp.pinpoint.redis.RedisPropertySources;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
@@ -22,6 +23,7 @@
 })
 @Import({
         PinpointCollectorModule.class,
+        RedisPropertySources.class,
 })
 public class CollectorApp {
     private static final ServerBootLogger logger = ServerBootLogger.getLogger(CollectorApp.class);

diff --git a/...in/java/com/navercorp/pinpoint/collector/starter/multi/application/BasicCollectorApp.java b/...in/java/com/navercorp/pinpoint/collector/starter/multi/application/BasicCollectorApp.java
@@ -1,6 +1,7 @@
 package com.navercorp.pinpoint.collector.starter.multi.application;
 
 import com.navercorp.pinpoint.collector.PinpointCollectorModule;
+import com.navercorp.pinpoint.redis.RedisPropertySources;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
@@ -22,6 +23,9 @@
         RedisReactiveAutoConfiguration.class,
         DataSourceTransactionManagerAutoConfiguration.class
 })
-@Import({PinpointCollectorModule.class})
+@Import({
+        PinpointCollectorModule.class,
+        RedisPropertySources.class,
+})
 public class BasicCollectorApp {
 }
diff --git a/...e/web-starter/src/main/java/com/navercorp/pinpoint/web/starter/multi/MetricAndWebApp.java b/...e/web-starter/src/main/java/com/navercorp/pinpoint/web/starter/multi/MetricAndWebApp.java
@@ -21,6 +21,7 @@
 import com.navercorp.pinpoint.inspector.web.InspectorWebApp;
 import com.navercorp.pinpoint.login.basic.PinpointBasicLoginConfig;
 import com.navercorp.pinpoint.metric.web.MetricWebApp;
+import com.navercorp.pinpoint.redis.RedisPropertySources;
 import com.navercorp.pinpoint.uristat.web.UriStatWebConfig;
 import com.navercorp.pinpoint.web.AuthorizationConfig;
 import com.navercorp.pinpoint.web.PinpointWebModule;
@@ -50,6 +51,7 @@
 @Import({
         PinpointWebModule.class,
         MainDataSourcePropertySource.class,
+        RedisPropertySources.class,
 })
 public class MetricAndWebApp {
     private static final ServerBootLogger logger = ServerBootLogger.getLogger(WebApp.class);

diff --git a/redis/src/main/java/com/navercorp/pinpoint/redis/RedisBasicConfig.java b/redis/src/main/java/com/navercorp/pinpoint/redis/RedisBasicConfig.java
@@ -22,7 +22,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
 import org.springframework.data.redis.connection.RedisClusterConfiguration;
 import org.springframework.data.redis.connection.RedisConfiguration;
@@ -44,7 +43,6 @@
  * @author youngjin.kim2
  */
 @Configuration(proxyBeanMethods = false)
-@Import({ RedisPropertySources.class })
 public class RedisBasicConfig {
 
     @Value("${spring.data.redis.username:default}")
@@ -59,7 +57,7 @@ public class RedisBasicConfig {
     @Value("${spring.data.redis.port:6379}")
     int port;
 
-    @Value("${spring.data.redis.cluster.nodes}")
+    @Value("${spring.data.redis.cluster.nodes:#{''}}")
     List<String> clusterNodes;
     @Value("${spring.data.redis.lettuce.client.io-thread-pool-size:8}")
     int lettuceIOThreadPoolSize;

diff --git a/redis/src/main/java/com/navercorp/pinpoint/redis/RedisPropertySources.java b/redis/src/main/java/com/navercorp/pinpoint/redis/RedisPropertySources.java
@@ -26,7 +26,7 @@
 })
 public class RedisPropertySources {
 
-    public static final String REDIS_ROOT = "classpath:redis-root.properties";
-    public static final String REDIS_PROFILE = "classpath:profiles/${pinpoint.profiles.active:local}/redis.properties";
+    public static final String REDIS_ROOT = "classpath:redis/redis-root.properties";
+    public static final String REDIS_PROFILE = "classpath:redis/profiles/${pinpoint.profiles.active:local}/redis.properties";
 
 }
diff --git a/...resources/profiles/local/redis.properties → ...ces/redis/profiles/local/redis.properties b/...resources/profiles/local/redis.properties → ...ces/redis/profiles/local/redis.properties
diff --git a/...sources/profiles/release/redis.properties → ...s/redis/profiles/release/redis.properties b/...sources/profiles/release/redis.properties → ...s/redis/profiles/release/redis.properties
diff --git a/.../src/main/resources/redis-root.properties → ...ain/resources/redis/redis-root.properties b/.../src/main/resources/redis-root.properties → ...ain/resources/redis/redis-root.properties
diff --git a/web/src/main/java/com/navercorp/pinpoint/web/WebApp.java b/web/src/main/java/com/navercorp/pinpoint/web/WebApp.java
@@ -19,6 +19,7 @@
 import com.navercorp.pinpoint.common.server.util.ServerBootLogger;
 import com.navercorp.pinpoint.datasource.MainDataSourcePropertySource;
 import com.navercorp.pinpoint.login.basic.PinpointBasicLoginConfig;
+import com.navercorp.pinpoint.redis.RedisPropertySources;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
@@ -43,6 +44,7 @@
 @Import({
         PinpointWebModule.class,
         MainDataSourcePropertySource.class,
+        RedisPropertySources.class,
 })
 public class WebApp  {
     private static final ServerBootLogger logger = ServerBootLogger.getLogger(WebApp.class);