Skip to content

Commit bd53b7a

Browse files
authored
Update trace validation to handle multiple ? for all platforms (#423)
*Issue description:* Follow up from this PR: #419 The issue is related to cw agent so all platforms are affected. Adding the REGEX fix to all dotnet validation templates except for adot sigv4 since it does not use cw agent By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 6c7b924 commit bd53b7a

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-trace.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "^{{serviceName}}$",
33
"http": {
44
"request": {
5-
"url": "^{{endpoint}}/aws-sdk-call(?:\\?ip=Redacted&testingId=Redacted)?$",
5+
"url": "^{{endpoint}}/aws-sdk-call(?:\\?{1,2}ip=Redacted&testingId=Redacted)?$",
66
"method": "^GET$"
77
}
88
},

validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-trace.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "^{{serviceName}}$",
33
"http": {
44
"request": {
5-
"url": "^{{endpoint}}/remote-service$",
5+
"url": "^{{endpoint}}/remote-service(?:\\?{1,2}ip=Redacted&testingId=Redacted)?$",
66
"method": "^GET$"
77
}
88
},

validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-trace.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "^{{serviceName}}$",
33
"http": {
44
"request": {
5-
"url": "^{{endpoint}}/aws-sdk-call(?:\\?ip=Redacted&testingId=Redacted)?$",
5+
"url": "^{{endpoint}}/aws-sdk-call(?:\\?{1,2}ip=Redacted&testingId=Redacted)?$",
66
"method": "^GET$"
77
}
88
},

validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "^{{serviceName}}$",
33
"http": {
44
"request": {
5-
"url": "^{{endpoint}}/remote-service$",
5+
"url": "^{{endpoint}}/remote-service(?:\\?{1,2}ip=Redacted&testingId=Redacted)?$",
66
"method": "^GET$"
77
}
88
},

validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-trace.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "^{{serviceName}}$",
33
"http": {
44
"request": {
5-
"url": "^{{endpoint}}/aws-sdk-call(?:\\?ip=Redacted&testingId=Redacted)?$",
5+
"url": "^{{endpoint}}/aws-sdk-call(?:\\?{1,2}ip=Redacted&testingId=Redacted)?$",
66
"method": "^GET$"
77
}
88
},

validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-trace.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "^{{serviceName}}$",
33
"http": {
44
"request": {
5-
"url": "^{{endpoint}}/remote-service$",
5+
"url": "^{{endpoint}}/remote-service(?:\\?{1,2}ip=Redacted&testingId=Redacted)?$",
66
"method": "^GET$"
77
}
88
},

validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-trace.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "^{{serviceName}}$",
33
"http": {
44
"request": {
5-
"url": "^{{endpoint}}/aws-sdk-call(?:\\?ip=Redacted&testingId=Redacted)?$",
5+
"url": "^{{endpoint}}/aws-sdk-call(?:\\?{1,2}ip=Redacted&testingId=Redacted)?$",
66
"method": "^GET$"
77
}
88
},

validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-trace.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "^{{serviceName}}$",
33
"http": {
44
"request": {
5-
"url": "^{{endpoint}}/remote-service$",
5+
"url": "^{{endpoint}}/remote-service(?:\\?{1,2}ip=Redacted&testingId=Redacted)?$",
66
"method": "^GET$"
77
}
88
},

0 commit comments

Comments
 (0)