[pinpoint-apm#8004] Modify test code for changing parameter

emeroad · Aug 30, 2021 · 9ab644d · 9ab644d
1 parent 7ba13a9
commit 9ab644d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/metric-module/collector-starter/pom.xml b/metric-module/collector-starter/pom.xml
@@ -44,7 +44,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>com.navercorp.pinpoint.collector.CollectorApp</mainClass>
+                    <mainClass>com.navercorp.pinpoint.collector.starter.multi.application.MultiApplication</mainClass>
                     <outputDirectory>target/deploy</outputDirectory>
                     <executable>true</executable>
                     <attach>false</attach>

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
@@ -11,86 +11,86 @@ 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
 
 
 ### 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
 
 
 ### 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
 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
 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
 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
 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
 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
 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
 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
@@ -11,36 +11,36 @@ 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
 
 
 ### 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