update RemoteService for remote service call

ezhang6811 · ezhang6811 · commit dd2d3a4c75b4 · 2025-05-02T15:28:22.000-07:00
diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-log.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-log.mustache
@@ -14,7 +14,7 @@
   "PlatformType": "^Generic$",
   "Service": "^{{serviceName}}$",
   "Operation": "GET /remote-service",
-  "RemoteService": "{{remoteServiceIp}}:8080",
+  "RemoteService": "^{{remoteServiceDeploymentName}}$",
   "RemoteOperation": "GET /healthcheck",
   "Host": "^ip(-[0-9]{1,3}){4}.*$"
 }]
diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-metric.mustache
@@ -30,7 +30,7 @@
       value: GET /healthcheck
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Latency
@@ -80,7 +80,7 @@
       value: generic:default
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Latency
@@ -97,15 +97,15 @@
       value: GET /healthcheck
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Latency
   namespace: {{metricNamespace}}
   dimensions:
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Error
@@ -139,7 +139,7 @@
       value: GET /healthcheck
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Error
@@ -189,7 +189,7 @@
       value: generic:default
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Error
@@ -206,15 +206,15 @@
       value: GET /healthcheck
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Error
   namespace: {{metricNamespace}}
   dimensions:
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Fault
@@ -248,7 +248,7 @@
       value: GET /healthcheck
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Fault
@@ -298,7 +298,7 @@
       value: generic:default
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Fault
@@ -315,12 +315,12 @@
       value: GET /healthcheck
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Fault
   namespace: {{metricNamespace}}
   dimensions:
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`value: GET /healthcheck`
`31`	`31`	`-`
`32`	`32`	`name: RemoteService`
`33`		`- value: {{remoteServiceIp}}:8080`
	`33`	`+ value: {{remoteServiceDeploymentName}}`
`34`	`34`
`35`	`35`	`-`
`36`	`36`	`metricName: Latency`
`@@ -80,7 +80,7 @@`
`80`	`80`	`value: generic:default`
`81`	`81`	`-`
`82`	`82`	`name: RemoteService`
`83`		`- value: {{remoteServiceIp}}:8080`
	`83`	`+ value: {{remoteServiceDeploymentName}}`
`84`	`84`
`85`	`85`	`-`
`86`	`86`	`metricName: Latency`
`@@ -97,15 +97,15 @@`
`97`	`97`	`value: GET /healthcheck`
`98`	`98`	`-`
`99`	`99`	`name: RemoteService`
`100`		`- value: {{remoteServiceIp}}:8080`
	`100`	`+ value: {{remoteServiceDeploymentName}}`
`101`	`101`
`102`	`102`	`-`
`103`	`103`	`metricName: Latency`
`104`	`104`	`namespace: {{metricNamespace}}`
`105`	`105`	`dimensions:`
`106`	`106`	`-`
`107`	`107`	`name: RemoteService`
`108`		`- value: {{remoteServiceIp}}:8080`
	`108`	`+ value: {{remoteServiceDeploymentName}}`
`109`	`109`
`110`	`110`	`-`
`111`	`111`	`metricName: Error`
`@@ -139,7 +139,7 @@`
`139`	`139`	`value: GET /healthcheck`
`140`	`140`	`-`
`141`	`141`	`name: RemoteService`
`142`		`- value: {{remoteServiceIp}}:8080`
	`142`	`+ value: {{remoteServiceDeploymentName}}`
`143`	`143`
`144`	`144`	`-`
`145`	`145`	`metricName: Error`
`@@ -189,7 +189,7 @@`
`189`	`189`	`value: generic:default`
`190`	`190`	`-`
`191`	`191`	`name: RemoteService`
`192`		`- value: {{remoteServiceIp}}:8080`
	`192`	`+ value: {{remoteServiceDeploymentName}}`
`193`	`193`
`194`	`194`	`-`
`195`	`195`	`metricName: Error`
`@@ -206,15 +206,15 @@`
`206`	`206`	`value: GET /healthcheck`
`207`	`207`	`-`
`208`	`208`	`name: RemoteService`
`209`		`- value: {{remoteServiceIp}}:8080`
	`209`	`+ value: {{remoteServiceDeploymentName}}`
`210`	`210`
`211`	`211`	`-`
`212`	`212`	`metricName: Error`
`213`	`213`	`namespace: {{metricNamespace}}`
`214`	`214`	`dimensions:`
`215`	`215`	`-`
`216`	`216`	`name: RemoteService`
`217`		`- value: {{remoteServiceIp}}:8080`
	`217`	`+ value: {{remoteServiceDeploymentName}}`
`218`	`218`
`219`	`219`	`-`
`220`	`220`	`metricName: Fault`
`@@ -248,7 +248,7 @@`
`248`	`248`	`value: GET /healthcheck`
`249`	`249`	`-`
`250`	`250`	`name: RemoteService`
`251`		`- value: {{remoteServiceIp}}:8080`
	`251`	`+ value: {{remoteServiceDeploymentName}}`
`252`	`252`
`253`	`253`	`-`
`254`	`254`	`metricName: Fault`
`@@ -298,7 +298,7 @@`
`298`	`298`	`value: generic:default`
`299`	`299`	`-`
`300`	`300`	`name: RemoteService`
`301`		`- value: {{remoteServiceIp}}:8080`
	`301`	`+ value: {{remoteServiceDeploymentName}}`
`302`	`302`
`303`	`303`	`-`
`304`	`304`	`metricName: Fault`
`@@ -315,12 +315,12 @@`
`315`	`315`	`value: GET /healthcheck`
`316`	`316`	`-`
`317`	`317`	`name: RemoteService`
`318`		`- value: {{remoteServiceIp}}:8080`
	`318`	`+ value: {{remoteServiceDeploymentName}}`
`319`	`319`
`320`	`320`	`-`
`321`	`321`	`metricName: Fault`
`322`	`322`	`namespace: {{metricNamespace}}`
`323`	`323`	`dimensions:`
`324`	`324`	`-`
`325`	`325`	`name: RemoteService`
`326`		`- value: {{remoteServiceIp}}:8080`
	`326`	`+ value: {{remoteServiceDeploymentName}}`