Skip to content

Commit 57b4877

Browse files
committed
feat: update system tests for synthetic changes
1 parent 5326a68 commit 57b4877

13 files changed

+75
-157
lines changed

systemtest/approvals/TestIntake/Errors.approved.json

+8-21
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
1
113113
],
114114
"error.exception.type": [
115+
"ConnectionError",
115116
"DbError",
116117
"InternalDbError",
117-
"VeryInternalDbError",
118-
"ConnectionError"
118+
"VeryInternalDbError"
119119
],
120120
"error.grouping_key": [
121121
"d72b25a26fde3f3aaad1c86950acd070"
@@ -165,22 +165,14 @@
165165
"http.request.headers": [
166166
{
167167
"Array": [
168-
"foo",
169168
"bar",
170-
"baz"
171-
],
172-
"Content-Type": [
173-
"text/html"
174-
],
175-
"Cookie": [
176-
"c1=v1,c2=v2"
177-
],
178-
"Some-Other-Header": [
169+
"baz",
179170
"foo"
180171
],
181-
"User-Agent": [
182-
"Mozilla Chrome Edge"
183-
]
172+
"Content-Type": "text/html",
173+
"Cookie": "c1=v1,c2=v2",
174+
"Some-Other-Header": "foo",
175+
"User-Agent": "Mozilla Chrome Edge"
184176
}
185177
],
186178
"http.request.method": [
@@ -194,9 +186,7 @@
194186
],
195187
"http.response.headers": [
196188
{
197-
"Content-Type": [
198-
"application/json"
199-
]
189+
"Content-Type": "application/json"
200190
}
201191
],
202192
"http.response.headers_sent": [
@@ -451,9 +441,6 @@
451441
"error.grouping_key": [
452442
"ae0232fed4cb40e7ebc62a585a421d60"
453443
],
454-
"error.grouping_name": [
455-
"Cannot read property 'baz' no defined"
456-
],
457444
"error.id": [
458445
"cdefab0123456789"
459446
],

systemtest/approvals/TestIntake/ErrorsTxID.approved.json

+7-17
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
1
5353
],
5454
"error.exception.type": [
55-
"java.net.UnknownHostException",
55+
"ConnectionError",
5656
"InternalDbError",
5757
"VeryInternalDbError",
58-
"ConnectionError"
58+
"java.net.UnknownHostException"
5959
],
6060
"error.grouping_key": [
6161
"9a4054e958afe722b5877e8fac578ff3"
@@ -104,22 +104,14 @@
104104
],
105105
"http.request.headers": [
106106
{
107-
"Content-Length": [
108-
"0"
109-
],
107+
"Content-Length": "0",
110108
"Cookie": [
111109
"c1=v1",
112110
"c2=v2"
113111
],
114-
"Elastic-Apm-Traceparent": [
115-
"00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01"
116-
],
117-
"Forwarded": [
118-
"for=192.168.0.1"
119-
],
120-
"Host": [
121-
"opbeans-java:3000"
122-
]
112+
"Elastic-Apm-Traceparent": "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01",
113+
"Forwarded": "for=192.168.0.1",
114+
"Host": "opbeans-java:3000"
123115
}
124116
],
125117
"http.request.method": [
@@ -130,9 +122,7 @@
130122
],
131123
"http.response.headers": [
132124
{
133-
"Content-Type": [
134-
"application/json"
135-
]
125+
"Content-Type": "application/json"
136126
}
137127
],
138128
"http.response.headers_sent": [

systemtest/approvals/TestIntake/Events.approved.json

+12-32
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
1
5656
],
5757
"error.exception.type": [
58-
"java.net.UnknownHostException",
58+
"ConnectionError",
5959
"InternalDbError",
6060
"VeryInternalDbError",
61-
"ConnectionError"
61+
"java.net.UnknownHostException"
6262
],
6363
"error.grouping_key": [
6464
"9a4054e958afe722b5877e8fac578ff3"
@@ -107,22 +107,14 @@
107107
],
108108
"http.request.headers": [
109109
{
110-
"Content-Length": [
111-
"0"
112-
],
110+
"Content-Length": "0",
113111
"Cookie": [
114112
"c1=v1",
115113
"c2=v2"
116114
],
117-
"Elastic-Apm-Traceparent": [
118-
"00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01"
119-
],
120-
"Forwarded": [
121-
"for=192.168.0.1"
122-
],
123-
"Host": [
124-
"opbeans-java:3000"
125-
]
115+
"Elastic-Apm-Traceparent": "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01",
116+
"Forwarded": "for=192.168.0.1",
117+
"Host": "opbeans-java:3000"
126118
}
127119
],
128120
"http.request.method": [
@@ -133,9 +125,7 @@
133125
],
134126
"http.response.headers": [
135127
{
136-
"Content-Type": [
137-
"application/json"
138-
]
128+
"Content-Type": "application/json"
139129
}
140130
],
141131
"http.response.headers_sent": [
@@ -567,9 +557,7 @@
567557
],
568558
"http.response.headers": [
569559
{
570-
"Content-Type": [
571-
"application/json"
572-
]
560+
"Content-Type": "application/json"
573561
}
574562
],
575563
"http.response.status_code": [
@@ -816,15 +804,9 @@
816804
],
817805
"http.request.headers": [
818806
{
819-
"Content-Type": [
820-
"text/html"
821-
],
822-
"Cookie": [
823-
"c1=v1,c2=v2"
824-
],
825-
"Elastic-Apm-Traceparent": [
826-
"00-33a0bd4cceff0370a7c57d807032688e-69feaabc5b88d7e8-01"
827-
],
807+
"Content-Type": "text/html",
808+
"Cookie": "c1=v1,c2=v2",
809+
"Elastic-Apm-Traceparent": "00-33a0bd4cceff0370a7c57d807032688e-69feaabc5b88d7e8-01",
828810
"User-Agent": [
829811
"Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36",
830812
"MozillaChromeEdge"
@@ -845,9 +827,7 @@
845827
],
846828
"http.response.headers": [
847829
{
848-
"Content-Type": [
849-
"application/json"
850-
]
830+
"Content-Type": "application/json"
851831
}
852832
],
853833
"http.response.headers_sent": [

systemtest/approvals/TestIntake/MinimalEvents.approved.json

-3
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@
8989
"error.grouping_key": [
9090
"3a1fb5609458fbb132b44d8fc7cde104"
9191
],
92-
"error.grouping_name": [
93-
"error exception message"
94-
],
9592
"error.id": [
9693
"abcdef0123456790"
9794
],

systemtest/approvals/TestIntake/Transactions.approved.json

+9-17
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@
221221
"user created"
222222
],
223223
"transaction.message.headers.Involved_services": [
224-
"user",
225-
"auth"
224+
"auth",
225+
"user"
226226
],
227227
"transaction.message.headers.User_id": [
228228
"1ax3"
@@ -636,22 +636,16 @@
636636
"http.request.headers": [
637637
{
638638
"Array": [
639-
"foo",
640639
"bar",
641-
"baz"
642-
],
643-
"Content-Type": [
644-
"text/html"
645-
],
646-
"Cookie": [
647-
"c1=v1, c2=v2"
648-
],
649-
"Some-Other-Header": [
640+
"baz",
650641
"foo"
651642
],
643+
"Content-Type": "text/html",
644+
"Cookie": "c1=v1, c2=v2",
645+
"Some-Other-Header": "foo",
652646
"User-Agent": [
653-
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36",
654-
"Mozilla Chrome Edge"
647+
"Mozilla Chrome Edge",
648+
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
655649
]
656650
}
657651
],
@@ -672,9 +666,7 @@
672666
],
673667
"http.response.headers": [
674668
{
675-
"Content-Type": [
676-
"application/json"
677-
]
669+
"Content-Type": "application/json"
678670
}
679671
],
680672
"http.response.headers_sent": [

systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json

+7-15
Original file line numberDiff line numberDiff line change
@@ -120,22 +120,16 @@
120120
"http.request.headers": [
121121
{
122122
"Array": [
123-
"foo",
124123
"bar",
125-
"baz"
126-
],
127-
"Content-Type": [
128-
"text/html"
129-
],
130-
"Cookie": [
131-
"c1=v1, c2=v2"
132-
],
133-
"Some-Other-Header": [
124+
"baz",
134125
"foo"
135126
],
127+
"Content-Type": "text/html",
128+
"Cookie": "c1=v1, c2=v2",
129+
"Some-Other-Header": "foo",
136130
"User-Agent": [
137-
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36",
138-
"Mozilla Chrome Edge"
131+
"Mozilla Chrome Edge",
132+
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
139133
]
140134
}
141135
],
@@ -156,9 +150,7 @@
156150
],
157151
"http.response.headers": [
158152
{
159-
"Content-Type": [
160-
"application/json"
161-
]
153+
"Content-Type": "application/json"
162154
}
163155
],
164156
"http.response.headers_sent": [

systemtest/approvals/TestIntake/UnknownSpanType.approved.json

+6-16
Original file line numberDiff line numberDiff line change
@@ -249,22 +249,14 @@
249249
"http.request.headers": [
250250
{
251251
"Array": [
252-
"foo",
253252
"bar",
254-
"baz"
255-
],
256-
"Content-Type": [
257-
"text/html"
258-
],
259-
"Cookie": [
260-
"c1=v1,c2=v2"
261-
],
262-
"Some-Other-Header": [
253+
"baz",
263254
"foo"
264255
],
265-
"User-Agent": [
266-
"Mozilla Chrome Edge"
267-
]
256+
"Content-Type": "text/html",
257+
"Cookie": "c1=v1,c2=v2",
258+
"Some-Other-Header": "foo",
259+
"User-Agent": "Mozilla Chrome Edge"
268260
}
269261
],
270262
"http.request.method": [
@@ -278,9 +270,7 @@
278270
],
279271
"http.response.headers": [
280272
{
281-
"Content-Type": [
282-
"application/json"
283-
]
273+
"Content-Type": "application/json"
284274
}
285275
],
286276
"http.response.headers_sent": [

systemtest/approvals/TestOTLPGRPCTraces.approved.json

+6-9
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
"error.grouping_key": [
3434
"14f4d08792a45fce53a46c93851e36e1"
3535
],
36-
"error.grouping_name": [
37-
"kablamo"
38-
],
3936
"error.id": [
4037
"dynamic"
4138
],
@@ -53,8 +50,8 @@
5350
"true"
5451
],
5552
"labels.resource_attribute_bool_array": [
56-
"true",
57-
"false"
53+
"false",
54+
"true"
5855
],
5956
"message": [
6057
"kablamo"
@@ -154,8 +151,8 @@
154151
"true"
155152
],
156153
"labels.resource_attribute_bool_array": [
157-
"true",
158-
"false"
154+
"false",
155+
"true"
159156
],
160157
"message": [
161158
"a_span_event"
@@ -243,8 +240,8 @@
243240
"true"
244241
],
245242
"labels.resource_attribute_bool_array": [
246-
"true",
247-
"false"
243+
"false",
244+
"true"
248245
],
249246
"labels.span_attribute_array": [
250247
"a",

0 commit comments

Comments
 (0)