[pinpoint-apm#12064] Extract Uid domain

emeroad · emeroad · commit db69c87a1e62 · 2025-03-07T17:01:52.000+09:00
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/PinpointCollectorModule.java b/collector/src/main/java/com/navercorp/pinpoint/collector/PinpointCollectorModule.java
@@ -8,6 +8,7 @@
 import com.navercorp.pinpoint.collector.grpc.CollectorGrpcConfiguration;
 import com.navercorp.pinpoint.collector.grpc.ssl.GrpcSslModule;
 import com.navercorp.pinpoint.collector.manage.CollectorAdminConfiguration;
+import com.navercorp.pinpoint.collector.uid.UidModule;
 import com.navercorp.pinpoint.common.server.CommonsServerConfiguration;
 import com.navercorp.pinpoint.common.server.config.TypeLoaderConfiguration;
 import com.navercorp.pinpoint.realtime.collector.RealtimeCollectorModule;
@@ -37,6 +38,8 @@
 
         RealtimeCollectorModule.class,
 
+        UidModule.class,
+
         CollectorPinpointIdConfiguration.class,
 })
 @ComponentScan(basePackages = {
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/uid/UidModule.java b/collector/src/main/java/com/navercorp/pinpoint/collector/uid/UidModule.java
@@ -0,0 +1,20 @@
+package com.navercorp.pinpoint.collector.uid;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan({
+        "com.navercorp.pinpoint.collector.uid",
+        "com.navercorp.pinpoint.common.server.uid"
+})
+public class UidModule {
+
+    private static final Logger logger = LogManager.getLogger(UidModule.class);
+
+    public UidModule() {
+        logger.info("Install UidModule");
+    }
+}
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/uid/dao/ApplicationUidDao.java b/collector/src/main/java/com/navercorp/pinpoint/collector/uid/dao/ApplicationUidDao.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.collector.dao;
+package com.navercorp.pinpoint.collector.uid.dao;
 
 import com.navercorp.pinpoint.common.server.uid.ApplicationUid;
 import com.navercorp.pinpoint.common.server.uid.ServiceUid;
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/uid/dao/ServiceUidDao.java b/collector/src/main/java/com/navercorp/pinpoint/collector/uid/dao/ServiceUidDao.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.collector.dao;
+package com.navercorp.pinpoint.collector.uid.dao;
 
 import com.navercorp.pinpoint.common.server.uid.ServiceUid;
 
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/uid/dao/hbase/HbaseApplicationUidDao.java b/collector/src/main/java/com/navercorp/pinpoint/collector/uid/dao/hbase/HbaseApplicationUidDao.java
@@ -1,7 +1,7 @@
-package com.navercorp.pinpoint.collector.dao.hbase;
+package com.navercorp.pinpoint.collector.uid.dao.hbase;
 
 import com.navercorp.pinpoint.collector.config.CollectorApplicationIdCacheConfig;
-import com.navercorp.pinpoint.collector.dao.ApplicationUidDao;
+import com.navercorp.pinpoint.collector.uid.dao.ApplicationUidDao;
 import com.navercorp.pinpoint.common.hbase.HbaseColumnFamily;
 import com.navercorp.pinpoint.common.hbase.HbaseOperations;
 import com.navercorp.pinpoint.common.hbase.RowMapper;
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/uid/dao/hbase/HbaseServiceUidDao.java b/collector/src/main/java/com/navercorp/pinpoint/collector/uid/dao/hbase/HbaseServiceUidDao.java
@@ -1,6 +1,6 @@
-package com.navercorp.pinpoint.collector.dao.hbase;
+package com.navercorp.pinpoint.collector.uid.dao.hbase;
 
-import com.navercorp.pinpoint.collector.dao.ServiceUidDao;
+import com.navercorp.pinpoint.collector.uid.dao.ServiceUidDao;
 import com.navercorp.pinpoint.common.hbase.HbaseColumnFamily;
 import com.navercorp.pinpoint.common.hbase.HbaseOperations;
 import com.navercorp.pinpoint.common.hbase.RowMapper;
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/uid/service/ApplicationUidService.java b/collector/src/main/java/com/navercorp/pinpoint/collector/uid/service/ApplicationUidService.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.uid.service;
 
 import com.navercorp.pinpoint.common.server.uid.ApplicationUid;
 import com.navercorp.pinpoint.common.server.uid.ServiceUid;
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/uid/service/ApplicationUidServiceImpl.java b/collector/src/main/java/com/navercorp/pinpoint/collector/uid/service/ApplicationUidServiceImpl.java
@@ -1,7 +1,7 @@
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.uid.service;
 
 import com.navercorp.pinpoint.collector.dao.ApplicationNameDao;
-import com.navercorp.pinpoint.collector.dao.ApplicationUidDao;
+import com.navercorp.pinpoint.collector.uid.dao.ApplicationUidDao;
 import com.navercorp.pinpoint.common.server.uid.ApplicationUid;
 import com.navercorp.pinpoint.common.server.uid.ServiceUid;
 import com.navercorp.pinpoint.common.server.util.IdGenerator;
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/uid/service/EmptyApplicationUidService.java b/collector/src/main/java/com/navercorp/pinpoint/collector/uid/service/EmptyApplicationUidService.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.uid.service;
 
 import com.navercorp.pinpoint.common.server.uid.ApplicationUid;
 import com.navercorp.pinpoint.common.server.uid.ServiceUid;
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/uid/service/ServiceGroupService.java b/collector/src/main/java/com/navercorp/pinpoint/collector/uid/service/ServiceGroupService.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.uid.service;
 
 import com.navercorp.pinpoint.common.server.uid.ServiceUid;
 
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/uid/service/ServiceGroupServiceImpl.java b/collector/src/main/java/com/navercorp/pinpoint/collector/uid/service/ServiceGroupServiceImpl.java
@@ -1,7 +1,7 @@
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.uid.service;
 
 import com.navercorp.pinpoint.collector.config.CollectorV4CacheConfig;
-import com.navercorp.pinpoint.collector.dao.ServiceUidDao;
+import com.navercorp.pinpoint.collector.uid.dao.ServiceUidDao;
 import com.navercorp.pinpoint.common.server.uid.ServiceUid;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cache.annotation.Cacheable;
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/uid/service/StaticServiceGroupService.java b/collector/src/main/java/com/navercorp/pinpoint/collector/uid/service/StaticServiceGroupService.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.uid.service;
 
 import com.navercorp.pinpoint.common.server.uid.ServiceUid;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/uid/mapper/ApplicationIdentifierMapper.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/uid/mapper/ApplicationIdentifierMapper.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.common.server.dao.hbase.mapper;
+package com.navercorp.pinpoint.common.server.uid.mapper;
 
 import com.navercorp.pinpoint.common.hbase.HbaseColumnFamily;
 import com.navercorp.pinpoint.common.hbase.RowMapper;
diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/uid/mapper/ApplicationUidMapper.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/uid/mapper/ApplicationUidMapper.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.common.server.dao.hbase.mapper;
+package com.navercorp.pinpoint.common.server.uid.mapper;
 
 import com.navercorp.pinpoint.common.hbase.HbaseColumnFamily;
 import com.navercorp.pinpoint.common.hbase.RowMapper;
diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/uid/mapper/ApplicationUidNameMapper.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/uid/mapper/ApplicationUidNameMapper.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.common.server.dao.hbase.mapper;
+package com.navercorp.pinpoint.common.server.uid.mapper;
 
 import com.navercorp.pinpoint.common.hbase.HbaseColumnFamily;
 import com.navercorp.pinpoint.common.hbase.RowMapper;
diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/uid/mapper/ServiceNameMapper.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/uid/mapper/ServiceNameMapper.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.common.server.dao.hbase.mapper;
+package com.navercorp.pinpoint.common.server.uid.mapper;
 
 import com.navercorp.pinpoint.common.hbase.HbaseColumnFamily;
 import com.navercorp.pinpoint.common.hbase.RowMapper;
diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/uid/mapper/ServiceUidMapper.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/uid/mapper/ServiceUidMapper.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.common.server.dao.hbase.mapper;
+package com.navercorp.pinpoint.common.server.uid.mapper;
 
 import com.navercorp.pinpoint.common.hbase.HbaseColumnFamily;
 import com.navercorp.pinpoint.common.hbase.RowMapper;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.navercorp.pinpoint.collector.dao;`
	`1`	`+package com.navercorp.pinpoint.collector.uid.dao;`
`2`	`2`
`3`	`3`	`import com.navercorp.pinpoint.common.server.uid.ApplicationUid;`
`4`	`4`	`import com.navercorp.pinpoint.common.server.uid.ServiceUid;`