|
90 | 90 | */
|
91 | 91 | static void nr_php_amqplib_ensure_class() {
|
92 | 92 | int result = FAILURE;
|
| 93 | + zend_class_entry* class_entry = NULL; |
93 | 94 |
|
94 | 95 | class_entry = nr_php_find_class("phpamqplib\\channel\\amqpchannel");
|
95 | 96 | if (NULL == class_entry) {
|
96 |
| - result |
97 |
| - = zend_eval_string("class_exists('PhpAmqpLib\\Channel\\AMQPChannel');", |
98 |
| - NULL, "Get nr_php_amqplib_class_exists"); |
| 97 | + result = zend_eval_string( |
| 98 | + "class_exists('PhpAmqpLib\\Channel\\AMQPChannel');", NULL, |
| 99 | + "nr_php_amqplib_class_exists_channel_amqpchannel"); |
99 | 100 | }
|
100 | 101 | /*
|
101 | 102 | * We don't need to check anything else at this point. If this fails, there's
|
@@ -127,7 +128,7 @@ void nr_php_amqplib_handle_version() {
|
127 | 128 | " }"
|
128 | 129 | " return $nr_php_amqplib_version;"
|
129 | 130 | "})();",
|
130 |
| - &retval_zpd, "Get nr_php_amqplib_version"); |
| 131 | + &retval_zpd, "nr_php_amqplib_get_phpamqplib_package_version"); |
131 | 132 |
|
132 | 133 | /* See if we got a non-empty/non-null string for version. */
|
133 | 134 | if (SUCCESS == result) {
|
@@ -305,7 +306,7 @@ static inline void nr_php_amqplib_insert_dt_headers(zval* amqp_msg) {
|
305 | 306 | " return null;"
|
306 | 307 | " }"
|
307 | 308 | "})();",
|
308 |
| - &amqp_table_retval_zpd, "newrelic.amqplib.add_empty_headers"); |
| 309 | + &amqp_table_retval_zpd, "nr_php_amqplib_create_empty_amqptable"); |
309 | 310 |
|
310 | 311 | if (FAILURE == retval) {
|
311 | 312 | nrl_verbosedebug(NRL_INSTRUMENT,
|
|
0 commit comments