Skip to content

Commit b7006db

Browse files
majanjua-amznmajanjua-amzn
authored
Merge pull request #26 from aws-observability/revert-24-update-cw-agent-rpm-latest
Revert "Change cw-agent.rpm to point to latest"
2 parents ff5aecc + ce6d19a commit b7006db

File tree

5 files changed

+54
-38
lines changed

5 files changed

+54
-38
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ 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/latest/amazon-cloudwatch-agent.rpm"
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"
3535
TEST_RESOURCES_FOLDER: /home/runner/work/aws-application-signals-test-framework/aws-application-signals-test-framework
3636

3737

‎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: 24 additions & 8 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": {
@@ -37,4 +37,20 @@
3737
"namespace": "^remote$"
3838
}
3939
]
40+
},
41+
{
42+
"name": "^local-root-client-call$",
43+
"http": {
44+
"request": {
45+
"url": "^http://local-root-client-call$",
46+
"method": "^GET$"
47+
},
48+
"response": {
49+
"content_length": 0
50+
}
51+
},
52+
"annotations": {
53+
"aws_local_service": "^local-root-client-call$",
54+
"aws_local_operation": "^GET /$"
55+
}
4056
}]

‎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
]

0 commit comments

Comments
 (0)