Skip to content

Commit e9fbe6c

Browse files
PROFeNoMPROFeNoM
committed
tests: Update Snapshots
1 parent 9277b48 commit e9fbe6c

11 files changed

Lines changed: 36 additions & 30 deletions

‎src/Integrations/Integrations/CodeIgniter/V2/CodeIgniterIntegration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function (SpanData $span) use ($rootSpan, $method, $service) {
7070

7171
// We took the assumption that all controllers will extend CI_Controller.
7272
// But we've at least seen one healthcheck controller not extending it.
73-
if ($this->load && \method_exists($this->load, 'helper')) {
73+
if (property_exists($this, 'load') && $this->load && \method_exists($this->load, 'helper')) {
7474
$this->load->helper('url');
7575

7676
if (!array_key_exists(Tag::HTTP_URL, $rootSpan->meta)) {

‎tests/Integrations/CodeIgniter/V3_1/CommonScenariosTest.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ protected static function getAppIndexScript()
1616

1717
protected static function getEnvs()
1818
{
19-
return array_merge(parent::getEnvs(), ['DD_SERVICE' => 'codeigniter_test_app']);
19+
return array_merge(parent::getEnvs(), [
20+
'DD_SERVICE' => 'codeigniter_test_app',
21+
]);
2022
}
2123

2224
public function testScenarioGetReturnString()

‎tests/Integrations/CodeIgniter/V3_1/ExitTest.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Integrations\CodeIgniter\V3_1;
3+
namespace DDTrace\Tests\Integrations\CodeIgniter\V3_1;
44

55
use DDTrace\Tag;
66
use DDTrace\Tests\Common\SpanAssertion;
@@ -16,7 +16,9 @@ protected static function getAppIndexScript()
1616

1717
protected static function getEnvs()
1818
{
19-
return array_merge(parent::getEnvs(), ['DD_SERVICE' => 'codeigniter_test_app']);
19+
return array_merge(parent::getEnvs(), [
20+
'DD_SERVICE' => 'codeigniter_test_app',
21+
]);
2022
}
2123

2224
public function testScenarioExit()

‎tests/Integrations/CodeIgniter/V3_1/NoCIControllerTest.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ protected static function getAppIndexScript()
1616

1717
protected static function getEnvs()
1818
{
19-
return array_merge(parent::getEnvs(), ['DD_SERVICE' => 'codeigniter_test_app']);
19+
return array_merge(parent::getEnvs(), [
20+
'DD_SERVICE' => 'codeigniter_test_app',
21+
]);
2022
}
2123

2224
public function testScenarioHealthCheck()

‎tests/snapshots/integrations.code_igniter.v3_1.no_ci_controller_test.test_scenario_health_check.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
"resource": "GET /health_check/ping",
66
"trace_id": 0,
77
"span_id": 1,
8-
"parent_id": 2339013376397583461,
8+
"parent_id": 13710685105679864928,
99
"type": "web",
1010
"meta": {
1111
"_dd.p.dm": "-0",
12-
"_dd.p.tid": "65c9efac00000000",
12+
"_dd.p.tid": "660bca4b00000000",
1313
"component": "codeigniter",
1414
"http.method": "GET",
1515
"http.route": "health_check/ping",
1616
"http.status_code": "200",
1717
"http.url": "http://localhost:9999/health_check/ping",
18-
"runtime-id": "7bfd0d33-935d-44b5-adb3-8a3d665d7fc1",
18+
"runtime-id": "ca127e85-a20d-46aa-b510-07e9077a14c9",
1919
"span.kind": "server"
2020
},
2121
"metrics": {

‎tests/snapshots/tests.integrations.code_igniter.v3_1.common_scenarios_test.test_scenario_get_parameterized.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
"resource": "GET /parameterized/paramValue",
66
"trace_id": 0,
77
"span_id": 1,
8-
"parent_id": 8242584460457957692,
8+
"parent_id": 7077300158957851981,
99
"type": "web",
1010
"meta": {
1111
"_dd.p.dm": "-0",
12-
"_dd.p.tid": "65c9f02600000000",
12+
"_dd.p.tid": "660bca4200000000",
1313
"app.endpoint": "Parameterized::customAction",
1414
"component": "codeigniter",
1515
"http.method": "GET",
1616
"http.route": "parameterized/(:any)",
1717
"http.status_code": "200",
1818
"http.url": "http://localhost:9999/parameterized/paramValue",
19-
"runtime-id": "28d30454-75a5-4e9c-8cae-a7343bfe3710",
19+
"runtime-id": "26ab24e6-051f-4e1f-9adf-3d609bef6946",
2020
"span.kind": "server"
2121
},
2222
"metrics": {

‎tests/snapshots/tests.integrations.code_igniter.v3_1.common_scenarios_test.test_scenario_get_return_string.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
"resource": "GET /simple",
66
"trace_id": 0,
77
"span_id": 1,
8-
"parent_id": 11987875517756971343,
8+
"parent_id": 5041262405164109530,
99
"type": "web",
1010
"meta": {
1111
"_dd.p.dm": "-0",
12-
"_dd.p.tid": "65c9edae00000000",
12+
"_dd.p.tid": "660bca2700000000",
1313
"app.endpoint": "Simple::index",
1414
"component": "codeigniter",
1515
"http.method": "GET",
1616
"http.route": "simple",
1717
"http.status_code": "200",
1818
"http.url": "http://localhost:9999/simple?key=value&<redacted>",
19-
"runtime-id": "cc8c1468-a2a1-4ee5-880f-f1caf51d53ed",
19+
"runtime-id": "26ab24e6-051f-4e1f-9adf-3d609bef6946",
2020
"span.kind": "server"
2121
},
2222
"metrics": {

‎tests/snapshots/tests.integrations.code_igniter.v3_1.common_scenarios_test.test_scenario_get_to_missing_route.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
"resource": "GET /does_not_exist",
66
"trace_id": 0,
77
"span_id": 1,
8-
"parent_id": 13520902578597192405,
8+
"parent_id": 1569360189764723184,
99
"type": "web",
1010
"meta": {
1111
"_dd.p.dm": "-0",
12-
"_dd.p.tid": "65c9ed6900000000",
12+
"_dd.p.tid": "660bca3700000000",
1313
"component": "codeigniter",
1414
"http.method": "GET",
1515
"http.route": "does_not_exist",
16-
"http.status_code": "404",
16+
"http.status_code": "200",
1717
"http.url": "http://localhost:9999/does_not_exist?key=value&<redacted>",
18-
"runtime-id": "4aab57c3-105b-4ae1-8506-4da606c8ef09",
18+
"runtime-id": "26ab24e6-051f-4e1f-9adf-3d609bef6946",
1919
"span.kind": "server"
2020
},
2121
"metrics": {

‎tests/snapshots/tests.integrations.code_igniter.v3_1.common_scenarios_test.test_scenario_get_with_exception.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
"resource": "GET /error",
66
"trace_id": 0,
77
"span_id": 1,
8-
"parent_id": 1162031372790636824,
8+
"parent_id": 14316491551034217378,
99
"type": "web",
1010
"error": 1,
1111
"meta": {
1212
"_dd.p.dm": "-0",
13-
"_dd.p.tid": "65c9ed6400000000",
13+
"_dd.p.tid": "660bca3200000000",
1414
"app.endpoint": "Error_::index",
1515
"component": "codeigniter",
16-
"error.message": "Uncaught Exception (500): datadog in /home/circleci/datadog/tests/Frameworks/CodeIgniter/Version_3_1/application/controllers/Error_.php:5",
16+
"error.message": "Uncaught Exception: datadog in /home/circleci/datadog/tests/Frameworks/CodeIgniter/Version_3_1/application/controllers/Error_.php:5",
1717
"error.stack": "#0 /home/circleci/datadog/tests/Frameworks/CodeIgniter/Version_3_1/system/core/CodeIgniter.php(533): Error_->index()\n#1 /home/circleci/datadog/tests/Frameworks/CodeIgniter/Version_3_1/index.php(315): require_once()\n#2 {main}",
1818
"error.type": "Exception",
1919
"http.method": "GET",
2020
"http.route": "error",
21-
"http.status_code": "500",
21+
"http.status_code": "200",
2222
"http.url": "http://localhost:9999/error?key=value&<redacted>",
23-
"runtime-id": "4aab57c3-105b-4ae1-8506-4da606c8ef09",
23+
"runtime-id": "26ab24e6-051f-4e1f-9adf-3d609bef6946",
2424
"span.kind": "server"
2525
},
2626
"metrics": {
@@ -38,7 +38,7 @@
3838
"error": 1,
3939
"meta": {
4040
"component": "codeigniter",
41-
"error.message": "Thrown Exception (500): datadog in /home/circleci/datadog/tests/Frameworks/CodeIgniter/Version_3_1/application/controllers/Error_.php:5",
41+
"error.message": "Thrown Exception: datadog in /home/circleci/datadog/tests/Frameworks/CodeIgniter/Version_3_1/application/controllers/Error_.php:5",
4242
"error.stack": "#0 /home/circleci/datadog/tests/Frameworks/CodeIgniter/Version_3_1/system/core/CodeIgniter.php(533): Error_->index()\n#1 /home/circleci/datadog/tests/Frameworks/CodeIgniter/Version_3_1/index.php(315): require_once()\n#2 {main}",
4343
"error.type": "Exception"
4444
}

‎tests/snapshots/tests.integrations.code_igniter.v3_1.common_scenarios_test.test_scenario_get_with_view.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
"resource": "GET /simple_view",
66
"trace_id": 0,
77
"span_id": 1,
8-
"parent_id": 696982836083391658,
8+
"parent_id": 5481136724631663608,
99
"type": "web",
1010
"meta": {
1111
"_dd.p.dm": "-0",
12-
"_dd.p.tid": "65c9ef6000000000",
12+
"_dd.p.tid": "660bca2700000000",
1313
"app.endpoint": "Simple_View::index",
1414
"component": "codeigniter",
1515
"http.method": "GET",
1616
"http.route": "simple_view",
1717
"http.status_code": "200",
1818
"http.url": "http://localhost:9999/simple_view?key=value&<redacted>",
19-
"runtime-id": "9e831e94-6e62-4f5f-adc3-57d8e1936c63",
19+
"runtime-id": "26ab24e6-051f-4e1f-9adf-3d609bef6946",
2020
"span.kind": "server"
2121
},
2222
"metrics": {

0 commit comments

Comments
 (0)