Skip to content

fix(agent): properly name drupal cached pages #1010

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

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

fix(agent): properly name drupal cached pages #1010

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ccb3a6
feat(agent): properly name drupal cached pages
bduranleau-nr Jan 21, 2025
dafcd5d
add INI to toggle naming functionality on/off
bduranleau-nr Jan 22, 2025
da14399
review: use `0` retval for consistency
bduranleau-nr Jan 23, 2025
aebfeeb
review: consolidate conditionals
bduranleau-nr Jan 23, 2025
04cbaf6
review: improve fallback naming
bduranleau-nr Jan 25, 2025
17a32d3
fix: add fallback injection logic
bduranleau-nr Jan 28, 2025
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
Prev Previous commit
Next Next commit
review: consolidate conditionals
  • Loading branch information
@bduranleau-nr
bduranleau-nr committed Jan 23, 2025
commit aebfeebf39718d891d7e03abb7e8672c4ca05efd
4 changes: 1 addition & 3 deletions agent/fw_drupal8.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
* Symfony\Component\HttpFoundation\Response if there is a cache hit and false
* otherwise.
*/
if (retval_ptr && nr_php_is_zval_valid_object(*retval_ptr)) {

Check failure

Code scanning / CodeQL

Redundant null check due to previous dereference High

This null check is redundant because
the value is dereferenced
Loading
in any case.
This null check is redundant because
the value is dereferenced
Loading
in any case.
nr_txn_set_path("Drupal8", NRPRG(txn), name, NR_PATH_TYPE_ACTION,
NR_OK_TO_OVERWRITE);
}
Expand Down Expand Up @@ -808,9 +808,7 @@
if (NULL == drupal_ce) {
inject = false;
nrl_warning(NRL_FRAMEWORK, "Missing Drupal RouteMatch Class");
}

if (inject) {
} else {
symfony_ce
= nr_php_find_class("Symfony\\Component\\HttpFoundation\\Request");
if (NULL == symfony_ce) {
Expand Down
Loading