Skip to content

Commit 0c7a6c2

Browse files
estringanaestringana
committed
Fix laravel 10 snapshots
1 parent 2513f56 commit 0c7a6c2

4 files changed

+108
-56
lines changed

‎tests/snapshots/tests.integrations.laravel.v10_x.common_scenarios_test.test_scenario_get_return_string.json

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@
55
"resource": "App\\Http\\Controllers\\CommonSpecsController@simple simple_route",
66
"trace_id": 0,
77
"span_id": 1,
8-
"parent_id": 5443607902760525034,
8+
"parent_id": 7827933312769294179,
99
"type": "web",
1010
"meta": {
1111
"_dd.p.dm": "-0",
12+
"_dd.p.tid": "65c4f3a100000000",
1213
"component": "laravel",
1314
"http.method": "GET",
1415
"http.route": "simple",
1516
"http.status_code": "200",
1617
"http.url": "http://localhost:9999/simple?key=value&<redacted>",
1718
"laravel.route.action": "App\\Http\\Controllers\\CommonSpecsController@simple",
1819
"laravel.route.name": "simple_route",
19-
"runtime-id": "eea35813-af37-4c9a-9e17-f960bf660b54",
20+
"runtime-id": "9aa7572a-b652-4cc5-8a09-d4ae1150d865",
2021
"span.kind": "server"
2122
},
2223
"metrics": {
@@ -170,7 +171,7 @@
170171
{
171172
"name": "laravel.event.handle",
172173
"service": "my_service",
173-
"resource": "bootstrapped: Illuminate\\Foundation\\Bootstrap\\BootProviders",
174+
"resource": "Illuminate\\Database\\Events\\ConnectionEstablished",
174175
"trace_id": 0,
175176
"span_id": 14,
176177
"parent_id": 1,
@@ -182,7 +183,7 @@
182183
{
183184
"name": "laravel.event.handle",
184185
"service": "my_service",
185-
"resource": "Illuminate\\Routing\\Events\\Routing",
186+
"resource": "bootstrapped: Illuminate\\Foundation\\Bootstrap\\BootProviders",
186187
"trace_id": 0,
187188
"span_id": 15,
188189
"parent_id": 1,
@@ -194,7 +195,7 @@
194195
{
195196
"name": "laravel.event.handle",
196197
"service": "my_service",
197-
"resource": "Illuminate\\Routing\\Events\\RouteMatched",
198+
"resource": "Illuminate\\Routing\\Events\\Routing",
198199
"trace_id": 0,
199200
"span_id": 16,
200201
"parent_id": 1,
@@ -203,12 +204,24 @@
203204
"component": "laravel"
204205
}
205206
},
207+
{
208+
"name": "laravel.event.handle",
209+
"service": "my_service",
210+
"resource": "Illuminate\\Routing\\Events\\RouteMatched",
211+
"trace_id": 0,
212+
"span_id": 17,
213+
"parent_id": 1,
214+
"type": "web",
215+
"meta": {
216+
"component": "laravel"
217+
}
218+
},
206219
{
207220
"name": "laravel.action",
208221
"service": "my_service",
209222
"resource": "simple",
210223
"trace_id": 0,
211-
"span_id": 17,
224+
"span_id": 18,
212225
"parent_id": 1,
213226
"type": "web",
214227
"meta": {
@@ -220,7 +233,7 @@
220233
"service": "my_service",
221234
"resource": "Illuminate\\Routing\\Events\\PreparingResponse",
222235
"trace_id": 0,
223-
"span_id": 18,
236+
"span_id": 19,
224237
"parent_id": 1,
225238
"type": "web",
226239
"meta": {
@@ -232,7 +245,7 @@
232245
"service": "my_service",
233246
"resource": "Illuminate\\Routing\\Events\\ResponsePrepared",
234247
"trace_id": 0,
235-
"span_id": 19,
248+
"span_id": 20,
236249
"parent_id": 1,
237250
"type": "web",
238251
"meta": {
@@ -244,7 +257,7 @@
244257
"service": "my_service",
245258
"resource": "Illuminate\\Routing\\Events\\PreparingResponse",
246259
"trace_id": 0,
247-
"span_id": 20,
260+
"span_id": 21,
248261
"parent_id": 1,
249262
"type": "web",
250263
"meta": {
@@ -256,7 +269,7 @@
256269
"service": "my_service",
257270
"resource": "Illuminate\\Routing\\Events\\ResponsePrepared",
258271
"trace_id": 0,
259-
"span_id": 21,
272+
"span_id": 22,
260273
"parent_id": 1,
261274
"type": "web",
262275
"meta": {
@@ -268,7 +281,7 @@
268281
"service": "my_service",
269282
"resource": "Illuminate\\Foundation\\Http\\Events\\RequestHandled",
270283
"trace_id": 0,
271-
"span_id": 22,
284+
"span_id": 23,
272285
"parent_id": 1,
273286
"type": "web",
274287
"meta": {

‎tests/snapshots/tests.integrations.laravel.v10_x.common_scenarios_test.test_scenario_get_to_missing_route.json

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
"resource": "GET /does_not_exist",
66
"trace_id": 0,
77
"span_id": 1,
8-
"parent_id": 4578985128299749382,
8+
"parent_id": 18025102726851271444,
99
"type": "web",
1010
"meta": {
1111
"_dd.p.dm": "-0",
12+
"_dd.p.tid": "65c4f49400000000",
1213
"component": "laravel",
1314
"http.method": "GET",
1415
"http.status_code": "404",
1516
"http.url": "http://localhost:9999/does_not_exist?key=value&<redacted>",
16-
"runtime-id": "eea35813-af37-4c9a-9e17-f960bf660b54"
17+
"runtime-id": "be6d5800-3923-47c3-98a5-fa26dbc94d4f"
1718
},
1819
"metrics": {
1920
"_sampling_priority_v1": 1.0
@@ -166,7 +167,7 @@
166167
{
167168
"name": "laravel.event.handle",
168169
"service": "my_service",
169-
"resource": "bootstrapped: Illuminate\\Foundation\\Bootstrap\\BootProviders",
170+
"resource": "Illuminate\\Database\\Events\\ConnectionEstablished",
170171
"trace_id": 0,
171172
"span_id": 14,
172173
"parent_id": 1,
@@ -178,7 +179,7 @@
178179
{
179180
"name": "laravel.event.handle",
180181
"service": "my_service",
181-
"resource": "Illuminate\\Routing\\Events\\Routing",
182+
"resource": "bootstrapped: Illuminate\\Foundation\\Bootstrap\\BootProviders",
182183
"trace_id": 0,
183184
"span_id": 15,
184185
"parent_id": 1,
@@ -190,7 +191,7 @@
190191
{
191192
"name": "laravel.event.handle",
192193
"service": "my_service",
193-
"resource": "creating: errors::404",
194+
"resource": "Illuminate\\Routing\\Events\\Routing",
194195
"trace_id": 0,
195196
"span_id": 16,
196197
"parent_id": 1,
@@ -199,12 +200,24 @@
199200
"component": "laravel"
200201
}
201202
},
203+
{
204+
"name": "laravel.event.handle",
205+
"service": "my_service",
206+
"resource": "creating: errors::404",
207+
"trace_id": 0,
208+
"span_id": 17,
209+
"parent_id": 1,
210+
"type": "web",
211+
"meta": {
212+
"component": "laravel"
213+
}
214+
},
202215
{
203216
"name": "laravel.view.render",
204217
"service": "my_service",
205218
"resource": "errors::404",
206219
"trace_id": 0,
207-
"span_id": 17,
220+
"span_id": 18,
208221
"parent_id": 1,
209222
"type": "web",
210223
"meta": {
@@ -216,8 +229,8 @@
216229
"service": "my_service",
217230
"resource": "composing: errors::404",
218231
"trace_id": 0,
219-
"span_id": 19,
220-
"parent_id": 17,
232+
"span_id": 20,
233+
"parent_id": 18,
221234
"type": "web",
222235
"meta": {
223236
"component": "laravel"
@@ -228,8 +241,8 @@
228241
"service": "my_service",
229242
"resource": "/home/circleci/datadog/tests/Frameworks/Laravel/Version_10_x/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/404.blade.php",
230243
"trace_id": 0,
231-
"span_id": 20,
232-
"parent_id": 17,
244+
"span_id": 21,
245+
"parent_id": 18,
233246
"type": "web",
234247
"meta": {
235248
"component": "laravel"
@@ -240,8 +253,8 @@
240253
"service": "my_service",
241254
"resource": "creating: errors::minimal",
242255
"trace_id": 0,
243-
"span_id": 21,
244-
"parent_id": 20,
256+
"span_id": 22,
257+
"parent_id": 21,
245258
"type": "web",
246259
"meta": {
247260
"component": "laravel"
@@ -252,8 +265,8 @@
252265
"service": "my_service",
253266
"resource": "composing: errors::minimal",
254267
"trace_id": 0,
255-
"span_id": 22,
256-
"parent_id": 20,
268+
"span_id": 23,
269+
"parent_id": 21,
257270
"type": "web",
258271
"meta": {
259272
"component": "laravel"
@@ -264,7 +277,7 @@
264277
"service": "my_service",
265278
"resource": "Illuminate\\Foundation\\Http\\Events\\RequestHandled",
266279
"trace_id": 0,
267-
"span_id": 18,
280+
"span_id": 19,
268281
"parent_id": 1,
269282
"type": "web",
270283
"meta": {

0 commit comments

Comments
 (0)