Skip to content

Commit 68aeef3

Browse files
harrryrharrryr
authored
Merge branch 'main' into build-docker-for-e2e
2 parents c0da0e1 + d9f555b commit 68aeef3

15 files changed

+139
-146
lines changed

‎.github/workflows/appsignals-e2e-ec2-test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ env:
3131
LOG_GROUP_NAME: /aws/appsignals/generic
3232
TEST: ${{ inputs.test }}
3333
GET_ADOT_JAR_COMMAND: "wget -O adot.jar https://github.com/aws-observability/aws-otel-java-instrumentation/releases/latest/download/aws-opentelemetry-agent.jar"
34-
GET_CW_AGENT_RPM_COMMAND: "wget -O cw-agent.rpm https://amazoncloudwatch-agent-${{ inputs.aws-region }}.s3.${{ inputs.aws-region }}.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm"
3534
TEST_RESOURCES_FOLDER: /__w/aws-application-signals-test-framework/aws-application-signals-test-framework
36-
35+
GET_CW_AGENT_RPM_COMMAND: "wget -O cw-agent.rpm https://amazoncloudwatch-agent-${{ inputs.aws-region }}.s3.${{ inputs.aws-region }}.amazonaws.com/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm"
3736

3837
jobs:
3938
e2e-ec2-test:

‎.github/workflows/appsignals-e2e-eks-test.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ jobs:
6060
cleanup: "rm -f enable-app-signals.sh && rm -f clean-app-signals.sh"
6161
post-command: "chmod +x enable-app-signals.sh && chmod +x clean-app-signals.sh"
6262

