Changing the values of dimensions of different metrics and alsovalue associated to arg remote-service-deployment-name in validate metrics

Jeel Mehta · Jeel Mehta · commit ade3706bd4ea · 2025-05-09T04:30:11.000-07:00
diff --git a/.github/workflows/python-ec2-adot-sigv4-test.yml b/.github/workflows/python-ec2-adot-sigv4-test.yml
@@ -193,7 +193,7 @@ jobs:
         run: ./gradlew validator:run --args='-c python/ec2/adot-sigv4/metric-validation.yml
           --testing-id ${{ env.TESTING_ID }}
           --endpoint http://localhost:8000
-          --remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8001
+          --remote-service-deployment-name python-sample-remote-application-${{ env.TESTING_ID }}
           --region ${{ env.E2E_TEST_AWS_REGION }}
           --metric-namespace ${{ env.METRIC_NAMESPACE }}
           --log-group ${{ env.LOG_GROUP_NAME }}
diff --git a/validator/src/main/resources/expected-data-template/python/ec2/adot-sigv4/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/python/ec2/adot-sigv4/aws-sdk-call-metric.mustache
@@ -4,7 +4,7 @@
   dimensions:
     -
       name: Operation
-      value: GET aws-sdk-call
+      value: GET /aws-sdk-call
     -
       name: Service
       value: {{serviceName}}
@@ -18,7 +18,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /aws-sdk-call
     -
       name: Service
       value: {{serviceName}}
@@ -80,7 +80,7 @@
   dimensions:
     -
       name: Operation
-      value: GET aws-sdk-call
+      value: GET /aws-sdk-call
     -
       name: Service
       value: {{serviceName}}
@@ -94,7 +94,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /aws-sdk-call
     -
       name: Service
       value: {{serviceName}}
@@ -156,7 +156,7 @@
   dimensions:
     -
       name: Operation
-      value: GET aws-sdk-call
+      value: GET /aws-sdk-call
     -
       name: Service
       value: {{serviceName}}
@@ -170,7 +170,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /aws-sdk-call
     -
       name: Service
       value: {{serviceName}}
diff --git a/validator/src/main/resources/expected-data-template/python/ec2/adot-sigv4/outgoing-http-call-metric.mustache b/validator/src/main/resources/expected-data-template/python/ec2/adot-sigv4/outgoing-http-call-metric.mustache
@@ -4,7 +4,7 @@
   dimensions:
     -
       name: Operation
-      value: GET outgoing-http-call
+      value: GET /outgoing-http-call
     -
       name: Service
       value: {{serviceName}}
@@ -18,7 +18,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /outgoing-http-call
     -
       name: Service
       value: {{serviceName}}
@@ -80,7 +80,7 @@
   dimensions:
     -
       name: Operation
-      value: GET outgoing-http-call
+      value: GET /outgoing-http-call
     -
       name: Service
       value: {{serviceName}}
@@ -94,7 +94,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /outgoing-http-call
     -
       name: Service
       value: {{serviceName}}
@@ -156,7 +156,7 @@
   dimensions:
     -
       name: Operation
-      value: GET outgoing-http-call
+      value: GET /outgoing-http-call
     -
       name: Service
       value: {{serviceName}}
@@ -170,7 +170,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /outgoing-http-call
     -
       name: Service
       value: {{serviceName}}
diff --git a/validator/src/main/resources/expected-data-template/python/ec2/adot-sigv4/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/python/ec2/adot-sigv4/remote-service-metric.mustache
@@ -4,7 +4,7 @@
   dimensions:
     -
       name: Operation
-      value: GET remote-service
+      value: GET /remote-service
     -
       name: Service
       value: {{serviceName}}
@@ -18,7 +18,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /remote-service
     -
       name: Service
       value: {{serviceName}}
@@ -113,7 +113,7 @@
   dimensions:
     -
       name: Operation
-      value: GET remote-service
+      value: GET /remote-service
     -
       name: Service
       value: {{serviceName}}
@@ -127,7 +127,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /remote-service
     -
       name: Service
       value: {{serviceName}}
@@ -222,7 +222,7 @@
   dimensions:
     -
       name: Operation
-      value: GET remote-service
+      value: GET /remote-service
     -
       name: Service
       value: {{serviceName}}
@@ -236,7 +236,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /remote-service
     -
       name: Service
       value: {{serviceName}}

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`dimensions:`
`5`	`5`	`-`
`6`	`6`	`name: Operation`
`7`		`- value: GET aws-sdk-call`
	`7`	`+ value: GET /aws-sdk-call`
`8`	`8`	`-`
`9`	`9`	`name: Service`
`10`	`10`	`value: {{serviceName}}`
`@@ -18,7 +18,7 @@`
`18`	`18`	`dimensions:`
`19`	`19`	`-`
`20`	`20`	`name: Operation`
`21`		`- value: UnmappedOperation`
	`21`	`+ value: GET /aws-sdk-call`
`22`	`22`	`-`
`23`	`23`	`name: Service`
`24`	`24`	`value: {{serviceName}}`
`@@ -80,7 +80,7 @@`
`80`	`80`	`dimensions:`
`81`	`81`	`-`
`82`	`82`	`name: Operation`
`83`		`- value: GET aws-sdk-call`
	`83`	`+ value: GET /aws-sdk-call`
`84`	`84`	`-`
`85`	`85`	`name: Service`
`86`	`86`	`value: {{serviceName}}`
`@@ -94,7 +94,7 @@`
`94`	`94`	`dimensions:`
`95`	`95`	`-`
`96`	`96`	`name: Operation`
`97`		`- value: UnmappedOperation`
	`97`	`+ value: GET /aws-sdk-call`
`98`	`98`	`-`
`99`	`99`	`name: Service`
`100`	`100`	`value: {{serviceName}}`
`@@ -156,7 +156,7 @@`
`156`	`156`	`dimensions:`
`157`	`157`	`-`
`158`	`158`	`name: Operation`
`159`		`- value: GET aws-sdk-call`
	`159`	`+ value: GET /aws-sdk-call`
`160`	`160`	`-`
`161`	`161`	`name: Service`
`162`	`162`	`value: {{serviceName}}`
`@@ -170,7 +170,7 @@`
`170`	`170`	`dimensions:`
`171`	`171`	`-`
`172`	`172`	`name: Operation`
`173`		`- value: UnmappedOperation`
	`173`	`+ value: GET /aws-sdk-call`
`174`	`174`	`-`
`175`	`175`	`name: Service`
`176`	`176`	`value: {{serviceName}}`