Skip to content

Commit 4fd6014

Browse files
jj22eejj22ee
committed
trace touch-ups
1 parent c709743 commit 4fd6014

File tree

4 files changed

+47
-66
lines changed

4 files changed

+47
-66
lines changed

‎validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-trace.mustache‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,22 @@
22
"name": "^{{serviceName}}$",
33
"http": {
44
"request": {
5-
"url": "^{{endpoint}}/aws-sdk-call\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
65
"method": "^GET$"
76
},
87
"response": {
98
"status": "^200$"
109
}
1110
},
12-
"aws": {
13-
"account_id": "^{{accountId}}$"
14-
},
1511
"annotations": {
1612
"aws.local.service": "^{{serviceName}}$",
1713
"aws.local.operation": "^GET /aws-sdk-call$",
1814
"aws.local.environment": "^generic:default$"
1915
},
2016
"metadata": {
21-
"EC2.AutoScalingGroup": "^eks-.+",
22-
"EKS.Cluster": "^{{platformInfo}}$",
23-
"K8s.Namespace": "^{{appNamespace}}",
24-
"PlatformType": "^Generic$"
17+
"EC2.AutoScalingGroup": "^eks-.+",
18+
"EKS.Cluster": "^{{platformInfo}}$",
19+
"K8s.Namespace": "^{{appNamespace}}",
20+
"PlatformType": "^Generic$"
2521
},
2622
"subsegments": [
2723
{
@@ -36,18 +32,18 @@
3632
},
3733
"annotations": {
3834
"aws.local.service": "^{{serviceName}}$",
39-
"aws.local.operation": "^GET /aws-sdk-call$",
35+
"aws.local.operation": "^UnmappedOperation$",
4036
"aws.remote.service": "^AWS::S3$",
4137
"aws.remote.operation": "^GetBucketLocation$",
4238
"aws.remote.resource.type": "^AWS::S3::Bucket$",
4339
"aws.remote.resource.identifier": "^e2e-test-bucket-name-{{testingId}}$",
4440
"aws.local.environment": "^generic:default$"
4541
},
4642
"metadata": {
47-
"EC2.AutoScalingGroup": "^eks-.+",
48-
"EKS.Cluster": "^{{platformInfo}}$",
49-
"K8s.Namespace": "^{{appNamespace}}$",
50-
"PlatformType": "^Generic$"
43+
"EC2.AutoScalingGroup": "^eks-.+",
44+
"EKS.Cluster": "^{{platformInfo}}$",
45+
"K8s.Namespace": "^{{appNamespace}}$",
46+
"PlatformType": "^Generic$"
5147
},
5248
"namespace": "^aws$"
5349
}
@@ -57,7 +53,10 @@
5753
},
5854
{
5955
"name": "^S3$",
60-
"aws": {
61-
"operation": "^GetBucketLocation$"
56+
"annotations": {
57+
"aws.local.service": "^AWS::S3$",
58+
"aws.local.operation": "^GetBucketLocation$",
59+
"aws.local.resource.identifier": "^e2e-test-bucket-name-{{testingId}}$",
60+
"aws.local.resource.type": "^AWS::S3::Bucket$"
6261
}
6362
}]

