diff --git a/metric-module/collector-starter/pom.xml b/metric-module/collector-starter/pom.xml
index 78f5ae74b2ad..e033b3f239eb 100644
--- a/metric-module/collector-starter/pom.xml
+++ b/metric-module/collector-starter/pom.xml
@@ -44,7 +44,7 @@
org.springframework.boot
spring-boot-maven-plugin
- com.navercorp.pinpoint.collector.CollectorApp
+ com.navercorp.pinpoint.collector.starter.multi.application.MultiApplication
target/deploy
true
false
diff --git a/metric-module/metric/src/test/http/web/system-metric-chart.http b/metric-module/metric/src/test/http/web/system-metric-chart.http
index aff5d9a50526..b998c25cb43b 100644
--- a/metric-module/metric/src/test/http/web/system-metric-chart.http
+++ b/metric-module/metric/src/test/http/web/system-metric-chart.http
@@ -11,7 +11,7 @@ content-type: application/json
### LongMetric, w/o tags, w/o interval
GET http://{{host}}/systemMetric/chart.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=mem&fieldName=used
&from={{from}}&to={{to}}
Accept: application/json
@@ -19,7 +19,7 @@ Accept: application/json
### LongMetric, w/o tags, w/o interval
GET http://{{host}}/systemMetric/chart.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=mem&fieldName=used&tags=cpu:cpu1
&from={{from}}&to={{to}}
Accept: application/json
@@ -27,7 +27,7 @@ Accept: application/json
### LongMetric, w/o tags, with interval
GET http://{{host}}/systemMetric/chart.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=mem&fieldName=free
&from={{from}}&to={{to}}
&timeUnit=SECONDS&timeSize=30
@@ -35,7 +35,7 @@ Accept: application/json
### DoubleMetric, w/o tags, with interval
GET http://{{host}}/systemMetric/chart.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=cpu&fieldName=usage_user
&from={{from}}&to={{to}}
&timeUnit=MINUTES&timeSize=10
@@ -43,7 +43,7 @@ Accept: application/json
### DoubleMetric, with tags, with interval
GET http://{{host}}/systemMetric/chart.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=cpu&fieldName=usage_user&tags=cpu:cpu1
&from={{from}}&to={{to}}
&timeUnit=MINUTES&timeSize=3
@@ -51,7 +51,7 @@ Accept: application/json
### with multiple tags > wrong behavior
GET http://{{host}}/systemMetric/chart.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=disk&fieldName=used_percent&tags=device:disk1s4,fstype:apfs,mode:rw,path:/private/var/vm
&from={{from}}&to={{to}}
&timeUnit=SECONDS&timeSize=40
@@ -59,7 +59,7 @@ Accept: application/json
### Cpu tag for Mem query
GET http://{{host}}/systemMetric/chart.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=disk&fieldName=used_percent&tags=cpu:cpu1
&from={{from}}&to={{to}}
&timeUnit=MINUTES&timeSize=5
@@ -67,14 +67,14 @@ Accept: application/json
### No Such Metric
GET http://{{host}}/systemMetric/chart.pinpoint{{metric-host}}
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=mem&fieldName=freer
&from={{from}}&to={{to}}
Accept: application/json
### Lowercase timeUnit
GET http://{{host}}/systemMetric/chart.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=cpu&fieldName=usage_user&tags=cpu:cpu1
&from={{from}}&to={{to}}
&timeUnit=minutes&timeSize=3
@@ -82,7 +82,7 @@ Accept: application/json
### Wrong timeUnit
GET http://{{host}}/systemMetric/chart.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=disk&fieldName=used_percent&tags=cpu:cpu1
&from={{from}}&to={{to}}
&timeUnit=MINS&timeSize=5
@@ -90,7 +90,7 @@ Accept: application/json
### Invalid timeSize
GET http://{{host}}/systemMetric/chart.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=disk&fieldName=used_percent&tags=cpu:cpu1
&from={{from}}&to={{to}}
&timeUnit=MINUTES&timeSize=0
@@ -104,12 +104,13 @@ Accept: application/json
###
GET http://{{host}}/systemMetric/hostGroup/host/collectedMetricInfo.pinpoint
- ?hostGroupId={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
Accept: application/json
###
GET http://{{host}}/systemMetric/hostGroup/host/collectedMetricData.pinpoint
- ?hostGroupId={{applicationName}}&hostName={{metric-host}}&metricName=cpu&metricDefinitionId=cpu
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}&metricDefinitionId=cpu
&from={{from}}&to={{to}}
Accept: application/json
+###
diff --git a/metric-module/metric/src/test/http/web/system-metric-list.http b/metric-module/metric/src/test/http/web/system-metric-list.http
index 10c5a6bbfef6..283ffee84043 100644
--- a/metric-module/metric/src/test/http/web/system-metric-list.http
+++ b/metric-module/metric/src/test/http/web/system-metric-list.http
@@ -11,14 +11,14 @@ content-type: application/json
### LongMetric, w/o tags
GET http://{{host}}/systemMetric/list.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=mem&fieldName=used
&from={{from}}&to={{to}}
Accept: application/json
### LongMetric, w/o tags
GET http://{{host}}/systemMetric/list.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=mem&fieldName=free
&from={{from}}&to={{to}}
Accept: application/json
@@ -26,21 +26,21 @@ Accept: application/json
### DoubleMetric, w/o tags
GET http://{{host}}/systemMetric/list.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=cpu&fieldName=usage_user
&from={{from}}&to={{to}}
Accept: application/json
### DoubleMetric, with tags
GET http://{{host}}/systemMetric/list.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=cpu&fieldName=usage_user&tags=cpu:cpu0
&from={{from}}&to={{to}}
Accept: application/json
### No Such Metric
GET http://{{host}}/systemMetric/list.pinpoint
- ?applicationName={{applicationName}}&hostName={{metric-host}}
+ ?hostGroupId={{hostGroupId}}&hostName={{metric-host}}
&metricName=mem&fieldName=freer
&from={{from}}&to={{to}}
Accept: application/json