Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Followup to #1944: Fix Zend Framework v1.21 integration test #1961

Merged
merged 1 commit into from
Mar 10, 2023
Merged

Followup to #1944: Fix Zend Framework v1.21 integration test #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions src/Integrations/Integrations/ZendFramework/ZendFrameworkIntegration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,15 @@ public function init()
// name 'zendframework', we are instead using the 'zf1' prefix.
$appName = \ddtrace_config_app_name('zf1');

\DDTrace\trace_method(
\DDTrace\hook_method(
'Zend_Controller_Plugin_Broker',
'preDispatch',
function (SpanData $spanData, $args) use ($integration, $appName) {
function ($broker, $scope, $args) use ($integration, $appName) {
$rootSpan = \DDTrace\root_span();
if (null === $rootSpan) {
return false;
return;
}

// We are enclosing this into a try-catch because we always have to return false,
// even at the cost of not setting specific metadata.
try {
/** @var Zend_Controller_Request_Abstract $request */
list($request) = $args;
Expand All @@ -90,25 +88,18 @@ function (SpanData $spanData, $args) use ($integration, $appName) {
}
} catch (\Exception $e) {
}

return false;
}
);

\DDTrace\trace_method('Zend_Controller_Plugin_Broker', 'postDispatch', function () {
\DDTrace\hook_method('Zend_Controller_Plugin_Broker', 'postDispatch', null, function ($broker) {
$rootSpan = \DDTrace\root_span();
if (null === $rootSpan) {
return false;
return;
}

// We are enclosing this into a try-catch because we always have to return false,
// even at the cost of not setting specific metadata.
try {
$rootSpan->meta[Tag::HTTP_STATUS_CODE] = $this->getResponse()->getHttpResponseCode();
} catch (\Exception $e) {
if ($exceptions = $broker->getResponse()->getException()) {
$rootSpan->exception = reset($exceptions);
}

return false;
});

return Integration::LOADED;
Expand Down
10 changes: 5 additions & 5 deletions tests/Frameworks/ZendFramework/Version_1_21/application/controllers/ErrorController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ public function indexAction()
public function errorAction()
{
$errors = $this->_getParam('error_handler');

if (!$errors || !$errors instanceof ArrayObject) {
$this->view->message = 'You have reached the error page';
return;
}

switch ($errors->type) {
case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ROUTE:
case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER:
Expand All @@ -32,18 +32,18 @@ public function errorAction()
$this->view->message = 'Application error';
break;
}

// Log exception, if logger available
if ($log = $this->getLog()) {
$log->log($this->view->message, $priority, $errors->exception);
$log->log('Request Parameters', $priority, $errors->request->getParams());
}

// conditionally display exceptions
if ($this->getInvokeArg('displayExceptions') == true) {
$this->view->exception = $errors->exception;
}

$this->view->request = $errors->request;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/Frameworks/ZendFramework/Version_1_21/public/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
APPLICATION_PATH . '/configs/application.ini'
);
$application->bootstrap()
->run();
->run();
8 changes: 2 additions & 6 deletions tests/Integrations/ZendFramework/V1/CommonScenariosTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,10 @@ public function provideSpecs()
'http.status_code' => '500',
Tag::SPAN_KIND => "server",
Tag::COMPONENT => "zendframework",
]),
])->setError('Exception', 'Controller error', true),
],
];
if (\getenv('DD_TRACE_TEST_SAPI') == 'apache2handler') { // i.e. with opcache
$specs['A GET request with an exception'][0]->setError('Exception', 'Controller error', true);
} else {
$specs['A GET request with an exception'][0]->setError();
}

return $this->buildDataProvider($specs);
}
}
9 changes: 3 additions & 6 deletions tests/Integrations/ZendFramework/V1_21/CommonScenariosTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,11 @@ public function provideSpecs()
'http.status_code' => '500',
Tag::SPAN_KIND => "server",
Tag::COMPONENT => "zendframework",
]),
])
->setError('Exception', 'Controller error', true)
],
];
if (\getenv('DD_TRACE_TEST_SAPI') == 'apache2handler') { // i.e. with opcache
$specs['A GET request with an exception'][0]->setError('Exception', 'Controller error', true);
} else {
$specs['A GET request with an exception'][0]->setError();
}

return $this->buildDataProvider($specs);
}
}