‎validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-trace.mustache‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
"aws.local.environment": "^generic:default$"
77
},
88
"metadata": {
9-
"EC2.AutoScalingGroup": "^eks-.+",
10-
"EKS.Cluster": "^{{platformInfo}}$",
11-
"K8s.Namespace": "^{{appNamespace}}",
12-
"PlatformType": "^Generic$"
9+
"k8s.cluster.name": "^{{platformInfo}}$"
1310
},
1411
"subsegments": [
1512
{
@@ -28,11 +25,10 @@
2825
"aws.local.environment": "^generic:default$"
2926
},
3027
"metadata": {
31-
"EC2.AutoScalingGroup": "^eks-.+",
32-
"EKS.Cluster": "^{{platformInfo}}$",
33-
"K8s.Namespace": "^{{appNamespace}}$",
34-
"PlatformType": "^Generic$",
35-
"aws.span.kind": "^LOCAL_ROOT$"
28+
"EC2.AutoScalingGroup": "^eks-.+",
29+
"EKS.Cluster": "^{{platformInfo}}$",
30+
"K8s.Namespace": "^{{appNamespace}}$",
31+
"PlatformType": "^Generic$"
3632
},
3733
"namespace": "^remote$"
3834
}
@@ -44,9 +40,6 @@
4440
"request": {
4541
"url": "^http://local-root-client-call$",
4642
"method": "^GET$"
47-
},
48-
"response": {
49-
"content_length": 0
5043
}
5144
},
5245
"annotations": {

‎validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-trace.mustache‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,22 @@
22
"name": "^{{serviceName}}$",
33
"http": {
44
"request": {
5-
"url": "^{{endpoint}}/outgoing-http-call$",
65
"method": "^GET$"
76
},
87
"response": {
98
"status": "^200$"
109
}
1110
},
12-
"aws": {
13-
"account_id": "^{{accountId}}$"
14-
},
1511
"annotations": {
1612
"aws.local.service": "^{{serviceName}}$",
1713
"aws.local.operation": "^GET /outgoing-http-call$",
1814
"aws.local.environment": "^generic:default$"
1915
},
2016
"metadata": {
21-
"EC2.AutoScalingGroup": "^eks-.+",
22-
"EKS.Cluster": "^{{platformInfo}}$",
23-
"K8s.Namespace": "^{{appNamespace}}",
24-
"PlatformType": "^Generic$"
17+
"EC2.AutoScalingGroup": "^eks-.+",
18+
"EKS.Cluster": "^{{platformInfo}}$",
19+
"K8s.Namespace": "^{{appNamespace}}",
20+
"PlatformType": "^Generic$"
2521
},
2622
"subsegments": [
2723
{
@@ -36,16 +32,16 @@
3632
},
3733
"annotations": {
3834
"aws.local.service": "^{{serviceName}}$",
39-
"aws.local.operation": "^GET /outgoing-http-call$",
35+
"aws.local.operation": "^UnmappedOperation$",
4036
"aws.remote.service": "^www.amazon.com$",
4137
"aws.remote.operation": "^GET /$",
4238
"aws.local.environment": "^generic:default$"
4339
},
4440
"metadata": {
45-
"EC2.AutoScalingGroup": "^eks-.+",
46-
"EKS.Cluster": "^{{platformInfo}}$",
47-
"K8s.Namespace": "^{{appNamespace}}$",
48-
"PlatformType": "^Generic$"
41+
"EC2.AutoScalingGroup": "^eks-.+",
42+
"EKS.Cluster": "^{{platformInfo}}$",
43+
"K8s.Namespace": "^{{appNamespace}}$",
44+
"PlatformType": "^Generic$"
4945
},
5046
"namespace": "^remote$"
5147
}

‎validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-trace.mustache‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,46 @@
22
"name": "^{{serviceName}}$",
33
"http": {
44
"request": {
5-
"url": "^{{endpoint}}/remote-service\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
65
"method": "^GET$"
76
},
87
"response": {
98
"status": "^200$"
109
}
1110
},
12-
"aws": {
13-
"account_id": "^{{accountId}}$"
14-
},
1511
"annotations": {
1612
"aws.local.service": "^{{serviceName}}$",
1713
"aws.local.operation": "^GET /remote-service$",
1814
"aws.local.environment": "^generic:default$"
1915
},
2016
"metadata": {
21-
"EC2.AutoScalingGroup": "^eks-.+",
22-
"EKS.Cluster": "^{{platformInfo}}$",
23-
"K8s.Namespace": "^{{appNamespace}}",
24-
"PlatformType": "^Generic$"
17+
"EC2.AutoScalingGroup": "^eks-.+",
18+
"EKS.Cluster": "^{{platformInfo}}$",
19+
"K8s.Namespace": "^{{appNamespace}}",
20+
"PlatformType": "^Generic$"
2521
},
2622
"subsegments": [
2723
{
2824
"subsegments": [
2925
{
30-
"name": "^{{remoteServiceDeploymentName}}$",
26+
"name": "^{{remoteServiceIp}}:8080$",
3127
"http": {
3228
"request": {
33-
"url": "^http://(([0-9]{1,3}.){3}[0-9]{1,3}):8080/healthcheck$",
29+
"url": "^http://{{remoteServiceIp}}:8080/healthcheck$",
3430
"method": "^GET$"
3531
}
3632
},
3733
"annotations": {
3834
"aws.local.service": "^{{serviceName}}$",
39-
"aws.local.operation": "^GET /remote-service$",
35+
"aws.local.operation": "^UnmappedOperation$",
4036
"aws.remote.service": "^{{remoteServiceIp}}:8080$",
4137
"aws.remote.operation": "^GET /healthcheck$",
42-
"aws.local.environment": "^generic:default$",
43-
"aws.remote.environment": "^generic:default$"
38+
"aws.local.environment": "^generic:default$"
4439
},
4540
"metadata": {
46-
"EC2.AutoScalingGroup": "^eks-.+",
47-
"EKS.Cluster": "^{{platformInfo}}$",
48-
"K8s.Namespace": "^{{appNamespace}}$",
49-
"PlatformType": "^Generic$"
41+
"EC2.AutoScalingGroup": "^eks-.+",
42+
"EKS.Cluster": "^{{platformInfo}}$",
43+
"K8s.Namespace": "^{{appNamespace}}$",
44+
"PlatformType": "^Generic$"
5045
},
5146
"namespace": "^remote$"
5247
}
@@ -58,7 +53,6 @@
5853
"name": "^{{remoteServiceDeploymentName}}$",
5954
"http": {
6055
"request": {
61-
"url": "^http://(([0-9]{1,3}.){3}[0-9]{1,3}):8080/healthcheck$",
6256
"method": "^GET$"
6357
}
6458
},
@@ -68,19 +62,18 @@
6862
"aws.local.environment": "^generic:default$"
6963
},
7064
"metadata": {
71-
"EC2.AutoScalingGroup": "^eks-.+",
72-
"EKS.Cluster": "^{{platformInfo}}$",
73-
"K8s.Namespace": "^{{appNamespace}}",
74-
"PlatformType": "^Generic$",
75-
"K8s.Workload": "^{{remoteServiceDeploymentName}}$",
76-
"K8s.Pod": "^{{remoteServiceDeploymentName}}(-[A-Za-z0-9]*)*$"
65+
"EC2.AutoScalingGroup": "^eks-.+",
66+
"EKS.Cluster": "^{{platformInfo}}$",
67+
"K8s.Namespace": "^{{appNamespace}}",
68+
"PlatformType": "^Generic$",
69+
"K8s.Workload": "^{{remoteServiceDeploymentName}}$",
70+
"K8s.Pod": "^{{remoteServiceDeploymentName}}(-[A-Za-z0-9]*)*$"
7771
},
7872
"subsegments": [
7973
{
8074
"name": "^RemoteServiceController.healthcheck$",
8175
"annotations": {
82-
"aws.local.operation": "^GET /healthcheck$",
83-
"aws.local.environment": "^generic:default$"
76+
"aws.local.environment": "^eks:{{platformInfo}}/{{appNamespace}}$"
8477
}
8578
}
8679
]

0 commit comments

Comments
 (0)