63-
# TODO: remove this step next Monday and update validator with appropriate changes
64-
- name: Temporary override addon version
65-
working-directory: enablement-script
66-
run: |
67-
sed -i '\#--addon-name amazon-cloudwatch-observability \\#a--addon-version v1.2.2-eksbuild.1 \\' enable-app-signals.sh
68-
6963
- name: Remove log group deletion command
7064
if: always()
7165
working-directory: enablement-script

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"account_id": "^{{accountId}}$"
1414
},
1515
"annotations": {
16-
"aws_local_service": "^{{serviceName}}$",
17-
"HostedIn_Environment": "^EC2$",
18-
"aws_local_operation": "^GET /aws-sdk-call$"
16+
"aws.local.service": "^{{serviceName}}$",
17+
"HostedIn.Environment": "^EC2$",
18+
"aws.local.operation": "^GET /aws-sdk-call$"
1919
},
2020
"metadata": {
2121
"default": {
@@ -37,12 +37,12 @@
3737
}
3838
},
3939
"annotations": {
40-
"HostedIn_Environment": "^EC2$",
41-
"aws_local_service": "^{{serviceName}}$",
42-
"aws_local_operation": "^GET /aws-sdk-call$",
43-
"aws_remote_service": "^AWS\\.SDK\\.S3$",
44-
"aws_remote_operation": "^GetBucketLocation$",
45-
"aws_remote_target": "^::s3:::e2e-test-bucket-name$"
40+
"HostedIn.Environment": "^EC2$",
41+
"aws.local.service": "^{{serviceName}}$",
42+
"aws.local.operation": "^GET /aws-sdk-call$",
43+
"aws.remote.service": "^AWS\\.SDK\\.S3$",
44+
"aws.remote.operation": "^GetBucketLocation$",
45+
"aws.remote.target": "^::s3:::e2e-test-bucket-name$"
4646
},
4747
"metadata": {
4848
"default": {

‎validator/src/main/resources/expected-data-template/ec2/client-call-trace.mustache

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[{
22
"name": "^{{serviceName}}$",
33
"annotations": {
4-
"aws_local_service": "^{{serviceName}}$",
5-
"HostedIn_Environment": "^EC2$",
6-
"aws_local_operation": "^InternalOperation$"
4+
"aws.local.service": "^{{serviceName}}$",
5+
"HostedIn.Environment": "^EC2$",
6+
"aws.local.operation": "^InternalOperation$"
77
},
88
"metadata": {
99
"default": {
@@ -23,11 +23,11 @@
2323
}
2424
},
2525
"annotations": {
26-
"HostedIn_Environment": "^EC2$",
27-
"aws_local_service": "^{{serviceName}}$",
28-
"aws_local_operation": "^InternalOperation$",
29-
"aws_remote_service": "^local-root-client-call$",
30-
"aws_remote_operation": "GET /"
26+
"HostedIn.Environment": "^EC2$",
27+
"aws.local.service": "^{{serviceName}}$",
28+
"aws.local.operation": "^InternalOperation$",
29+
"aws.remote.service": "^local-root-client-call$",
30+
"aws.remote.operation": "GET /"
3131
},
3232
"metadata": {
3333
"default": {
@@ -50,7 +50,7 @@
5050
}
5151
},
5252
"annotations": {
53-
"aws_local_service": "^local-root-client-call$",
54-
"aws_local_operation": "^GET /$"
53+
"aws.local.service": "^local-root-client-call$",
54+
"aws.local.operation": "^GET /$"
5555
}
5656
}]

‎validator/src/main/resources/expected-data-template/ec2/outgoing-http-call-trace.mustache

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"account_id": "^{{accountId}}$"
1414
},
1515
"annotations": {
16-
"aws_local_service": "^{{serviceName}}$",
17-
"HostedIn_Environment": "^EC2$",
18-
"aws_local_operation": "^GET /outgoing-http-call$"
16+
"aws.local.service": "^{{serviceName}}$",
17+
"HostedIn.Environment": "^EC2$",
18+
"aws.local.operation": "^GET /outgoing-http-call$"
1919
},
2020
"metadata": {
2121
"default": {
@@ -37,11 +37,11 @@
3737
}
3838
},
3939
"annotations": {
40-
"HostedIn_Environment": "^EC2$",
41-
"aws_local_service": "^{{serviceName}}$",
42-
"aws_local_operation": "^GET /outgoing-http-call$",
43-
"aws_remote_service": "^www.amazon.com$",
44-
"aws_remote_operation": "^GET /$"
40+
"HostedIn.Environment": "^EC2$",
41+
"aws.local.service": "^{{serviceName}}$",
42+
"aws.local.operation": "^GET /outgoing-http-call$",
43+
"aws.remote.service": "^www.amazon.com$",
44+
"aws.remote.operation": "^GET /$"
4545
},
4646
"metadata": {
4747
"default": {

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"account_id": "^{{accountId}}$"
1414
},
1515
"annotations": {
16-
"aws_local_service": "^{{serviceName}}$",
17-
"HostedIn_Environment": "^EC2$",
18-
"aws_local_operation": "^GET /remote-service$"
16+
"aws.local.service": "^{{serviceName}}$",
17+
"HostedIn.Environment": "^EC2$",
18+
"aws.local.operation": "^GET /remote-service$"
1919
},
2020
"metadata": {
2121
"default": {
@@ -37,10 +37,10 @@
3737
}
3838
},
3939
"annotations": {
40-
"aws_local_service": "^{{serviceName}}$",
41-
"aws_local_operation": "^GET /remote-service$",
42-
"aws_remote_service": "^{{remoteServiceDeploymentName}}$",
43-
"aws_remote_operation": "^GET /healthcheck$"
40+
"aws.local.service": "^{{serviceName}}$",
41+
"aws.local.operation": "^GET /remote-service$",
42+
"aws.remote.service": "^{{remoteServiceDeploymentName}}$",
43+
"aws.remote.operation": "^GET /healthcheck$"
4444
},
4545
"metadata": {
4646
"default": {
@@ -62,9 +62,9 @@
6262
}
6363
},
6464
"annotations": {
65-
"HostedIn_Environment": "^EC2$",
66-
"aws_local_service": "^{{remoteServiceName}}$",
67-
"aws_local_operation": "^GET /healthcheck$"
65+
"HostedIn.Environment": "^EC2$",
66+
"aws.local.service": "^{{remoteServiceName}}$",
67+
"aws.local.operation": "^GET /healthcheck$"
6868
},
6969
"metadata": {
7070
"default": {
@@ -78,8 +78,8 @@
7878
{
7979
"name": "^RemoteServiceController.healthcheck$",
8080
"annotations": {
81-
"HostedIn_Environment": "^EC2$",
82-
"aws_local_operation": "^GET /healthcheck$"
81+
"HostedIn.Environment": "^EC2$",
82+
"aws.local.operation": "^GET /healthcheck$"
8383
}
8484
}
8585
]

‎validator/src/main/resources/expected-data-template/eks/aws-sdk-call-metric.mustache

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
value: AWS.SDK.S3
114114
-
115115
name: RemoteTarget
116-
value: e2e-test-bucket-name
116+
value: ::s3:::e2e-test-bucket-name
117117

118118
-
119119
metricName: Latency
@@ -136,7 +136,7 @@
136136
value: AWS.SDK.S3
137137
-
138138
name: RemoteTarget
139-
value: e2e-test-bucket-name
139+
value: ::s3:::e2e-test-bucket-name
140140

141141
-
142142
metricName: Error
@@ -253,7 +253,7 @@
253253
value: AWS.SDK.S3
254254
-
255255
name: RemoteTarget
256-
value: e2e-test-bucket-name
256+
value: ::s3:::e2e-test-bucket-name
257257

258258
-
259259
metricName: Error
@@ -276,7 +276,7 @@
276276
value: AWS.SDK.S3
277277
-
278278
name: RemoteTarget
279-
value: e2e-test-bucket-name
279+
value: ::s3:::e2e-test-bucket-name
280280

281281
-
282282
metricName: Fault
@@ -393,7 +393,7 @@
393393
value: AWS.SDK.S3
394394
-
395395
name: RemoteTarget
396-
value: e2e-test-bucket-name
396+
value: ::s3:::e2e-test-bucket-name
397397

398398
-
399399
metricName: Fault
@@ -416,4 +416,4 @@
416416
value: AWS.SDK.S3
417417
-
418418
name: RemoteTarget
419-
value: e2e-test-bucket-name
419+
value: ::s3:::e2e-test-bucket-name

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"account_id": "^{{accountId}}$"
1414
},
1515
"annotations": {
16-
"aws_local_service": "^{{serviceName}}$",
17-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
18-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
19-
"aws_local_operation": "^GET /aws-sdk-call$"
16+
"aws.local.service": "^{{serviceName}}$",
17+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
18+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
19+
"aws.local.operation": "^GET /aws-sdk-call$"
2020
},
2121
"metadata": {
2222
"default": {
@@ -38,13 +38,13 @@
3838
}
3939
},
4040
"annotations": {
41-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
42-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
43-
"aws_local_service": "^{{serviceName}}$",
44-
"aws_local_operation": "^GET /aws-sdk-call$",
45-
"aws_remote_service": "^AWS\\.SDK\\.S3$",
46-
"aws_remote_operation": "GetBucketLocation",
47-
"aws_remote_target": "e2e-test-bucket-name"
41+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
42+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
43+
"aws.local.service": "^{{serviceName}}$",
44+
"aws.local.operation": "^GET /aws-sdk-call$",
45+
"aws.remote.service": "^AWS\\.SDK\\.S3$",
46+
"aws.remote.operation": "GetBucketLocation",
47+
"aws.remote.target": "^::s3:::e2e-test-bucket-name$"
4848
},
4949
"metadata": {
5050
"default": {

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[{
22
"name": "^{{serviceName}}$",
33
"annotations": {
4-
"aws_local_service": "^{{serviceName}}$",
5-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
6-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
7-
"aws_local_operation": "^InternalOperation$"
4+
"aws.local.service": "^{{serviceName}}$",
5+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
6+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
7+
"aws.local.operation": "^InternalOperation$"
88
},
99
"metadata": {
1010
"default": {
@@ -23,12 +23,12 @@
2323
}
2424
},
2525
"annotations": {
26-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
27-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
28-
"aws_local_service": "^{{serviceName}}$",
29-
"aws_local_operation": "^InternalOperation$",
30-
"aws_remote_service": "^local-root-client-call$",
31-
"aws_remote_operation": "GET /"
26+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
27+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
28+
"aws.local.service": "^{{serviceName}}$",
29+
"aws.local.operation": "^InternalOperation$",
30+
"aws.remote.service": "^local-root-client-call$",
31+
"aws.remote.operation": "GET /"
3232
},
3333
"metadata": {
3434
"default": {
@@ -51,7 +51,7 @@
5151
}
5252
},
5353
"annotations": {
54-
"aws_local_service": "^local-root-client-call$",
55-
"aws_local_operation": "^GET /$"
54+
"aws.local.service": "^local-root-client-call$",
55+
"aws.local.operation": "^GET /$"
5656
}
5757
}]

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"account_id": "^{{accountId}}$"
1414
},
1515
"annotations": {
16-
"aws_local_service": "^{{serviceName}}$",
17-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
18-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
19-
"aws_local_operation": "^GET /outgoing-http-call$"
16+
"aws.local.service": "^{{serviceName}}$",
17+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
18+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
19+
"aws.local.operation": "^GET /outgoing-http-call$"
2020
},
2121
"metadata": {
2222
"default": {
@@ -38,12 +38,12 @@
3838
}
3939
},
4040
"annotations": {
41-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
42-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
43-
"aws_local_service": "^{{serviceName}}$",
44-
"aws_local_operation": "^GET /outgoing-http-call$",
45-
"aws_remote_service": "^www.amazon.com$",
46-
"aws_remote_operation": "^GET /$"
41+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
42+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
43+
"aws.local.service": "^{{serviceName}}$",
44+
"aws.local.operation": "^GET /outgoing-http-call$",
45+
"aws.remote.service": "^www.amazon.com$",
46+
"aws.remote.operation": "^GET /$"
4747
},
4848
"metadata": {
4949
"default": {

0 commit comments

Comments
 (0)