Skip to content

Commit 0c57694

Browse files
NathanielRNNathanielRN
authored
Update default trace template + move springboot (#154)
1 parent 1da4140 commit 0c57694

File tree

7 files changed

+158
-59
lines changed

7 files changed

+158
-59
lines changed

‎validator/src/main/java/com/amazon/aoc/fileconfigs/ExpectedTrace.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ public enum ExpectedTrace implements FileConfig {
2626
XRAY_SDK_HTTP_EXPECTED_TRACE("/expected-data-template/xraySDKexpectedHTTPTrace.mustache"),
2727
SPARK_SDK_HTTP_EXPECTED_TRACE("/expected-data-template/spark/sparkAppExpectedHTTPTrace.mustache"),
2828
SPARK_SDK_AWSSDK_EXPECTED_TRACE(
29-
"/expected-data-template/spark/sparkAppExpectedAWSSDKTrace.mustache")
29+
"/expected-data-template/spark/sparkAppExpectedAWSSDKTrace.mustache"),
30+
SPRINGBOOT_SDK_HTTP_EXPECTED_TRACE(
31+
"/expected-data-template/springboot/springbootAppExpectedHTTPTrace.mustache"),
32+
SPRINGBOOT_SDK_AWSSDK_EXPECTED_TRACE(
33+
"/expected-data-template/springboot/springbootAppExpectedAWSSDKTrace.mustache")
3034
;
3135

3236
private String path;

‎validator/src/main/resources/expected-data-template/otelSDKexpectedAWSSDKTrace.mustache‎

Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
[{
2-
"name": "/aws-sdk-call",
32
"fault": false,
43
"error": false,
5-
"throttle": false,
64
"http": {
75
"request": {
86
"url": "{{endpoint}}/aws-sdk-call",
@@ -12,47 +10,27 @@
1210
"status": 200
1311
}
1412
},
13+
"metadata": {
14+
"default": {
15+
"otel.resource.telemetry.sdk.name": "opentelemetry"
16+
}
17+
},
1518
"subsegments": [
1619
{
20+
"name": "S3",
1721
"fault": false,
1822
"error": false,
19-
"throttle": false,
20-
"subsegments": [
21-
{
22-
"name": "S3",
23-
"fault": false,
24-
"error": false,
25-
"throttle": false,
26-
"http": {
27-
"request": {
28-
"url": "https://s3.{{region}}.amazonaws.com/",
29-
"method": "GET"
30-
},
31-
"response": {
32-
"status": 200
33-
}
34-
},
35-
"namespace": "aws",
36-
"subsegments": [
37-
{
38-
"name": "s3.{{region}}.amazonaws.com",
39-
"fault": false,
40-
"error": false,
41-
"throttle": false,
42-
"http": {
43-
"request": {
44-
"url": "https://s3.{{region}}.amazonaws.com/",
45-
"method": "GET"
46-
},
47-
"response": {
48-
"status": 200
49-
}
50-
},
51-
"namespace": "remote"
52-
}
53-
]
23+
"http": {
24+
"response": {
25+
"status": 200
26+
}
27+
},
28+
"metadata": {
29+
"default": {
30+
"aws.service": "s3"
5431
}
55-
]
32+
},
33+
"namespace": "aws"
5634
}
5735
]
5836
}]

‎validator/src/main/resources/expected-data-template/otelSDKexpectedHTTPTrace.mustache‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
[{
2-
"name": "/outgoing-http-call",
32
"fault": false,
43
"error": false,
5-
"throttle": false,
64
"http": {
75
"request": {
86
"url": "{{endpoint}}/outgoing-http-call",
@@ -12,29 +10,26 @@
1210
"status": 200
1311
}
1412
},
13+
"metadata": {
14+
"default": {
15+
"otel.resource.telemetry.sdk.name": "opentelemetry"
16+
}
17+
},
1518
"subsegments": [
1619
{
20+
"name": "HTTP GET",
1721
"fault": false,
1822
"error": false,
19-
"throttle": false,
20-
"subsegments": [
21-
{
22-
"name": "aws.amazon.com",
23-
"fault": false,
24-
"error": false,
25-
"throttle": false,
26-
"http": {
27-
"request": {
28-
"url": "https://aws.amazon.com/",
29-
"method": "GET"
30-
},
31-
"response": {
32-
"status": 200
33-
}
34-
},
35-
"namespace": "remote"
23+
"http": {
24+
"request": {
25+
"url": "https://aws.amazon.com/",
26+
"method": "GET"
27+
},
28+
"response": {
29+
"status": 200
3630
}
37-
]
31+
},
32+
"namespace": "remote"
3833
}
3934
]
4035
}]

‎validator/src/main/resources/expected-data-template/springboot/springbootAppExpectedAWSSDKTrace.mustache‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
[{
2+
"name": "/aws-sdk-call",
3+
"fault": false,
4+
"error": false,
5+
"http": {
6+
"request": {
7+
"url": "{{endpoint}}/aws-sdk-call",
8+
"method": "GET"
9+
},
10+
"response": {
11+
"status": 200
12+
}
13+
},
14+
"subsegments": [
15+
{
16+
"fault": false,
17+
"error": false,
18+
"subsegments": [
19+
{
20+
"name": "S3",
21+
"fault": false,
22+
"error": false,
23+
"http": {
24+
"request": {
25+
"url": "https://s3.{{region}}.amazonaws.com/",
26+
"method": "GET"
27+
},
28+
"response": {
29+
"status": 200
30+
}
31+
},
32+
"namespace": "aws",
33+
"subsegments": [
34+
{
35+
"name": "s3.{{region}}.amazonaws.com",
36+
"fault": false,
37+
"error": false,
38+
"http": {
39+
"request": {
40+
"url": "https://s3.{{region}}.amazonaws.com/",
41+
"method": "GET"
42+
},
43+
"response": {
44+
"status": 200
45+
}
46+
},
47+
"namespace": "remote"
48+
}
49+
]
50+
}
51+
]
52+
}
53+
]
54+
}]

‎validator/src/main/resources/expected-data-template/springboot/springbootAppExpectedHTTPTrace.mustache‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[{
2+
"name": "/outgoing-http-call",
3+
"fault": false,
4+
"error": false,
5+
"http": {
6+
"request": {
7+
"url": "{{endpoint}}/outgoing-http-call",
8+
"method": "GET"
9+
},
10+
"response": {
11+
"status": 200
12+
}
13+
},
14+
"subsegments": [
15+
{
16+
"fault": false,
17+
"error": false,
18+
"subsegments": [
19+
{
20+
"name": "aws.amazon.com",
21+
"fault": false,
22+
"error": false,
23+
"http": {
24+
"request": {
25+
"url": "https://aws.amazon.com/",
26+
"method": "GET"
27+
},
28+
"response": {
29+
"status": 200
30+
}
31+
},
32+
"namespace": "remote"
33+
}
34+
]
35+
}
36+
]
37+
}]

‎validator/src/main/resources/validations/springboot-otel-trace-metric-validation.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
-
2+
validationType: "metric"
3+
httpPath: "/outgoing-http-call"
4+
httpMethod: "get"
5+
callingType: "http"
6+
expectedMetricTemplate: "DEFAULT_EXPECTED_METRIC"
7+
-
8+
validationType: "trace"
9+
httpPath: "/outgoing-http-call"
10+
httpMethod: "get"
11+
callingType: "http"
12+
expectedTraceTemplate: "SPRINGBOOT_SDK_HTTP_EXPECTED_TRACE"
13+
-
14+
validationType: "trace"
15+
httpPath: "/aws-sdk-call"
16+
httpMethod: "get"
17+
callingType: "http"
18+
expectedTraceTemplate: "SPRINGBOOT_SDK_AWSSDK_EXPECTED_TRACE"
19+

‎validator/src/main/resources/validations/springboot-otel-trace-validation.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
-
2+
validationType: "trace"
3+
httpPath: "/outgoing-http-call"
4+
httpMethod: "get"
5+
callingType: "http"
6+
expectedTraceTemplate: "SPRINGBOOT_SDK_HTTP_EXPECTED_TRACE"
7+
-
8+
validationType: "trace"
9+
httpPath: "/aws-sdk-call"
10+
httpMethod: "get"
11+
callingType: "http"
12+
expectedTraceTemplate: "SPRINGBOOT_SDK_AWSSDK_EXPECTED_TRACE"

0 commit comments

Comments
 (0)