[pinpoint-apm#12434] Move HostApplicationMapDao to servermap package

Author: emeroad

collector/src/main/java/com/navercorp/pinpoint/collector/dao/HostApplicationMapDao.java renamed to collector/src/main/java/com/navercorp/pinpoint/collector/applicationmap/dao/HostApplicationMapDao.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.collector.dao;
+package com.navercorp.pinpoint.collector.applicationmap.dao;
 
 /**
  * 

collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseHostApplicationMapDao.java renamed to collector/src/main/java/com/navercorp/pinpoint/collector/applicationmap/dao/hbase/HbaseHostApplicationMapDao.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.collector.dao.hbase;
+package com.navercorp.pinpoint.collector.applicationmap.dao.hbase;
 
-import com.navercorp.pinpoint.collector.dao.HostApplicationMapDao;
+import com.navercorp.pinpoint.collector.applicationmap.dao.HostApplicationMapDao;
 import com.navercorp.pinpoint.collector.util.AtomicLongUpdateMap;
 import com.navercorp.pinpoint.common.annotations.VisibleForTesting;
 import com.navercorp.pinpoint.common.buffer.AutomaticBuffer;

collector/src/main/java/com/navercorp/pinpoint/collector/service/HbaseTraceService.java

@@ -16,9 +16,9 @@
 
 package com.navercorp.pinpoint.collector.service;
 
+import com.navercorp.pinpoint.collector.applicationmap.dao.HostApplicationMapDao;
 import com.navercorp.pinpoint.collector.applicationmap.service.LinkService;
 import com.navercorp.pinpoint.collector.dao.ApplicationTraceIndexDao;
-import com.navercorp.pinpoint.collector.dao.HostApplicationMapDao;
 import com.navercorp.pinpoint.collector.dao.TraceDao;
 import com.navercorp.pinpoint.collector.event.SpanStorePublisher;
 import com.navercorp.pinpoint.common.profiler.logging.ThrottledLogger;
@@ -120,12 +120,12 @@ public void insertSpan(@Valid final SpanBo spanBo) {
     private void insertAcceptorHost(long requestTime, SpanEventBo spanEvent, String applicationName, ServiceType serviceType) {
         final String endPoint = spanEvent.getEndPoint();
         if (endPoint == null) {
-            logger.debug("endPoint is null. spanEvent:{}", spanEvent);
+            logger.debug("endPoint is null. appName:{} spanEvent:{}", applicationName, spanEvent);
             return;
         }
         final String destinationId = spanEvent.getDestinationId();
         if (destinationId == null) {
-            logger.debug("destinationId is null. spanEvent:{}", spanEvent);
+            logger.debug("destinationId is null. appName:{} spanEvent:{}", applicationName, spanEvent);
             return;
         }
         hostApplicationMapDao.insert(requestTime, endPoint, destinationId, (short) spanEvent.getServiceType(),
@@ -137,7 +137,7 @@ private void insertAcceptorHost(SpanBo span) {
         // acceptor host is set at profiler module only when the span is not the kind of root span
         final String acceptorHost = span.getAcceptorHost();
         if (acceptorHost == null) {
-            logger.debug("acceptorHost is null {}", span);
+            logger.debug("acceptorHost is null agent: {}/{}", span.getApplicationName(), span.getAgentName());
             return;
         }
         final String spanApplicationName = span.getApplicationName();
@@ -191,7 +191,7 @@ private void insertSpanStat(SpanBo span) {
         // when drawing server map based on statistics info, you must know the application name of the previous node.
         if (span.getParentApplicationName() != null) {
             String parentApplicationName = span.getParentApplicationName();
-            logger.debug("Received parent application name. {}", parentApplicationName);
+            logger.debug("Received parent application name. parentAppName:{} appName:{}", parentApplicationName, span.getApplicationName());
 
             ServiceType parentApplicationType = registry.findServiceType(span.getParentApplicationServiceType());
 
@@ -225,7 +225,10 @@ private void insertSpanStat(SpanBo span) {
         linkService.updateResponseTime(span.getCollectorAcceptTime(), span.getApplicationName(), applicationServiceType, span.getAgentId(), span.getElapsed(), span.hasError());
 
         if (bugCheck != 1) {
-            logger.info("ambiguous span found(bug). span:{}", span);
+            logger.info("ambiguous span found(bug). span {}/{}", span.getApplicationName(), span.getAgentName());
+            if (logger.isDebugEnabled()) {
+                logger.debug("ambiguous span found(bug). detailed span {}", span);
+            }
         }
     }
 

collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseHostApplicationMapDaoTest.java renamed to collector/src/test/java/com/navercorp/pinpoint/collector/applicationmap/dao/hbase/HbaseHostApplicationMapDaoTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.collector.dao.hbase;
+package com.navercorp.pinpoint.collector.applicationmap.dao.hbase;
 
 import com.navercorp.pinpoint.common.buffer.Buffer;
 import com.navercorp.pinpoint.common.buffer.FixedBuffer;
@@ -36,17 +36,19 @@ public class HbaseHostApplicationMapDaoTest {
 
     @Test
     public void testCreateRowKey() {
+        String parentApp = "parentApp";
         long statisticsRowSlot = timeSlot.getTimeSlot(System.currentTimeMillis());
-        byte[] parentApps = HbaseHostApplicationMapDao.createRowKey0("parentApp", ServiceType.STAND_ALONE.getCode(), statisticsRowSlot, null);
+        ServiceType standAlone = ServiceType.STAND_ALONE;
+        byte[] parentApps = HbaseHostApplicationMapDao.createRowKey0(parentApp, standAlone.getCode(), statisticsRowSlot, null);
         logger.debug("rowKey size:{}", parentApps.length);
 
         Buffer readBuffer = new FixedBuffer(parentApps);
         String appName = readBuffer.readPadStringAndRightTrim(HbaseTableConstants.APPLICATION_NAME_MAX_LEN);
         short code = readBuffer.readShort();
         long time = TimeUtils.recoveryTimeMillis(readBuffer.readLong());
 
-        Assertions.assertEquals(appName, "parentApp", "applicationName check");
-        Assertions.assertEquals(code, ServiceType.STAND_ALONE.getCode(), "serviceType check");
+        Assertions.assertEquals(parentApp, appName, "applicationName check");
+        Assertions.assertEquals(standAlone.getCode(), code, "serviceType check");
         Assertions.assertEquals(statisticsRowSlot, time, "time check");
     }
 }