diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/SystemMetricController.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/SystemMetricController.java index eb09ca4d2c9f..fef24d9e344c 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/SystemMetricController.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/SystemMetricController.java @@ -19,9 +19,9 @@ import com.navercorp.pinpoint.metric.common.model.SystemMetric; import com.navercorp.pinpoint.metric.web.model.MetricDataSearchKey; import com.navercorp.pinpoint.metric.web.model.SystemMetricData; -import com.navercorp.pinpoint.metric.web.service.SystemMetricBasicGroupManager; import com.navercorp.pinpoint.metric.web.service.SystemMetricDataService; import com.navercorp.pinpoint.metric.web.service.SystemMetricHostInfoService; +import com.navercorp.pinpoint.metric.web.service.YMLSystemMetricBasicGroupManager; import com.navercorp.pinpoint.metric.web.util.QueryParameter; import com.navercorp.pinpoint.metric.web.util.TimePrecision; import com.navercorp.pinpoint.metric.web.util.Range; @@ -47,13 +47,13 @@ public class SystemMetricController { private final SystemMetricDataService systemMetricDataService; private final SystemMetricHostInfoService systemMetricHostInfoService; - private final SystemMetricBasicGroupManager systemMetricBasicGroupManager; + private final YMLSystemMetricBasicGroupManager systemMetricBasicGroupManager; private final TimeWindowSampler DEFAULT_TIME_WINDOW_SAMPLER = new DefaultTimeWindowSampler(10000L); private final TagParser tagParser = new TagParser(); - public SystemMetricController(SystemMetricDataService systemMetricDataService, SystemMetricHostInfoService systemMetricHostInfoService, SystemMetricBasicGroupManager systemMetricBasicGroupManager) { + public SystemMetricController(SystemMetricDataService systemMetricDataService, SystemMetricHostInfoService systemMetricHostInfoService, YMLSystemMetricBasicGroupManager systemMetricBasicGroupManager) { this.systemMetricDataService = Objects.requireNonNull(systemMetricDataService, "systemMetricService"); this.systemMetricHostInfoService = Objects.requireNonNull(systemMetricHostInfoService, "systemMetricHostInfoService"); this.systemMetricBasicGroupManager = Objects.requireNonNull(systemMetricBasicGroupManager, "systemMetricBasicGroupManager"); diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricBasicGroupManager.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricBasicGroupManager.java deleted file mode 100644 index fbdaecdb0380..000000000000 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricBasicGroupManager.java +++ /dev/null @@ -1,333 +0,0 @@ -/* - * Copyright 2021 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.web.service; - -import com.navercorp.pinpoint.metric.common.model.Tag; -import com.navercorp.pinpoint.metric.web.model.basic.metric.group.ElementOfBasicGroup; -import com.navercorp.pinpoint.metric.web.model.basic.metric.group.GroupingRule; -import com.navercorp.pinpoint.metric.web.model.basic.metric.group.MatchingRule; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - -/** - * @author minwoo.jung - */ -@Service -public class SystemMetricBasicGroupManager { - - private static final String UNIT_PERCENT = "percent"; - private static final String UNIT_COUNT = "count"; - private static final String UNIT_BYTE = "byte"; - - //TODO : (minwoo) 추후 좀더 정의가 쌓이면 domain(객체)로 만들예정, 현재로써는 구조를 잡기보다는 데이터 조합 사례가 더 쌓여야할 필요가 있음. - private static final String CPU_METRIC_NAME = "cpu"; - private static final String CPU_DEFINITION_ID = "cpu"; - private static final String CPU_TITLE = "cpu"; - private static final GroupingRule CPU_GROUPING_RULE = GroupingRule.TAG; - private static final List CPU_METRIC; - private static final String CPU_UNIT = UNIT_PERCENT; - - private static final String MEMORY_METRIC_NAME = "mem"; - - private static final String MEMORY_PERCENT_METRIC_NAME = MEMORY_METRIC_NAME; - private static final String MEMORY_PERCENT_DEFINITION_ID = "memoryPercent"; - private static final String MEMORY_PERCENT_TITLE = "memory usage percent"; - private static final GroupingRule MEMORY_PERCENT_GROUPING_RULE = GroupingRule.TAG; - private static final List MEMORY_PERCENT_METRIC; - private static final String MEMORY_PERCENT_UNIT = UNIT_PERCENT; - - private static final String MEMORY_USAGE_METRIC_NAME = MEMORY_METRIC_NAME; - private static final String MEMORY_USAGE_DEFINITION_ID = "memoryUsage"; - private static final String MEMORY_USAGE_TITLE = "memory usage"; - private static final GroupingRule MEMORY_USAGE_GROUPING_RULE = GroupingRule.TAG; - private static final List MEMORY_USAGE_METRIC; - private static final String MEMORY_USAGE_UNIT = UNIT_BYTE; - - private static final String DISK_METRIC_NAME = "disk"; - - private static final String DISK_USAGE_METRIC_NAME = DISK_METRIC_NAME; - private static final String DISK_USAGE_DEFINITION_ID = "diskUsage"; - private static final String DISK_USAGE_TITLE = "disk usage"; - private static final GroupingRule DISK_USAGE_GROUPING_RULE = GroupingRule.TAG; - private static final List DISK_USAGE_METRIC; - private static final String DISK_USAGE_UNIT = UNIT_BYTE; - - private static final String DISK_PERCENT_METRIC_NAME = DISK_METRIC_NAME; - private static final String DISK_PERCENT_DEFINITION_ID = "diskPercent"; - private static final String DISK_PERCENT_TITLE = "disk usage percent"; - private static final GroupingRule DISK_PERCENT_GROUPING_RULE = GroupingRule.TAG; - private static final List DISK_PERCENT_METRIC; - private static final String DISK_PERCENT_UNIT = UNIT_PERCENT; - - private static final String DISK_INODE_METRIC_NAME = DISK_METRIC_NAME; - private static final String DISK_INODE_DEFINITION_ID = "inodeUsage"; - private static final String DISK_INODE_TITLE = "inode usage percent"; - private static final GroupingRule DISK_INODE_GROUPING_RULE = GroupingRule.TAG; - private static final List DISK_INODE_METRIC; - private static final String DISK_INODE_UNIT = UNIT_COUNT; - - private static final String SYSTEM_LOAD_METRIC_NAME = "system"; - private static final String SYSTEM_LOAD_DEFINITION_ID = "systemLoad"; - private static final String SYSTEM_LOAD_TITLE = "system load"; - private static final GroupingRule SYSTEM_LOAD_GROUPING_RULE = GroupingRule.TAG; - private static final List SYSTEM_LOAD_METRIC; - private static final String SYSTEM_LOAD_UNIT = UNIT_COUNT; - - private static final String SWAP_METRIC_NAME = "swap"; - private static final String SWAP_DEFINITION_ID = "swap"; - private static final String SWAP_TITLE = "swap"; - private static final GroupingRule SWAP_GROUPING_RULE = GroupingRule.TAG; - private static final List SWAP_METRIC; - private static final String SWAP_UNIT = UNIT_COUNT; - - static { - //CPU - List tagList = new ArrayList<>(1); - Tag tag = new Tag("cpu", "cpu-total"); - tagList.add(tag); - - ElementOfBasicGroup cpuUsageUser = new ElementOfBasicGroup(CPU_METRIC_NAME, "usage_user", tagList, MatchingRule.EXACT); - ElementOfBasicGroup cpuUsageSystem = new ElementOfBasicGroup(CPU_METRIC_NAME, "usage_system", tagList, MatchingRule.EXACT); - ElementOfBasicGroup cpuUsageIdle = new ElementOfBasicGroup(CPU_METRIC_NAME, "usage_idle", tagList, MatchingRule.EXACT); - List elementOfBasicGroupList = new ArrayList<>(3); - elementOfBasicGroupList.add(cpuUsageUser); - elementOfBasicGroupList.add(cpuUsageSystem); - elementOfBasicGroupList.add(cpuUsageIdle); - - CPU_METRIC = Collections.unmodifiableList(elementOfBasicGroupList); - } - - static { - //memory usage percent - List tagList = new ArrayList<>(0); - - ElementOfBasicGroup memoryUsedPercent = new ElementOfBasicGroup(MEMORY_PERCENT_METRIC_NAME, "used_percent", tagList, MatchingRule.EXACT); - List elementOfBasicGroupList = new ArrayList<>(1); - elementOfBasicGroupList.add(memoryUsedPercent); - - MEMORY_PERCENT_METRIC = Collections.unmodifiableList(elementOfBasicGroupList); - } - - static { - //memory usage - List tagList = new ArrayList<>(0); - - ElementOfBasicGroup memoryTotal = new ElementOfBasicGroup(MEMORY_USAGE_METRIC_NAME, "total", tagList, MatchingRule.EXACT); - ElementOfBasicGroup memoryUsed = new ElementOfBasicGroup(MEMORY_USAGE_METRIC_NAME, "used", tagList, MatchingRule.EXACT); - List elementOfBasicGroupList = new ArrayList<>(2); - elementOfBasicGroupList.add(memoryTotal); - elementOfBasicGroupList.add(memoryUsed); - - MEMORY_USAGE_METRIC = Collections.unmodifiableList(elementOfBasicGroupList); - } - - static { - //disk usage - List tagList = new ArrayList<>(0); - ElementOfBasicGroup diskTotal = new ElementOfBasicGroup(DISK_USAGE_METRIC_NAME, "total", tagList, MatchingRule.ALL); - ElementOfBasicGroup diskUsed = new ElementOfBasicGroup(DISK_USAGE_METRIC_NAME, "used", tagList, MatchingRule.ALL); - List elementOfBasicGroupList = new ArrayList<>(2); - elementOfBasicGroupList.add(diskTotal); - elementOfBasicGroupList.add(diskUsed); - - DISK_USAGE_METRIC = Collections.unmodifiableList(elementOfBasicGroupList); - } - - static { - //disk usage percent - List tagList = new ArrayList<>(0); - ElementOfBasicGroup diskUsedPercent = new ElementOfBasicGroup(DISK_PERCENT_METRIC_NAME, "used_percent", tagList, MatchingRule.ALL); - List elementOfBasicGroupList = new ArrayList<>(1); - elementOfBasicGroupList.add(diskUsedPercent); - - DISK_PERCENT_METRIC = Collections.unmodifiableList(elementOfBasicGroupList); - } - - static { - //disk usage - List tagList = new ArrayList<>(0); - ElementOfBasicGroup inodeTotal = new ElementOfBasicGroup(DISK_INODE_METRIC_NAME, "inodes_total", tagList, MatchingRule.ALL); - ElementOfBasicGroup inodeUsed = new ElementOfBasicGroup(DISK_INODE_METRIC_NAME, "inodes_used", tagList, MatchingRule.ALL); - ElementOfBasicGroup inodeFree = new ElementOfBasicGroup(DISK_INODE_METRIC_NAME, "inodes_free", tagList, MatchingRule.ALL); - List elementOfBasicGroupList = new ArrayList<>(3); - elementOfBasicGroupList.add(inodeTotal); - elementOfBasicGroupList.add(inodeUsed); - elementOfBasicGroupList.add(inodeFree); - - DISK_INODE_METRIC = Collections.unmodifiableList(elementOfBasicGroupList); - } - - static { - //system load - List tagList = new ArrayList(0); - ElementOfBasicGroup load1 = new ElementOfBasicGroup(SYSTEM_LOAD_METRIC_NAME, "load1", tagList, MatchingRule.EXACT); - ElementOfBasicGroup load5 = new ElementOfBasicGroup(SYSTEM_LOAD_METRIC_NAME, "load5", tagList, MatchingRule.EXACT); - ElementOfBasicGroup load15 = new ElementOfBasicGroup(SYSTEM_LOAD_METRIC_NAME, "load15", tagList, MatchingRule.EXACT); - List elementOfBasicGroupList = new ArrayList<>(3); - elementOfBasicGroupList.add(load1); - elementOfBasicGroupList.add(load5); - elementOfBasicGroupList.add(load15); - - SYSTEM_LOAD_METRIC = Collections.unmodifiableList(elementOfBasicGroupList); - } - - static { - //swap - List tagList = new ArrayList(0); - ElementOfBasicGroup total = new ElementOfBasicGroup(SWAP_METRIC_NAME, "total", tagList, MatchingRule.EXACT); - ElementOfBasicGroup used = new ElementOfBasicGroup(SWAP_METRIC_NAME, "used", tagList, MatchingRule.EXACT); - List elementOfBasicGroupList = new ArrayList<>(2); - elementOfBasicGroupList.add(total); - elementOfBasicGroupList.add(used); - - SWAP_METRIC = Collections.unmodifiableList(elementOfBasicGroupList); - } - - public List findElementOfBasicGroup(String metricDefinitionId) { - if (CPU_DEFINITION_ID.equals(metricDefinitionId)) { - return CPU_METRIC; - } else if (MEMORY_PERCENT_DEFINITION_ID.equals(metricDefinitionId)) { - return MEMORY_PERCENT_METRIC; - } else if (MEMORY_USAGE_DEFINITION_ID.equals(metricDefinitionId)) { - return MEMORY_USAGE_METRIC; - } else if (DISK_USAGE_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_USAGE_METRIC; - } else if (DISK_PERCENT_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_PERCENT_METRIC; - } else if (DISK_INODE_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_INODE_METRIC; - } else if (SYSTEM_LOAD_DEFINITION_ID.equals(metricDefinitionId)) { - return SYSTEM_LOAD_METRIC; - } else if (SWAP_DEFINITION_ID.equals(metricDefinitionId)) { - return SWAP_METRIC; - } - - throw new UnsupportedOperationException("unsupported metric :" + metricDefinitionId); - } - - public String findMetricName(String metricDefinitionId) { - if (CPU_DEFINITION_ID.equals(metricDefinitionId)) { - return CPU_METRIC_NAME; - } else if (MEMORY_PERCENT_DEFINITION_ID.equals(metricDefinitionId)) { - return MEMORY_PERCENT_METRIC_NAME; - } else if (MEMORY_USAGE_DEFINITION_ID.equals(metricDefinitionId)) { - return MEMORY_USAGE_METRIC_NAME; - } else if (DISK_USAGE_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_USAGE_METRIC_NAME; - } else if (DISK_PERCENT_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_PERCENT_METRIC_NAME; - } else if (DISK_INODE_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_INODE_METRIC_NAME; - } else if (SYSTEM_LOAD_DEFINITION_ID.equals(metricDefinitionId)) { - return SYSTEM_LOAD_METRIC_NAME; - } else if (SWAP_DEFINITION_ID.equals(metricDefinitionId)) { - return SWAP_METRIC_NAME; - } - - throw new UnsupportedOperationException("unsupported metric :" + metricDefinitionId); - } - - public String findMetricTitle(String metricDefinitionId) { - if (CPU_DEFINITION_ID.equals(metricDefinitionId)) { - return CPU_TITLE; - } else if (MEMORY_PERCENT_DEFINITION_ID.equals(metricDefinitionId)) { - return MEMORY_PERCENT_TITLE; - } else if (MEMORY_USAGE_DEFINITION_ID.equals(metricDefinitionId)) { - return MEMORY_USAGE_TITLE; - } else if (DISK_USAGE_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_USAGE_TITLE; - } else if (DISK_PERCENT_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_PERCENT_TITLE; - } else if (DISK_INODE_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_INODE_TITLE; - } else if (SYSTEM_LOAD_DEFINITION_ID.equals(metricDefinitionId)) { - return SYSTEM_LOAD_TITLE; - } else if (SWAP_DEFINITION_ID.equals(metricDefinitionId)) { - return SWAP_TITLE; - } - - throw new UnsupportedOperationException("unsupported metric :" + metricDefinitionId); - } - - public GroupingRule findGroupingRule(String metricDefinitionId) { - if (CPU_DEFINITION_ID.equals(metricDefinitionId)) { - return CPU_GROUPING_RULE; - } else if (MEMORY_PERCENT_DEFINITION_ID.equals(metricDefinitionId)) { - return MEMORY_PERCENT_GROUPING_RULE; - } else if (MEMORY_USAGE_DEFINITION_ID.equals(metricDefinitionId)) { - return MEMORY_USAGE_GROUPING_RULE; - } else if (DISK_USAGE_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_USAGE_GROUPING_RULE; - } else if (DISK_PERCENT_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_PERCENT_GROUPING_RULE; - } else if (DISK_INODE_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_INODE_GROUPING_RULE; - } else if (SYSTEM_LOAD_DEFINITION_ID.equals(metricDefinitionId)) { - return SYSTEM_LOAD_GROUPING_RULE; - } else if (SWAP_DEFINITION_ID.equals(metricDefinitionId)) { - return SWAP_GROUPING_RULE; - } - - throw new UnsupportedOperationException("unsupported metric :" + metricDefinitionId); - } - - public String findUnit(String metricDefinitionId) { - if (CPU_DEFINITION_ID.equals(metricDefinitionId)) { - return CPU_UNIT; - } else if (MEMORY_PERCENT_DEFINITION_ID.equals(metricDefinitionId)) { - return MEMORY_PERCENT_UNIT; - } else if (MEMORY_USAGE_DEFINITION_ID.equals(metricDefinitionId)) { - return MEMORY_USAGE_UNIT; - } else if (DISK_USAGE_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_USAGE_UNIT; - } else if (DISK_PERCENT_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_PERCENT_UNIT; - } else if (DISK_INODE_DEFINITION_ID.equals(metricDefinitionId)) { - return DISK_INODE_UNIT; - } else if (SYSTEM_LOAD_DEFINITION_ID.equals(metricDefinitionId)) { - return SYSTEM_LOAD_UNIT; - } else if (SWAP_DEFINITION_ID.equals(metricDefinitionId)) { - return SWAP_UNIT; - } - - throw new UnsupportedOperationException("unsupported metric :" + metricDefinitionId); - } - - public List findMetricDefinitionIdList(String metricName) { - List definitionIdList = new LinkedList<>(); - if (CPU_METRIC_NAME.equals(metricName)) { - definitionIdList.add(CPU_DEFINITION_ID); - } else if (MEMORY_METRIC_NAME.equals(metricName)) { - definitionIdList.add(MEMORY_PERCENT_DEFINITION_ID); - definitionIdList.add(MEMORY_USAGE_DEFINITION_ID); - } else if (DISK_METRIC_NAME.equals(metricName)) { - definitionIdList.add(DISK_USAGE_DEFINITION_ID); - definitionIdList.add(DISK_PERCENT_DEFINITION_ID); - definitionIdList.add((DISK_INODE_DEFINITION_ID)); - } else if (SYSTEM_LOAD_METRIC_NAME.equals(metricName)) { - definitionIdList.add(SYSTEM_LOAD_DEFINITION_ID); - } else if (SWAP_METRIC_NAME.equals(metricName)) { - definitionIdList.add(SWAP_DEFINITION_ID); - } - - return definitionIdList; - } -} diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImpl.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImpl.java index 1674d21f2b6d..2518d5b0e9b3 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImpl.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImpl.java @@ -38,9 +38,9 @@ public class SystemMetricHostInfoServiceImpl implements SystemMetricHostInfoService { private final SystemMetricHostInfoDao systemMetricHostInfoDao; - private final SystemMetricBasicGroupManager systemMetricBasicGroupManager; + private final YMLSystemMetricBasicGroupManager systemMetricBasicGroupManager; - public SystemMetricHostInfoServiceImpl(SystemMetricHostInfoDao systemMetricHostInfoDao, SystemMetricBasicGroupManager systemMetricBasicGroupManager) { + public SystemMetricHostInfoServiceImpl(SystemMetricHostInfoDao systemMetricHostInfoDao, YMLSystemMetricBasicGroupManager systemMetricBasicGroupManager) { this.systemMetricHostInfoDao = systemMetricHostInfoDao; this.systemMetricBasicGroupManager = Objects.requireNonNull(systemMetricBasicGroupManager, "systemMetricBasicGroupManager"); } diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlMetricTagDaoTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlMetricTagDaoTest.java index 66bc7f1c7210..d9ef11e43f5f 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlMetricTagDaoTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlMetricTagDaoTest.java @@ -12,6 +12,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -24,6 +25,7 @@ @ContextConfiguration(classes = MysqlTestConfig.class) @TestPropertySource(properties = {"pinpoint.profiles.active=local"}) @WebAppConfiguration +@Transactional public class MysqlMetricTagDaoTest { @Autowired @@ -31,7 +33,7 @@ public class MysqlMetricTagDaoTest { @Test public void insertAndSelectTest() { - String applicationId = "applicationId"; + String hostGroupName = "applicationId"; String hostName = "hostName"; String metricName = "metricName"; String fieldName = "fieldName"; @@ -44,14 +46,14 @@ public void insertAndSelectTest() { tagList.add(new Tag("key5", "value5")); tagList.add(new Tag("key6", "value6")); - MetricTag metricTag = new MetricTag(applicationId, hostName, metricName, fieldName, tagList); + MetricTag metricTag = new MetricTag(hostGroupName, hostName, metricName, fieldName, tagList); mysqlMetricTagDao.insertMetricTag(metricTag); - MetricTagCollection metricTagCollection = mysqlMetricTagDao.selectMetricTag(new MetricTagKey(applicationId, hostName, metricName, fieldName)); + MetricTagCollection metricTagCollection = mysqlMetricTagDao.selectMetricTag(new MetricTagKey(hostGroupName, hostName, metricName, fieldName)); Assert.assertEquals(metricTagCollection.getMetricTagList().size(), 1); mysqlMetricTagDao.insertMetricTag(metricTag); - MetricTagCollection metricTagCollection2 = mysqlMetricTagDao.selectMetricTag(new MetricTagKey(applicationId, hostName, metricName, fieldName)); + MetricTagCollection metricTagCollection2 = mysqlMetricTagDao.selectMetricTag(new MetricTagKey(hostGroupName, hostName, metricName, fieldName)); Assert.assertEquals(metricTagCollection2.getMetricTagList().size(), 1); List tagList2 = new ArrayList<>(5); @@ -62,10 +64,10 @@ public void insertAndSelectTest() { tagList2.add(new Tag("A_key5", "A_value5")); tagList2.add(new Tag("A_key6", "A_value6")); - MetricTag metricTag2 = new MetricTag(applicationId, hostName, metricName, fieldName, tagList2); + MetricTag metricTag2 = new MetricTag(hostGroupName, hostName, metricName, fieldName, tagList2); mysqlMetricTagDao.insertMetricTag(metricTag2); - MetricTagCollection metricTagCollection3 = mysqlMetricTagDao.selectMetricTag(new MetricTagKey(applicationId, hostName, metricName, fieldName)); + MetricTagCollection metricTagCollection3 = mysqlMetricTagDao.selectMetricTag(new MetricTagKey(hostGroupName, hostName, metricName, fieldName)); Assert.assertEquals(metricTagCollection3.getMetricTagList().size(), 2); } } \ No newline at end of file diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlSystemMetricDataTypeDaoTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlSystemMetricDataTypeDaoTest.java index 651d4b8169d9..5b68b382d912 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlSystemMetricDataTypeDaoTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlSystemMetricDataTypeDaoTest.java @@ -12,6 +12,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.transaction.annotation.Transactional; /** * @author minwoo.jung @@ -20,6 +21,7 @@ @ContextConfiguration(classes = MysqlTestConfig.class) @TestPropertySource(properties = {"pinpoint.profiles.active=local"}) @WebAppConfiguration +@Transactional public class MysqlSystemMetricDataTypeDaoTest { @Autowired diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlTestConfig.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlTestConfig.java index e860bf263e0d..604dfce5aff1 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlTestConfig.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlTestConfig.java @@ -7,7 +7,7 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; @ImportResource({"classpath:pinot-collector/applicationContext-collector-pinot.xml"}) -@PropertySource({"classpath:/pinot-collector/profiles/${pinpoint.profiles.active}/jdbc.properties", "classpath:/pinot-collector/kafka-producer-factory.properties"}) +@PropertySource({"classpath:/pinot-collector/profiles/${pinpoint.profiles.active}/jdbc.properties", "classpath:/pinot-collector/kafka-producer-factory.properties", "classpath:/pinot-collector/kafka-topic.properties"}) @Configuration() public class MysqlTestConfig {