diff --git a/src/main/java/com/nhn/pinpoint/common/ServiceType.java b/src/main/java/com/nhn/pinpoint/common/ServiceType.java index 374ae966c..c97448808 100644 --- a/src/main/java/com/nhn/pinpoint/common/ServiceType.java +++ b/src/main/java/com/nhn/pinpoint/common/ServiceType.java @@ -64,6 +64,8 @@ public enum ServiceType { SPRING((short) 5050, "SPRING", false, false, false, HistogramSchema.NORMAL_SCHEMA), SPRING_MVC((short) 5051, "SPRING", false, false, false, HistogramSchema.NORMAL_SCHEMA), + // FIXME 스프링 관련 코드들 어떻게 가져갈지 정리 필요 + SPRING_ORM_IBATIS((short) 5061, "SPRING", false, false, false, HistogramSchema.NORMAL_SCHEMA), IBATIS((short) 5500, "IBATIS", false, false, false, HistogramSchema.NORMAL_SCHEMA), MYBATIS((short) 5510, "MYBATIS", false, false, false, HistogramSchema.NORMAL_SCHEMA), diff --git a/src/main/java/com/nhn/pinpoint/common/util/AnnotationUtils.java b/src/main/java/com/nhn/pinpoint/common/util/AnnotationUtils.java index 786aaba5d..eb2295c5a 100644 --- a/src/main/java/com/nhn/pinpoint/common/util/AnnotationUtils.java +++ b/src/main/java/com/nhn/pinpoint/common/util/AnnotationUtils.java @@ -79,6 +79,11 @@ public class AnnotationUtils { if (serviceType == ServiceType.IBATIS || serviceType == ServiceType.MYBATIS) { return findAnnotationBo(list, AnnotationKey.ARGS0); } + + if (serviceType == ServiceType.SPRING_ORM_IBATIS) { + return findAnnotationBo(list, AnnotationKey.ARGS0); + } + return null; }